Diff: main.cpp

Revision:

71:12660a3eb07d

Parent:

69:f121dba6fcd3

Child:

72:eb4de3de66b8

--- a/main.cpp	Thu Jul 02 08:47:11 2015 +0000
+++ b/main.cpp	Tue Jul 21 12:28:34 2015 +0000
@@ -1,5 +1,5 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
+ * Copyright (c) 2006-2015 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,39 +15,28 @@
  */
 
 #include "mbed.h"
-#include "iBeaconService.h"
-
-/**
- * For this demo application, populate the beacon advertisement payload
- * with 2 AD structures: FLAG and MSD (manufacturer specific data).
- *
- * Reference:
- *  Bluetooth Core Specification 4.0 (Vol. 3), Part C, Section 11, 18
- */
+#include "ble/services/iBeacon.h"
 
 BLE ble;
 
-/**
- * The Beacon payload has the following composition:
- * 128-Bit / 16byte UUID = E2 0A 39 F4 73 F5 4B C4 A1 2F 17 D1 AD 07 A9 61
- * Major/Minor  = 0x1122 / 0x3344
- * Tx Power     = 0xC8 = 200, 2's compliment is 256-200 = (-56dB)
- *
- * Note: please remember to calibrate your beacons
- * TX Power for more accurate results.
- */
-const uint8_t uuid[] = {0xE2, 0x0A, 0x39, 0xF4, 0x73, 0xF5, 0x4B, 0xC4,
-                        0xA1, 0x2F, 0x17, 0xD1, 0xAD, 0x07, 0xA9, 0x61
-                       };
-uint16_t majorNumber = 1122;
-uint16_t minorNumber = 3344;
-uint16_t txPower = 0xC8;
-
 int main(void)
 {
     ble.init();
 
-    iBeaconService ibeacon(ble, uuid, majorNumber, minorNumber, txPower);
+    /**
+     * The Beacon payload has the following composition:
+     * 128-Bit / 16byte UUID = E2 0A 39 F4 73 F5 4B C4 A1 2F 17 D1 AD 07 A9 61
+     * Major/Minor  = 0x1122 / 0x3344
+     * Tx Power     = 0xC8 = 200, 2's compliment is 256-200 = (-56dB)
+     *
+     * Note: please remember to calibrate your beacons TX Power for more accurate results.
+     */
+    const uint8_t uuid[] = {0xE2, 0x0A, 0x39, 0xF4, 0x73, 0xF5, 0x4B, 0xC4,
+                            0xA1, 0x2F, 0x17, 0xD1, 0xAD, 0x07, 0xA9, 0x61};
+    uint16_t majorNumber = 1122;
+    uint16_t minorNumber = 3344;
+    uint16_t txPower     = 0xC8;
+    iBeacon ibeacon(ble, uuid, majorNumber, minorNumber, txPower);
 
     ble.gap().setAdvertisingInterval(1000); /* 1000ms. */
     ble.gap().startAdvertising();