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,16 +22,16 @@
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include <signal.h>
|
||||
|
||||
#include "kxcjk1013.hpp"
|
||||
#include "upm_utilities.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
int shouldRun = true;
|
||||
upm::KXCJK1013* accelerometer;
|
||||
|
||||
void
|
||||
sig_handler(int signo)
|
||||
@ -41,9 +41,11 @@ sig_handler(int signo)
|
||||
}
|
||||
|
||||
void
|
||||
data_callback(char* data)
|
||||
data_callback(char* data, void* args)
|
||||
{
|
||||
float x, y, z;
|
||||
upm::KXCJK1013* accelerometer = static_cast<upm::KXCJK1013*>(args);
|
||||
|
||||
accelerometer->extract3Axis(data, &x, &y, &z);
|
||||
cout << fixed << setprecision(1);
|
||||
cout << x << '\t' << y << '\t' << z << "[m/s^2]" << endl;
|
||||
@ -55,25 +57,24 @@ main()
|
||||
signal(SIGINT, sig_handler);
|
||||
//! [Interesting]
|
||||
// Instantiate a KXCJK1013 Accelerometer Sensor on iio device 0
|
||||
accelerometer = new upm::KXCJK1013(0);
|
||||
upm::KXCJK1013 accelerometer(0);
|
||||
// Available scales are 0.009582(2g), 0.019163(4g), and 0.038326(8g)
|
||||
accelerometer->setScale(0.019163);
|
||||
// Available sampling frequency are 0.781000, 1.563000, 3.125000, 6.250000, 12.500000, 25, 50,
|
||||
accelerometer.setScale(0.019163);
|
||||
// Available sampling frequency are 0.781000, 1.563000, 3.125000, 6.250000,
|
||||
// 12.500000, 25, 50,
|
||||
// 100, 200, 400, 800, and 1600
|
||||
accelerometer->setSamplingFrequency(25.0);
|
||||
accelerometer->enable3AxisChannel();
|
||||
accelerometer->installISR(data_callback, NULL);
|
||||
accelerometer->enableBuffer(16);
|
||||
accelerometer.setSamplingFrequency(25.0);
|
||||
accelerometer.enable3AxisChannel();
|
||||
accelerometer.installISR(data_callback, &accelerometer);
|
||||
accelerometer.enableBuffer(16);
|
||||
|
||||
while (shouldRun) {
|
||||
sleep(1);
|
||||
upm_delay(1);
|
||||
}
|
||||
accelerometer->disableBuffer();
|
||||
accelerometer.disableBuffer();
|
||||
|
||||
//! [Interesting]
|
||||
cout << "Exiting" << endl;
|
||||
|
||||
delete accelerometer;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user