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,53 +22,45 @@
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "sm130.hpp"
|
||||
|
||||
using namespace std;
|
||||
using namespace upm;
|
||||
|
||||
int main (int argc, char **argv)
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
//! [Interesting]
|
||||
//! [Interesting]
|
||||
|
||||
// Instantiate a UART based SM130 RFID Module using defaults
|
||||
upm::SM130* sensor = new upm::SM130();
|
||||
// Instantiate a UART based SM130 RFID Module using defaults
|
||||
upm::SM130 sensor;
|
||||
|
||||
// set the baud rate. 19200 baud is the default.
|
||||
if (sensor->setBaudRate(19200))
|
||||
{
|
||||
cerr << "Failed to set baud rate" << endl;
|
||||
return 1;
|
||||
// set the baud rate. 19200 baud is the default.
|
||||
if (sensor.setBaudRate(19200)) {
|
||||
cerr << "Failed to set baud rate" << endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
cout << "Resetting..." << endl;
|
||||
sensor->reset();
|
||||
cout << "Resetting..." << endl;
|
||||
sensor.reset();
|
||||
|
||||
cout << "Firmware revision: " << sensor->getFirmwareVersion() << endl;
|
||||
cout << "Firmware revision: " << sensor.getFirmwareVersion() << endl;
|
||||
|
||||
cout << "Waiting up to 5 seconds for a tag..." << endl;
|
||||
cout << "Waiting up to 5 seconds for a tag..." << endl;
|
||||
|
||||
if (sensor->waitForTag(5000))
|
||||
{
|
||||
cout << "Found tag, UID: "
|
||||
<< sensor->string2HexString(sensor->getUID()) << endl;
|
||||
cout << "Tag Type: " << sensor->tag2String(sensor->getTagType())
|
||||
<< endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
// error
|
||||
cout << "waitForTag failed: " << sensor->getLastErrorString() << endl;
|
||||
if (sensor.waitForTag(5000)) {
|
||||
cout << "Found tag, UID: " << sensor.string2HexString(sensor.getUID()) << endl;
|
||||
cout << "Tag Type: " << sensor.tag2String(sensor.getTagType()) << endl;
|
||||
} else {
|
||||
// error
|
||||
cout << "waitForTag failed: " << sensor.getLastErrorString() << endl;
|
||||
}
|
||||
|
||||
//! [Interesting]
|
||||
//! [Interesting]
|
||||
|
||||
cout << "Exiting" << endl;
|
||||
delete sensor;
|
||||
return 0;
|
||||
cout << "Exiting" << endl;
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user