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,8 +22,11 @@
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "pn532.hpp"
|
||||
|
||||
using namespace std;
|
||||
@ -32,84 +35,74 @@ using namespace std;
|
||||
// NOTE: this cannot exceed 34 characters.
|
||||
static char url[] = "iotdk.intel.com";
|
||||
|
||||
|
||||
int main(int argc, char **argv)
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
//! [Interesting]
|
||||
// Instantiate an PN532 on I2C bus 0 (default) using gpio 3 for the
|
||||
// IRQ, and gpio 2 for the reset pin.
|
||||
//! [Interesting]
|
||||
// Instantiate an PN532 on I2C bus 0 (default) using gpio 3 for the
|
||||
// IRQ, and gpio 2 for the reset pin.
|
||||
|
||||
upm::PN532 *nfc = new upm::PN532(3, 2);
|
||||
upm::PN532 nfc(3, 2);
|
||||
|
||||
if (!nfc->init())
|
||||
cerr << "init() failed" << endl;
|
||||
if (!nfc.init())
|
||||
cerr << "init() failed" << endl;
|
||||
|
||||
uint32_t vers = nfc->getFirmwareVersion();
|
||||
uint32_t vers = nfc.getFirmwareVersion();
|
||||
|
||||
if (vers)
|
||||
printf("Got firmware version: 0x%08x\n", vers);
|
||||
else
|
||||
{
|
||||
printf("Could not identify PN532\n");
|
||||
return 1;
|
||||
if (vers)
|
||||
printf("Got firmware version: 0x%08x\n", vers);
|
||||
else {
|
||||
printf("Could not identify PN532\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Now scan and identify any cards that come in range (1 for now)
|
||||
// Now scan and identify any cards that come in range (1 for now)
|
||||
|
||||
// Retry forever
|
||||
nfc->setPassiveActivationRetries(0xff);
|
||||
// Retry forever
|
||||
nfc.setPassiveActivationRetries(0xff);
|
||||
|
||||
nfc->SAMConfig();
|
||||
nfc.SAMConfig();
|
||||
|
||||
uint8_t uidSize;
|
||||
uint8_t uid[7];
|
||||
uint8_t uidSize;
|
||||
uint8_t uid[7];
|
||||
|
||||
bool foundCard = false;
|
||||
while (!foundCard)
|
||||
{
|
||||
memset(uid, 0, 7);
|
||||
if (nfc->readPassiveTargetID(nfc->BAUD_MIFARE_ISO14443A,
|
||||
uid, &uidSize, 2000))
|
||||
{
|
||||
// found a card
|
||||
printf("Found a card: UID len %d\n", uidSize);
|
||||
printf("UID: ");
|
||||
for (int i = 0; i < uidSize; i++)
|
||||
printf("%02x ", uid[i]);
|
||||
printf("\n");
|
||||
printf("SAK: 0x%02x\n", nfc->getSAK());
|
||||
printf("ATQA: 0x%04x\n\n", nfc->getATQA());
|
||||
foundCard = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("Waiting for a card...\n");
|
||||
bool foundCard = false;
|
||||
while (!foundCard) {
|
||||
memset(uid, 0, 7);
|
||||
if (nfc.readPassiveTargetID(nfc.BAUD_MIFARE_ISO14443A, uid, &uidSize, 2000)) {
|
||||
// found a card
|
||||
printf("Found a card: UID len %d\n", uidSize);
|
||||
printf("UID: ");
|
||||
for (int i = 0; i < uidSize; i++)
|
||||
printf("%02x ", uid[i]);
|
||||
printf("\n");
|
||||
printf("SAK: 0x%02x\n", nfc.getSAK());
|
||||
printf("ATQA: 0x%04x\n\n", nfc.getATQA());
|
||||
foundCard = true;
|
||||
} else {
|
||||
printf("Waiting for a card...\n");
|
||||
}
|
||||
}
|
||||
|
||||
if (uidSize != 7)
|
||||
{
|
||||
printf("This example will only write an NDEF URI to preformatted\n");
|
||||
printf("Mifare Ultralight or NTAG2XX tags\n");
|
||||
|
||||
return 1;
|
||||
if (uidSize != 7) {
|
||||
printf("This example will only write an NDEF URI to preformatted\n");
|
||||
printf("Mifare Ultralight or NTAG2XX tags\n");
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
// 48 bytes is maximum data area on ultralight cards, so we use that
|
||||
// as the maximum datasize here. Obviously if you have a bigger
|
||||
// card, you can write more data.
|
||||
if (!nfc->ntag2xx_WriteNDEFURI(nfc->NDEF_URIPREFIX_HTTP, url, 48))
|
||||
{
|
||||
// failure
|
||||
printf("Failed to write NDEF record tag.\n");
|
||||
return 1;
|
||||
// 48 bytes is maximum data area on ultralight cards, so we use that
|
||||
// as the maximum datasize here. Obviously if you have a bigger
|
||||
// card, you can write more data.
|
||||
if (!nfc.ntag2xx_WriteNDEFURI(nfc.NDEF_URIPREFIX_HTTP, url, 48)) {
|
||||
// failure
|
||||
printf("Failed to write NDEF record tag.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
printf("Success, URL record written to tag.\n");
|
||||
printf("Success, URL record written to tag.\n");
|
||||
|
||||
//! [Interesting]
|
||||
|
||||
//! [Interesting]
|
||||
|
||||
delete nfc;
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user