mirror of
https://github.com/eclipse/upm.git
synced 2025-07-03 10:21:19 +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,73 +22,61 @@
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
#include <iostream>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "mma7361.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
|
||||
main()
|
||||
{
|
||||
signal(SIGINT, sig_handler);
|
||||
signal(SIGINT, sig_handler);
|
||||
|
||||
//! [Interesting]
|
||||
//! [Interesting]
|
||||
|
||||
// Instantiate a MMA7361 sensor on analog pins A0 (X), A1 (Y) A2
|
||||
// (Z), selftest pin on D2, sleep pin on D3 nd an analog reference
|
||||
// value of 5.0. The freefall pin and the range pin are unused
|
||||
// (-1).
|
||||
upm::MMA7361 *sensor = new upm::MMA7361(0, 1, 2, 2, 3, -1, -1, 5.0);
|
||||
// Instantiate a MMA7361 sensor on analog pins A0 (X), A1 (Y) A2
|
||||
// (Z), selftest pin on D2, upm_delay pin on D3 nd an analog reference
|
||||
// value of 5.0. The freefall pin and the range pin are unused
|
||||
// (-1).
|
||||
upm::MMA7361 sensor(0, 1, 2, 2, 3, -1, -1, 5.0);
|
||||
|
||||
// 1.5g (true = 6g)
|
||||
sensor->setRange(false);
|
||||
// 1.5g (true = 6g)
|
||||
sensor.setRange(false);
|
||||
|
||||
// Every 10th of a second, update and print values
|
||||
// Every 10th of a second, update and print values
|
||||
|
||||
while (shouldRun)
|
||||
{
|
||||
sensor->update();
|
||||
while (shouldRun) {
|
||||
sensor.update();
|
||||
|
||||
float x, y, z;
|
||||
float x, y, z;
|
||||
|
||||
sensor->getAcceleration(&x, &y, &z);
|
||||
cout << "Acceleration x = "
|
||||
<< x
|
||||
<< " y = "
|
||||
<< y
|
||||
<< "z = "
|
||||
<< z
|
||||
<< endl;
|
||||
sensor.getAcceleration(&x, &y, &z);
|
||||
cout << "Acceleration x = " << x << " y = " << y << "z = " << z << endl;
|
||||
|
||||
sensor->getVolts(&x, &y, &z);
|
||||
cout << "Volts x = "
|
||||
<< x
|
||||
<< " y = "
|
||||
<< y
|
||||
<< "z = "
|
||||
<< z
|
||||
<< endl;
|
||||
sensor.getVolts(&x, &y, &z);
|
||||
cout << "Volts x = " << x << " y = " << y << "z = " << z << endl;
|
||||
|
||||
cout << endl;
|
||||
cout << endl;
|
||||
|
||||
usleep(100000);
|
||||
upm_delay_us(100000);
|
||||
}
|
||||
|
||||
//! [Interesting]
|
||||
//! [Interesting]
|
||||
|
||||
printf("Exiting...\n");
|
||||
printf("Exiting...\n");
|
||||
|
||||
delete sensor;
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user