alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-03 02:11:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

examples: Remove heap allocation from C++ examples

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

128
examples/c++/hm11.cxx
View File

@ -22,101 +22,95 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <unistd.h>
#include <iostream>
#include <signal.h>
#include <stdio.h>
#include <string.h>
#include <string>
#include "hm11.hpp"
#include "upm_utilities.h"
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 address and PIN of the module"
<< endl;
cout << "are queried and the results printed out." << 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 address and PIN of the module" << endl;
cout << "are queried and the results printed out." << endl;
cout << endl;
cout << endl;
}
// simple helper function to send a command and wait for a response
void sendCommand(upm::HM11* ble, char *cmd)
void
sendCommand(upm::HM11& ble, char* cmd)
{
char buffer[BUFSIZ];
ble->writeData(cmd, strlen(cmd));
char buffer[BUFSIZ];
ble.writeData(cmd, strlen(cmd));
// wait up to 1 second
if (ble->dataAvailable(1000))
{
memset(buffer, 0, BUFSIZ);
// wait up to 1 second
if (ble.dataAvailable(1000)) {
memset(buffer, 0, BUFSIZ);
ble->readData(buffer, BUFSIZ - 1);
cout << "Returned: " << buffer << endl;
}
else
{
cerr << "Timed out waiting for response" << endl;
ble.readData(buffer, BUFSIZ - 1);
cout << "Returned: " << buffer << endl;
} else {
cerr << "Timed out waiting for response" << endl;
}
}
int main (int argc, char **argv)
int
main(int argc, char** argv)
{
//! [Interesting]
// Instantiate a HM11 BLE Module on UART 0
//! [Interesting]
// Instantiate a HM11 BLE Module on UART 0
upm::HM11* ble = new upm::HM11(0);
upm::HM11 ble(0);
// make sure port is initialized properly. 9600 baud is the default.
if (!ble->setupTty(B9600))
{
cerr << "Failed to setup tty port parameters" << endl;
return 1;
// make sure port is initialized properly. 9600 baud is the default.
if (!ble.setupTty(B9600)) {
cerr << "Failed to setup tty port parameters" << endl;
return 1;
}
printUsage(argv[0]);
printUsage(argv[0]);
if (argc > 1)
{
cout << "Sending command line argument (" << argv[1] << ")..." << endl;
sendCommand(ble, argv[1]);
}
else
{
// query the module address
char addr[] = "AT+ADDR?";
cout << "Querying module address (" << addr << ")..." << endl;
sendCommand(ble, addr);
if (argc > 1) {
cout << "Sending command line argument (" << argv[1] << ")..." << endl;
sendCommand(ble, argv[1]);
} else {
// query the module address
char addr[] = "AT+ADDR?";
cout << "Querying module address (" << addr << ")..." << endl;
sendCommand(ble, addr);
sleep(1);
upm_delay(1);
// query the module address
char pin[] = "AT+PASS?";
cout << "Querying module PIN (" << pin << ")..." << endl;
sendCommand(ble, pin);
// query the module address
char pin[] = "AT+PASS?";
cout << "Querying module PIN (" << pin << ")..." << endl;
sendCommand(ble, pin);
// Other potentially useful commands are:
//
// AT+VERS? - query module version
// AT+ROLE0 - set as slave
// AT+ROLE1 - set as master
// AT+CLEAR - clear all previous settings
// AT+RESET - restart the device
//
// A comprehensive list is available from the datasheet at:
// http://www.seeedstudio.com/wiki/images/c/cd/Bluetooth4_en.pdf
// Other potentially useful commands are:
//
// AT+VERS? - query module version
// AT+ROLE0 - set as slave
// AT+ROLE1 - set as master
// AT+CLEAR - clear all previous settings
// AT+RESET - restart the device
//
// A comprehensive list is available from the datasheet at:
// http://www.seeedstudio.com/wiki/images/c/cd/Bluetooth4_en.pdf
}
//! [Interesting]
//! [Interesting]
delete ble;
return 0;
return 0;
}