alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-03 10:21:19 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

examples: Remove heap allocation from C++ examples

Browse Source 
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:
Noel Eck
2017-08-30 15:00:29 -07:00
committed by Mihai Tudor Panu
parent bd6e4ec786
commit 5cefe7f5f3
290 changed files with 7976 additions and 8520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
examples/c++/h803x.cxx
View File

@ -22,128 +22,100 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <unistd.h>
#include <iostream>
#include <signal.h>
#include <string>
#include "h803x.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 << "Using device " << defaultDev << endl;
cout << "Initializing..." << endl;
cout << "Using device " << defaultDev << endl;
cout << "Initializing..." << endl;
// Instantiate an H803X instance, using MODBUS slave address 1, and
// default comm parameters (9600, 8, N, 2)
upm::H803X *sensor = new upm::H803X(defaultDev, 1);
// Instantiate an H803X instance, using MODBUS slave address 1, and
// default comm parameters (9600, 8, N, 2)
upm::H803X sensor(defaultDev, 1);
// output the Slave ID string
cout << "Slave ID: " << sensor->getSlaveID() << endl;
cout << endl;
// output the Slave ID string
cout << "Slave ID: " << sensor.getSlaveID() << 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();
// H8035 / H8036
cout << "Consumption (kWh): " << sensor->getConsumption() << endl;
cout << "Real Power (kW): " << sensor->getRealPower() << endl;
// H8035 / H8036
cout << "Consumption (kWh): " << sensor.getConsumption() << endl;
cout << "Real Power (kW): " << sensor.getRealPower() << endl;
if (sensor->isH8036())
{
// The H8036 has much more data available...
if (sensor.isH8036()) {
// The H8036 has much more data available...
cout << "Reactive Power (kVAR): " << sensor->getReactivePower()
<< endl;
cout << "Apparent Power (kVA): " << sensor->getApparentPower()
<< endl;
cout << "Power Factor: " << sensor->getPowerFactor()
<< endl;
cout << "Volts Line to Line: " << sensor->getVoltsLineToLine()
<< endl;
cout << "Volts Line to Neutral: " << sensor->getVoltsLineToNeutral()
<< endl;
cout << "Reactive Power (kVAR): " << sensor.getReactivePower() << endl;
cout << "Apparent Power (kVA): " << sensor.getApparentPower() << endl;
cout << "Power Factor: " << sensor.getPowerFactor() << endl;
cout << "Volts Line to Line: " << sensor.getVoltsLineToLine() << endl;
cout << "Volts Line to Neutral: " << sensor.getVoltsLineToNeutral() << endl;
cout << "Current: " << sensor->getCurrent()
<< endl;
cout << "Current: " << sensor.getCurrent() << endl;
cout << "Real Power Phase A (kW): " << sensor->getRealPowerPhaseA()
<< endl;
cout << "Real Power Phase B (kW): " << sensor->getRealPowerPhaseB()
<< endl;
cout << "Real Power Phase C (kW): " << sensor->getRealPowerPhaseC()
<< endl;
cout << "Real Power Phase A (kW): " << sensor.getRealPowerPhaseA() << endl;
cout << "Real Power Phase B (kW): " << sensor.getRealPowerPhaseB() << endl;
cout << "Real Power Phase C (kW): " << sensor.getRealPowerPhaseC() << endl;
cout << "Power Factor Phase A: " << sensor->getPowerFactorPhaseA()
<< endl;
cout << "Power Factor Phase B: " << sensor->getPowerFactorPhaseB()
<< endl;
cout << "Power Factor Phase C: " << sensor->getPowerFactorPhaseC()
<< endl;
cout << "Power Factor Phase A: " << sensor.getPowerFactorPhaseA() << endl;
cout << "Power Factor Phase B: " << sensor.getPowerFactorPhaseB() << endl;
cout << "Power Factor Phase C: " << sensor.getPowerFactorPhaseC() << endl;
cout << "Volts Phase A to B: " << sensor->getVoltsPhaseAToB()
<< endl;
cout << "Volts Phase B to C: " << sensor->getVoltsPhaseBToC()
<< endl;
cout << "Volts Phase A to C: " << sensor->getVoltsPhaseAToC()
<< endl;
cout << "Volts Phase A to Neutral: "
<< sensor->getVoltsPhaseAToNeutral()
<< endl;
cout << "Volts Phase B to Neutral: "
<< sensor->getVoltsPhaseBToNeutral()
<< endl;
cout << "Volts Phase C to Neutral: "
<< sensor->getVoltsPhaseCToNeutral()
<< endl;
cout << "Volts Phase A to B: " << sensor.getVoltsPhaseAToB() << endl;
cout << "Volts Phase B to C: " << sensor.getVoltsPhaseBToC() << endl;
cout << "Volts Phase A to C: " << sensor.getVoltsPhaseAToC() << endl;
cout << "Volts Phase A to Neutral: " << sensor.getVoltsPhaseAToNeutral() << endl;
cout << "Volts Phase B to Neutral: " << sensor.getVoltsPhaseBToNeutral() << endl;
cout << "Volts Phase C to Neutral: " << sensor.getVoltsPhaseCToNeutral() << endl;
cout << "Current Phase A: " << sensor->getCurrentPhaseA()
<< endl;
cout << "Current Phase B: " << sensor->getCurrentPhaseB()
<< endl;
cout << "Current Phase C: " << sensor->getCurrentPhaseC()
<< endl;
cout << "Current Phase A: " << sensor.getCurrentPhaseA() << endl;
cout << "Current Phase B: " << sensor.getCurrentPhaseB() << endl;
cout << "Current Phase C: " << sensor.getCurrentPhaseC() << endl;
cout << "Avg Real Power (kW): " << sensor->getAvgRealPower()
<< endl;
cout << "Min Real Power (kW): " << sensor->getMinRealPower()
<< endl;
cout << "Max Real Power (kW): " << sensor->getMaxRealPower()
<< endl;
cout << "Avg Real Power (kW): " << sensor.getAvgRealPower() << endl;
cout << "Min Real Power (kW): " << sensor.getMinRealPower() << endl;
cout << "Max Real Power (kW): " << sensor.getMaxRealPower() << endl;
}
cout << endl;
cout << endl;
sleep(2);
upm_delay(2);
}
cout << "Exiting..." << endl;
cout << "Exiting..." << endl;
delete sensor;
//! [Interesting]
//! [Interesting]
return 0;
return 0;
}