Scott Jenson / Mbed 2 deprecated BLE_EddystoneBeaconConfigService_Button

Button initiated config service

Dependencies:   BLE_API_EddystoneConfigService_2 mbed nRF51822

Fork of BLE_EddystoneBeaconConfigService_3 by URIBeacon

Files at this revision

API Documentation at this revision

Revision 64:6484b9e3aac0, committed 2015-09-21

Comitter:
mbedAustin
Date:
Mon Sep 21 16:49:35 2015 +0000
Parent:
63:2478203aa555
Child:
65:3b2f2a67840e
Commit message:
re-ordered things in constructor to get rid of compiler warning about declaration and initialization order.

Changed in this revision

EddystoneConfigService.h Show annotated file Show diff for this revision Revisions of this file 
--- a/EddystoneConfigService.h	Mon Sep 21 16:40:02 2015 +0000
+++ b/EddystoneConfigService.h	Mon Sep 21 16:49:35 2015 +0000
@@ -127,19 +127,19 @@
                            PowerLevels_t &radioPowerLevelsIn) :
         ble(bleIn),
         params(paramsIn),       // Initialize URL Data
-        defaultUriDataLength(),
-        defaultUriData(),
-        defaultUidNamespaceID(), // Initialize UID Data
-        defaultUidInstanceID(),
-        defaultUrlPower(defaultAdvPowerLevelsIn[params.txPowerMode]),
-        defaultUidPower(defaultAdvPowerLevelsIn[params.txPowerMode]),
         defaultAdvPowerLevels(defaultAdvPowerLevelsIn),
         radioPowerLevels(radioPowerLevelsIn),
         initSucceeded(false),
         resetFlag(),
-        tlmIsSet(false),
+        defaultUidNamespaceID(), // Initialize UID Data
+        defaultUidInstanceID(),
+        defaultUidPower(defaultAdvPowerLevelsIn[params.txPowerMode]),
+        uidIsSet(false),
+        defaultUriDataLength(),
+        defaultUriData(),
+        defaultUrlPower(defaultAdvPowerLevelsIn[params.txPowerMode]),
         urlIsSet(false),
-        uidIsSet(false),
+        tlmIsSet(false),
         lockedStateChar(UUID_LOCK_STATE_CHAR, &params.lockedState),
         lockChar(UUID_LOCK_CHAR, &params.lock),
         uriDataChar(UUID_URI_DATA_CHAR, params.uriData, 0, URI_DATA_MAX,
@@ -511,7 +511,7 @@
 //UID Default value that is restored on reset
     UIDNamespaceID_t    defaultUidNamespaceID;
     UIDInstanceID_t     defaultUidInstanceID;
-    float            defaultUidAdvPeriod;
+    float               defaultUidAdvPeriod;
     int8_t              defaultUidPower;
     uint16_t            uidRFU;
     bool                uidIsSet;
@@ -520,12 +520,12 @@
     uint8_t             defaultUriDataLength;
     UriData_t           defaultUriData;
     int8_t              defaultUrlPower;
-    float            defaultUriAdvPeriod;
+    float               defaultUriAdvPeriod;
     bool                urlIsSet;
 
 //TLM  Default value that is restored on reset
     uint8_t             defaultTlmVersion;
-    float            defaultTlmAdvPeriod;
+    float               defaultTlmAdvPeriod;
     volatile uint16_t   TlmBatteryVoltage;
     volatile uint16_t   TlmBeaconTemp;
     volatile uint32_t   TlmPduCount;