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:
Noel Eck
committed by
Mihai Tudor Panu
Mihai Tudor Panu
parent
bd6e4ec786
commit
5cefe7f5f3
@ -22,124 +22,113 @@
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "xbee.hpp"
|
||||
|
||||
using namespace std;
|
||||
using namespace upm;
|
||||
|
||||
void printUsage(char *progname)
|
||||
void
|
||||
printUsage(char* progname)
|
||||
{
|
||||
cout << "Usage: " << progname << " [AT command]" << endl;
|
||||
cout << endl;
|
||||
cout << "Usage: " << progname << " [AT command]" << endl;
|
||||
cout << endl;
|
||||
|
||||
cout << "If an argument is supplied on the command line, that argument is"
|
||||
<< endl;
|
||||
cout << "sent to the module and the response is printed out." << endl;
|
||||
cout << endl;
|
||||
cout << "If no argument is used, then the firmware revision, serial number"
|
||||
<< endl;
|
||||
cout << "and the current IP address (if set) are queried." << endl;
|
||||
cout << endl;
|
||||
cout << endl;
|
||||
cout << "If an argument is supplied on the command line, that argument is" << endl;
|
||||
cout << "sent to the module and the response is printed out." << endl;
|
||||
cout << endl;
|
||||
cout << "If no argument is used, then the firmware revision, serial number" << endl;
|
||||
cout << "and the current IP address (if set) are queried." << endl;
|
||||
cout << endl;
|
||||
cout << endl;
|
||||
}
|
||||
|
||||
//! [Interesting]
|
||||
|
||||
// simple helper function to send a command and wait for a response
|
||||
void sendCommand(upm::XBee* sensor, string cmd)
|
||||
void
|
||||
sendCommand(upm::XBee& sensor, string cmd)
|
||||
{
|
||||
// commands need to be terminated with a carriage return
|
||||
cmd += "\r";
|
||||
// commands need to be terminated with a carriage return
|
||||
cmd += "\r";
|
||||
|
||||
sensor->writeDataStr(cmd);
|
||||
|
||||
string resp;
|
||||
while (sensor->dataAvailable(2000))
|
||||
{
|
||||
resp += sensor->readDataStr(1024);
|
||||
sensor.writeDataStr(cmd);
|
||||
|
||||
string resp;
|
||||
while (sensor.dataAvailable(2000)) {
|
||||
resp += sensor.readDataStr(1024);
|
||||
}
|
||||
|
||||
if (resp.empty())
|
||||
{
|
||||
cerr << "Timed out waiting for response" << endl;
|
||||
return;
|
||||
if (resp.empty()) {
|
||||
cerr << "Timed out waiting for response" << endl;
|
||||
return;
|
||||
}
|
||||
|
||||
resp = sensor->stringCR2LF(resp);
|
||||
cout << "Returned (" << resp.size() << " bytes): " << endl;
|
||||
cout << resp << endl;
|
||||
resp = sensor.stringCR2LF(resp);
|
||||
cout << "Returned (" << resp.size() << " bytes): " << endl;
|
||||
cout << resp << endl;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
// Instantiate a XBee Module on UART 0
|
||||
upm::XBee sensor(0);
|
||||
|
||||
// Instantiate a XBee Module on UART 0
|
||||
upm::XBee* sensor = new upm::XBee(0);
|
||||
|
||||
// Set the baud rate, 9600 baud is the default.
|
||||
if (sensor->setBaudRate(9600))
|
||||
{
|
||||
cerr << "Failed to set tty baud rate" << endl;
|
||||
return 1;
|
||||
// Set the baud rate, 9600 baud is the default.
|
||||
if (sensor.setBaudRate(9600)) {
|
||||
cerr << "Failed to set tty baud rate" << endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
printUsage(argv[0]);
|
||||
printUsage(argv[0]);
|
||||
|
||||
if (argc > 1)
|
||||
{
|
||||
// enable command mode
|
||||
sensor->commandMode();
|
||||
cout << "Sending command line argument (" << argv[1] << ")..." << endl;
|
||||
sendCommand(sensor, argv[1]);
|
||||
}
|
||||
else
|
||||
{
|
||||
// enable command mode
|
||||
sensor->commandMode();
|
||||
// query the verbose firmware revision
|
||||
cout << "Querying verbose firmware revision (ATVL)..." << endl;
|
||||
sendCommand(sensor, "ATVL");
|
||||
// query the number
|
||||
cout << "Querying Serial Number High (ATSH)..." << endl;
|
||||
sendCommand(sensor, "ATSH");
|
||||
cout << "Querying Serial Number Low (ATSL)..." << endl;
|
||||
sendCommand(sensor, "ATSL");
|
||||
if (argc > 1) {
|
||||
// enable command mode
|
||||
sensor.commandMode();
|
||||
cout << "Sending command line argument (" << argv[1] << ")..." << endl;
|
||||
sendCommand(sensor, argv[1]);
|
||||
} else {
|
||||
// enable command mode
|
||||
sensor.commandMode();
|
||||
// query the verbose firmware revision
|
||||
cout << "Querying verbose firmware revision (ATVL)..." << endl;
|
||||
sendCommand(sensor, "ATVL");
|
||||
// query the number
|
||||
cout << "Querying Serial Number High (ATSH)..." << endl;
|
||||
sendCommand(sensor, "ATSH");
|
||||
cout << "Querying Serial Number Low (ATSL)..." << endl;
|
||||
sendCommand(sensor, "ATSL");
|
||||
|
||||
cout << "Querying address, if set (ATMY)..." << endl;
|
||||
sendCommand(sensor, "ATMY");
|
||||
cout << "Querying address, if set (ATMY)..." << endl;
|
||||
sendCommand(sensor, "ATMY");
|
||||
|
||||
// For the XBee WiFi S6B
|
||||
// A comprehensive list of commands and command modes is
|
||||
// available from the datasheet at:
|
||||
// ftp1.digi.com/support/documentation/90002180_L.pdf
|
||||
// For the XBee WiFi S6B
|
||||
// A comprehensive list of commands and command modes is
|
||||
// available from the datasheet at:
|
||||
// ftp1.digi.com/support/documentation/90002180_L.pdf
|
||||
|
||||
// For the XBee S1
|
||||
// A comprehensive list of commands and command modes is
|
||||
// available from the datasheet at:
|
||||
// http://www.sparkfun.com/datasheets/Wireless/Zigbee/XBee-Datasheet.pdf
|
||||
// For the XBee S1
|
||||
// A comprehensive list of commands and command modes is
|
||||
// available from the datasheet at:
|
||||
// http://www.sparkfun.com/datasheets/Wireless/Zigbee/XBee-Datasheet.pdf
|
||||
|
||||
// For the XBee WiFi module:
|
||||
// An example using AT commands to connect to an AP, with a
|
||||
// private Key using WPA2:
|
||||
// For the XBee WiFi module:
|
||||
// An example using AT commands to connect to an AP, with a
|
||||
// private Key using WPA2:
|
||||
|
||||
// Connect to AP with SSID 'mySSID':
|
||||
// ATIDmySSID
|
||||
// Connect to AP with SSID 'mySSID':
|
||||
// ATIDmySSID
|
||||
|
||||
// Provide the private key 'secret':
|
||||
// ATPKsecret
|
||||
|
||||
// Use WPA2 encryption
|
||||
// ATEE2
|
||||
// Provide the private key 'secret':
|
||||
// ATPKsecret
|
||||
|
||||
// Use WPA2 encryption
|
||||
// ATEE2
|
||||
}
|
||||
|
||||
|
||||
delete sensor;
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! [Interesting]
|
||||
|
||||
Reference in New Issue
Block a user