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:
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

View File

@ -22,15 +22,16 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <unistd.h>
#include <iostream>
#include "lpd8806.hpp"
#include <signal.h>
#include <stdio.h>
void scanner(uint8_t r, uint8_t g, uint8_t b, uint8_t wait);
#include "lpd8806.hpp"
#include "upm_utilities.h"
void scanner(upm::LPD8806& sensor, uint8_t r, uint8_t g, uint8_t b, uint8_t wait);
int doWork = 0;
upm::LPD8806 *sensor = NULL;
void
sig_handler(int signo)
@ -43,61 +44,61 @@ sig_handler(int signo)
}
int
main(int argc, char **argv)
main(int argc, char** argv)
{
//! [Interesting]
sensor = new upm::LPD8806(0, 7, 10);
usleep (1000000);
upm::LPD8806 sensor(0, 7, 10);
upm_delay_us(1000000);
sensor->show ();
sensor.show();
while (!doWork) {
// Back-and-forth lights
scanner(127, 0, 0, 30); // red, slow
scanner(0, 0, 127, 15); // blue, fast
usleep (1000000);
scanner(sensor, 127, 0, 0, 30); // red, slow
scanner(sensor, 0, 0, 127, 15); // blue, fast
upm_delay_us(1000000);
}
//! [Interesting]
std::cout << "exiting application" << std::endl;
delete sensor;
return 0;
}
void scanner(uint8_t r, uint8_t g, uint8_t b, uint8_t wait) {
void
scanner(upm::LPD8806& sensor, uint8_t r, uint8_t g, uint8_t b, uint8_t wait)
{
int i, j, pos, dir;
pos = 0;
dir = 1;
for(i=0; i < ((sensor->getStripLength() - 1) * 8); i++) {
for (i = 0; i < ((sensor.getStripLength() - 1) * 8); i++) {
// Draw 5 pixels centered on pos. setPixelColor() will clip
// any pixels off the ends of the strip, no worries there.
// we'll make the colors dimmer at the edges for a nice pulse
// look
sensor->setPixelColor(pos - 2, r/4, g/4, b/4);
sensor->setPixelColor(pos - 1, r/2, g/2, b/2);
sensor->setPixelColor(pos, r, g, b);
sensor->setPixelColor(pos + 1, r/2, g/2, b/2);
sensor->setPixelColor(pos + 2, r/4, g/4, b/4);
sensor.setPixelColor(pos - 2, r / 4, g / 4, b / 4);
sensor.setPixelColor(pos - 1, r / 2, g / 2, b / 2);
sensor.setPixelColor(pos, r, g, b);
sensor.setPixelColor(pos + 1, r / 2, g / 2, b / 2);
sensor.setPixelColor(pos + 2, r / 4, g / 4, b / 4);
sensor->show();
usleep (wait * 1000);
sensor.show();
upm_delay_us(wait * 1000);
// If we wanted to be sneaky we could erase just the tail end
// pixel, but it's much easier just to erase the whole thing
// and draw a new one next time.
for(j=-2; j<= 2; j++) {
sensor->setPixelColor(pos+j, 0,0,0);
for (j = -2; j <= 2; j++) {
sensor.setPixelColor(pos + j, 0, 0, 0);
}
// Bounce off ends of strip
pos += dir;
if(pos < 0) {
if (pos < 0) {
pos = 1;
dir = -dir;
} else if (pos >= sensor->getStripLength()) {
pos = sensor->getStripLength() - 2;
} else if (pos >= sensor.getStripLength()) {
pos = sensor.getStripLength() - 2;
dir = -dir;
}
}