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

Comitter:
mbedAustin
Date:
Thu Sep 10 19:05:44 2015 +0000
Parent:
39:2c73bc1ff4f5
Child:
41:61beba0a04ab
Commit message:
added tlm configuration parameter

Changed in this revision

BLE_API.lib Show annotated file Show diff for this revision Revisions of this file
EddystoneConfigService.h Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/BLE_API.lib	Thu Sep 10 17:06:18 2015 +0000
+++ b/BLE_API.lib	Thu Sep 10 19:05:44 2015 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/Bluetooth-Low-Energy/code/BLE_API/#8cea5d9c12c0
+http://mbed.org/teams/Bluetooth-Low-Energy/code/BLE_API/#9870b918354f
--- a/EddystoneConfigService.h	Thu Sep 10 17:06:18 2015 +0000
+++ b/EddystoneConfigService.h	Thu Sep 10 19:05:44 2015 +0000
@@ -171,6 +171,8 @@
         beaconPeriodChar(UUID_BEACON_PERIOD_CHAR, &params.beaconPeriod),
         resetChar(UUID_RESET_CHAR, &resetFlag) 
         {
+        // set eddystone as not configured yet. 
+        params.isConfigured = false;
         //Set UID frame
         memcpy(defaultUidNamespaceID,defaultUIDNamespaceIDIn,UID_NAMESPACEID_SIZE);
         memcpy(defaultUidInstanceID,defaultUIDInstanceIDIn,UID_INSTANCEID_SIZE);
@@ -279,7 +281,7 @@
         extern void saveURIBeaconConfigParams(const Params_t *paramsP); /* forward declaration; necessary to avoid a circular dependency. */
         saveURIBeaconConfigParams(&params);
 
-        static EddystoneService eddyServ(ble,params.beaconPeriod,params.txPowerMode, (uint8_t *) params.uidNamespaceID, (uint8_t *) params.uidInstanceID, (const char *) params.uriData, params.uriDataLength, params.tlmVersion );
+        static EddystoneService eddyServ(ble,params.beaconPeriod,params.txPowerMode, (uint8_t *) params.uidNamespaceID, (uint8_t *) params.uidInstanceID, (const char *) params.uriData, params.uriDataLength, params.tlmVersion, params.tlmEnabled );
 //        updateTlmPduCount(0);
 //        updateTlmTimeSinceBoot(0);
 
@@ -348,6 +350,7 @@
             resetToDefaults();
         }
         updateCharacteristicValues();
+        params.isConfigured = true;
     }
 
     /*
--- a/main.cpp	Thu Sep 10 17:06:18 2015 +0000
+++ b/main.cpp	Thu Sep 10 19:05:44 2015 +0000
@@ -51,7 +51,7 @@
 }
 
 /**
- * Callback triggered upon a disconnection event. Needs to re-enable advertisements.
+ * Callback triggered upon a disconnection event.
  */
 void disconnectionCallback(Gap::Handle_t handle, Gap::DisconnectionReason_t reason)
 {
@@ -60,7 +60,7 @@
         timeout();
     }
     else{
-        // eddystone is not configured, keep advertising    
+        // eddystone is not configured, continue advertising    
         ble.gap().startAdvertising();
         printf("disconnect CB\r\n");
     }