alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-03 02:11:15 +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

80
examples/c++/mhz16.cxx
View File

@ -22,63 +22,63 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <unistd.h>
#include <iostream>
#include <signal.h>
#include <string>
#include "mhz16.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]
// Instantiate a MHZ16 serial CO2 sensor on uart 0.
// This example was tested on the Grove CO2 sensor module.
//! [Interesting]
// Instantiate a MHZ16 serial CO2 sensor on uart 0.
// This example was tested on the Grove CO2 sensor module.
upm::MHZ16* co2 = new upm::MHZ16(0);
// make sure port is initialized properly. 9600 baud is the default.
if (!co2->setupTty(B9600))
{
cerr << "Failed to setup tty port parameters" << endl;
return 1;
}
cout << "Make sure that the sensor has had at least 3 minutes to warm up"
<< endl;
cout << "or you will not get valid results." << endl;
cout << "The temperature reported is not the ambient temperature, " << endl;
cout << "but rather the temperature of the sensor elements." << endl;
upm::MHZ16 co2(0);
sleep(1);
while (shouldRun)
{
if(!co2->getData()){
cerr << "Failed to retrieve data" << endl;
continue;
}
cout << "CO2 concentration: " << co2->getGas() << " PPM, "
<< "Temperature (in C): " << co2->getTemperature() <<endl;
sleep(2);
// make sure port is initialized properly. 9600 baud is the default.
if (!co2.setupTty(B9600)) {
cerr << "Failed to setup tty port parameters" << endl;
return 1;
}
//! [Interesting]
cout << "Make sure that the sensor has had at least 3 minutes to warm up" << endl;
cout << "or you will not get valid results." << endl;
cout << "The temperature reported is not the ambient temperature, " << endl;
cout << "but rather the temperature of the sensor elements." << endl;
cout << "Exiting..." << endl;
upm_delay(1);
delete co2;
return 0;
while (shouldRun) {
if (!co2.getData()) {
cerr << "Failed to retrieve data" << endl;
continue;
}
cout << "CO2 concentration: " << co2.getGas() << " PPM, "
<< "Temperature (in C): " << co2.getTemperature() << endl;
upm_delay(2);
}
//! [Interesting]
cout << "Exiting..." << endl;
return 0;
}