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,69 +22,70 @@
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
#include <cmath>
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "ldt0028.hpp"
|
||||
#include "upm_utilities.h"
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
//! [Interesting]
|
||||
//! [Interesting]
|
||||
const int NUMBER_OF_SECONDS = 10;
|
||||
const int MICROSECONDS_PER_SECOND = 1000000;
|
||||
const int SAMPLES_PER_SECOND = 50;
|
||||
const int THRESHOLD = 100;
|
||||
|
||||
// Create the LDT0-028 Piezo Vibration Sensor object using AIO pin 0
|
||||
upm::LDT0028* sensor = new upm::LDT0028(0);
|
||||
upm::LDT0028 sensor(0);
|
||||
|
||||
// Read the signal every 20 milliseconds for 10 seconds
|
||||
std::cout << "For the next " << NUMBER_OF_SECONDS << " seconds, "
|
||||
<< SAMPLES_PER_SECOND << " samples will be taken every second."
|
||||
<< std::endl << std::endl;
|
||||
std::cout << "For the next " << NUMBER_OF_SECONDS << " seconds, " << SAMPLES_PER_SECOND
|
||||
<< " samples will be taken every second." << std::endl
|
||||
<< std::endl;
|
||||
uint16_t buffer[NUMBER_OF_SECONDS * SAMPLES_PER_SECOND];
|
||||
for (int i=0; i < NUMBER_OF_SECONDS * SAMPLES_PER_SECOND; i++) {
|
||||
buffer[i] = (uint16_t) sensor->getSample();
|
||||
usleep(MICROSECONDS_PER_SECOND / SAMPLES_PER_SECOND);
|
||||
for (int i = 0; i < NUMBER_OF_SECONDS * SAMPLES_PER_SECOND; i++) {
|
||||
buffer[i] = (uint16_t) sensor.getSample();
|
||||
upm_delay_us(MICROSECONDS_PER_SECOND / SAMPLES_PER_SECOND);
|
||||
}
|
||||
|
||||
// Print the number of times the reading was greater than the threshold
|
||||
int count = 0;
|
||||
for (int i=0; i < NUMBER_OF_SECONDS * SAMPLES_PER_SECOND; i++) {
|
||||
for (int i = 0; i < NUMBER_OF_SECONDS * SAMPLES_PER_SECOND; i++) {
|
||||
if (buffer[i] > THRESHOLD) {
|
||||
count++;
|
||||
}
|
||||
}
|
||||
std::cout << sensor->name() << " exceeded the threshold value of " <<
|
||||
THRESHOLD << " a total of " << count << " times," << std::endl
|
||||
<< "out of a total of " << NUMBER_OF_SECONDS*SAMPLES_PER_SECOND
|
||||
<< " readings." << std::endl << std::endl;
|
||||
std::cout << sensor.name() << " exceeded the threshold value of " << THRESHOLD << " a total of "
|
||||
<< count << " times," << std::endl
|
||||
<< "out of a total of " << NUMBER_OF_SECONDS * SAMPLES_PER_SECOND << " readings."
|
||||
<< std::endl
|
||||
<< std::endl;
|
||||
|
||||
// Print a graphical representation of the average value sampled
|
||||
// each second for the past 10 seconds, using a scale factor of 15
|
||||
std::cout << "Now printing a graphical representation of the average reading "
|
||||
<< std::endl << "each second for the last "
|
||||
<< NUMBER_OF_SECONDS << " seconds." << std::endl;
|
||||
std::cout << "Now printing a graphical representation of the average reading " << std::endl
|
||||
<< "each second for the last " << NUMBER_OF_SECONDS << " seconds." << std::endl;
|
||||
const int SCALE_FACTOR = 15;
|
||||
for (int i=0; i < NUMBER_OF_SECONDS; i++) {
|
||||
for (int i = 0; i < NUMBER_OF_SECONDS; i++) {
|
||||
long sum = 0;
|
||||
for (int j=0; j < SAMPLES_PER_SECOND; j++) {
|
||||
sum += buffer[i*SAMPLES_PER_SECOND + j];
|
||||
for (int j = 0; j < SAMPLES_PER_SECOND; j++) {
|
||||
sum += buffer[i * SAMPLES_PER_SECOND + j];
|
||||
}
|
||||
double average = (double) sum / (double) SAMPLES_PER_SECOND;
|
||||
int stars_to_print = (int) round(average / SCALE_FACTOR);
|
||||
std::cout << "(" << std::setw(4) << (int) round(average) << ") | ";
|
||||
for (int j=0; j<stars_to_print; j++) {
|
||||
for (int j = 0; j < stars_to_print; j++) {
|
||||
std::cout << "*";
|
||||
}
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
// Delete the sensor object
|
||||
delete sensor;
|
||||
//! [Interesting]
|
||||
//! [Interesting]
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user