mirror of
https://github.com/eclipse/upm.git
synced 2025-07-03 02:11:15 +03:00
examples: Remove heap allocation from C++ examples
Cleanup of UPM C++ examples. Switched from heap allocation to stack allocation when possible. This simplifies the samples since it removes the need for explicit memory management. A script was used to identify and replace pointer use. To simplify the replace script, I re-formatted the C++ examples using the UPM .clang-format file. Unfortuantely this changes the look of the UPM C++ examples to a large degree. However, examples will now have a standard look/feel and uniform formatting. * Ran clang-format w/provided UPM .clang-format file * Removed new's/delete's whenever possible (left those in interface examples) * Added IIO sensor library implementation of callback void* arg * Converted all sleeps to upm defined delays (added header when necessary) * Scrubbed CXX example includes Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:

committed by
Mihai Tudor Panu

parent
bd6e4ec786
commit
5cefe7f5f3
@ -22,94 +22,86 @@
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include <signal.h>
|
||||
#include <string>
|
||||
|
||||
#include "t3311.hpp"
|
||||
#include "upm_utilities.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
bool shouldRun = true;
|
||||
|
||||
void sig_handler(int signo)
|
||||
void
|
||||
sig_handler(int signo)
|
||||
{
|
||||
if (signo == SIGINT)
|
||||
shouldRun = false;
|
||||
if (signo == SIGINT)
|
||||
shouldRun = false;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
signal(SIGINT, sig_handler);
|
||||
signal(SIGINT, sig_handler);
|
||||
|
||||
//! [Interesting]
|
||||
//! [Interesting]
|
||||
|
||||
string defaultDev = "/dev/ttyUSB0";
|
||||
string defaultDev = "/dev/ttyUSB0";
|
||||
|
||||
// if an argument was specified, use it as the device instead
|
||||
if (argc > 1)
|
||||
defaultDev = string(argv[1]);
|
||||
// if an argument was specified, use it as the device instead
|
||||
if (argc > 1)
|
||||
defaultDev = string(argv[1]);
|
||||
|
||||
cout << "Initializing..." << endl;
|
||||
cout << "Initializing..." << endl;
|
||||
|
||||
// Instantiate an T3311 instance, using MODBUS slave address 1, and
|
||||
// default comm parameters (9600, 8, N, 2)
|
||||
upm::T3311 *sensor = new upm::T3311(defaultDev, 1);
|
||||
// Instantiate an T3311 instance, using MODBUS slave address 1, and
|
||||
// default comm parameters (9600, 8, N, 2)
|
||||
upm::T3311 sensor(defaultDev, 1);
|
||||
|
||||
// output the serial number and firmware revision
|
||||
cout << "Serial Number: " << sensor->getSerialNumber() << endl;
|
||||
cout << "Firmware Revision: " << sensor->getFirmwareMajor()
|
||||
<< "." << sensor->getFirmwareMinor() << endl;
|
||||
cout << endl;
|
||||
// output the serial number and firmware revision
|
||||
cout << "Serial Number: " << sensor.getSerialNumber() << endl;
|
||||
cout << "Firmware Revision: " << sensor.getFirmwareMajor() << "." << sensor.getFirmwareMinor()
|
||||
<< endl;
|
||||
cout << endl;
|
||||
|
||||
// update and print available values every second
|
||||
while (shouldRun)
|
||||
{
|
||||
// update our values from the sensor
|
||||
sensor->update();
|
||||
// update and print available values every second
|
||||
while (shouldRun) {
|
||||
// update our values from the sensor
|
||||
sensor.update();
|
||||
|
||||
// we show both C and F for temperature
|
||||
cout << "Temperature: " << sensor->getTemperature()
|
||||
<< " C / " << sensor->getTemperature(true) << " F"
|
||||
<< endl;
|
||||
// we show both C and F for temperature
|
||||
cout << "Temperature: " << sensor.getTemperature() << " C / " << sensor.getTemperature(true)
|
||||
<< " F" << endl;
|
||||
|
||||
cout << "Humidity: " << sensor->getHumidity()
|
||||
<< " %" << endl;
|
||||
cout << "Humidity: " << sensor.getHumidity() << " %" << endl;
|
||||
|
||||
// this value depends on the sensor configuration -- by default
|
||||
// it is the dew point temperature
|
||||
cout << "Computed Value: " << sensor->getComputedValue() << endl;
|
||||
// this value depends on the sensor configuration -- by default
|
||||
// it is the dew point temperature
|
||||
cout << "Computed Value: " << sensor.getComputedValue() << endl;
|
||||
|
||||
// with FW revisions > 2.44, extended computed data is available
|
||||
if (sensor->extendedDataAvailable())
|
||||
{
|
||||
cout << "Dew Point Temperature: " << sensor->getDewPointTemperature()
|
||||
<< " C / " << sensor->getDewPointTemperature(true) << " F"
|
||||
<< endl;
|
||||
// with FW revisions > 2.44, extended computed data is available
|
||||
if (sensor.extendedDataAvailable()) {
|
||||
cout << "Dew Point Temperature: " << sensor.getDewPointTemperature() << " C / "
|
||||
<< sensor.getDewPointTemperature(true) << " F" << endl;
|
||||
|
||||
cout << "Absolute Humidity: " << sensor->getAbsoluteHumidity()
|
||||
<< " g/m3" << endl;
|
||||
cout << "Absolute Humidity: " << sensor.getAbsoluteHumidity() << " g/m3" << endl;
|
||||
|
||||
cout << "Specific Humidity: " << sensor->getSpecificHumidity()
|
||||
<< " g/kg" << endl;
|
||||
cout << "Specific Humidity: " << sensor.getSpecificHumidity() << " g/kg" << endl;
|
||||
|
||||
cout << "Mixing Ratio: " << sensor->getMixingRatio()
|
||||
<< " g/kg" << endl;
|
||||
cout << "Mixing Ratio: " << sensor.getMixingRatio() << " g/kg" << endl;
|
||||
|
||||
cout << "Specific Enthalpy: " << sensor->getSpecificEnthalpy()
|
||||
<< " kJ/kg" << endl;
|
||||
cout << "Specific Enthalpy: " << sensor.getSpecificEnthalpy() << " kJ/kg" << endl;
|
||||
}
|
||||
|
||||
cout << endl;
|
||||
cout << endl;
|
||||
|
||||
sleep(1);
|
||||
upm_delay(1);
|
||||
}
|
||||
|
||||
cout << "Exiting..." << endl;
|
||||
cout << "Exiting..." << endl;
|
||||
|
||||
delete sensor;
|
||||
//! [Interesting]
|
||||
|
||||
//! [Interesting]
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user