Revision 8:54535e2f4098, committed 2014-07-03

Comitter:

stiaje

Date:

Thu Jul 03 12:51:28 2014 +0000

Parent:

7:99a7ec2bf90a

Commit message:

Switch to new BLE API

Changed in this revision

diff -r 99a7ec2bf90a -r 54535e2f4098 main.cpp
--- a/main.cpp	Thu Jul 03 10:48:53 2014 +0000
+++ b/main.cpp	Thu Jul 03 12:51:28 2014 +0000
@@ -1,7 +1,7 @@
 #include <mbed.h>
-#include "nRF51822n.h"
+#include "BLEDevice.h"
 
-#define DEBUG 1
+#define DEBUG 0
 #ifdef DEBUG
     Serial pc(USBTX, USBRX);
     #define LOG(args...)    pc.printf(args)
@@ -13,7 +13,7 @@
  * The Beacon payload (encapsulated within the MSD advertising data structure)
  * has the following composition:
  * 128-Bit UUID = E2 0A 39 F4 73 F5 4B C4 A1 2F 17 D1 AD 07 A9 61
- * Major/Minor  = 0000 / 0000
+ * Major/Minor  = 1337 / XXXX
  * Tx Power     = C8
  */
 const static uint8_t beaconPayload[] = {
@@ -22,35 +22,28 @@
     0x15,       // length of the remaining payload
     0xE2, 0x0A, 0x39, 0xF4, 0x73, 0xF5, 0x4B, 0xC4, // UUID
     0xA1, 0x2F, 0x17, 0xD1, 0xAD, 0x07, 0xA9, 0x61,
-    0x13, 0x37, // the major value to differenciate a location
-    0x13, 0x38, // the minor value to differenciate a location
+    0x13, 0x37, // the major value to differenciate a location (Our app requires 1337 as major number)
+    0x13, 0x38, // the minor value to differenciate a location (Change this to differentiate location pucks)
     0xC8        // 2's complement of the Tx power (-56dB)
 };
 
-nRF51822n nrf;
+BLEDevice ble;
 DigitalOut led1(LED1);
 
-GapAdvertisingData advData;
-GapAdvertisingData scanResponse;
-GapAdvertisingParams advParams(GapAdvertisingParams::ADV_NON_CONNECTABLE_UNDIRECTED);
-
 int main(void) {
     led1 = 1;
 
-    LOG("Starting init\n");
-    nrf.init();
-    nrf.reset();
-    LOG("Init and reset nrf done\n");
+    LOG("Initializing ble beacon\n");
+    ble.init();
 
-    advData.addFlags(GapAdvertisingData::BREDR_NOT_SUPPORTED);
-    advData.addData(GapAdvertisingData::MANUFACTURER_SPECIFIC_DATA,
+    ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED);
+    ble.accumulateAdvertisingPayload(GapAdvertisingData::MANUFACTURER_SPECIFIC_DATA,
                     beaconPayload, sizeof(beaconPayload));
-    advData.addAppearance(GapAdvertisingData::UNKNOWN);
+    
+    ble.setAdvertisingType(GapAdvertisingParams::ADV_NON_CONNECTABLE_UNDIRECTED);
+    ble.setAdvertisingInterval(160); /* 100ms; in multiples of 0.625ms. */
 
-    nrf.getGap().setAdvertisingData(advData, scanResponse);
-    LOG("Set advertising data done!\n");
-
-    nrf.getGap().startAdvertising(advParams);
+    ble.startAdvertising();
     LOG("Starting advertising!\n");
 
     for(;;) {