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,59 +22,59 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <unistd.h>
#include <iostream>
#include <signal.h>
#include "isd1820.hpp"
#include "upm_utilities.h"
using namespace std;
int main (int argc, char **argv)
int
main(int argc, char** argv)
{
//! [Interesting]
// Instantiate a ISD1820 on digital pins 2 (play) and 3 (record)
// This example was tested on the Grove Recorder.
//! [Interesting]
// Instantiate a ISD1820 on digital pins 2 (play) and 3 (record)
// This example was tested on the Grove Recorder.
upm::ISD1820* recorder = new upm::ISD1820(2, 3);
// if an argument was specified (any argument), go into record mode,
// else playback a previously recorded sample
upm::ISD1820 recorder(2, 3);
cout << "Supply any argument to the command line to record." << endl;
cout << "Running this example without arguments will play back any " << endl;
cout << "previously recorded sound." << endl;
cout << "There is approximately 10 seconds of recording time." << endl;
// if an argument was specified (any argument), go into record mode,
// else playback a previously recorded sample
cout << endl;
cout << "Supply any argument to the command line to record." << endl;
cout << "Running this example without arguments will play back any " << endl;
cout << "previously recorded sound." << endl;
cout << "There is approximately 10 seconds of recording time." << endl;
bool doRecord = false;
cout << endl;
if (argc > 1)
doRecord = true;
// depending on what was selected, do it, and sleep for 15 seconds
bool doRecord = false;
if (doRecord)
recorder->record(true);
else
recorder->play(true);
// There are about 10 seconds of recording/playback time, so we will
// sleep for a little extra time.
cout << "Sleeping for 15 seconds..." << endl;
sleep(15);
if (argc > 1)
doRecord = true;
// now, turn off whatever we were doing.
// depending on what was selected, do it, and upm_delay for 15 seconds
if (doRecord)
recorder->record(false);
else
recorder->play(false);
if (doRecord)
recorder.record(true);
else
recorder.play(true);
//! [Interesting]
// There are about 10 seconds of recording/playback time, so we will
// upm_delay for a little extra time.
cout << "Sleeping for 15 seconds..." << endl;
upm_delay(15);
cout << "Exiting..." << endl;
// now, turn off whatever we were doing.
delete recorder;
return 0;
if (doRecord)
recorder.record(false);
else
recorder.play(false);
//! [Interesting]
cout << "Exiting..." << endl;
return 0;
}