Revision 37:acd9b4823178, committed 2017-10-17

Comitter:

gagan3g

Date:

Tue Oct 17 06:21:39 2017 +0000

Parent:

36:17b4a0ff9abb

Commit message:

In Prod

Changed in this revision

--- a/EddystoneService.cpp	Tue Sep 20 14:13:43 2016 +0100
+++ b/EddystoneService.cpp	Tue Oct 17 06:21:39 2017 +0000
@@ -118,12 +118,12 @@
     return EDDYSTONE_ERROR_NONE;
 }
 
-EddystoneService::EddystoneError_t EddystoneService::startBeaconService(uint16_t consecUrlFramesIn, uint16_t consecUidFramesIn, uint16_t consecTlmFramesIn)
+EddystoneService::EddystoneError_t EddystoneService::startBeaconService(uint16_t justNothing_1, uint16_t consecUidFramesIn, uint16_t justNothing)
 {
     if (operationMode == EDDYSTONE_MODE_BEACON) {
         /* Nothing to do, we are already in beacon mode */
         return EDDYSTONE_ERROR_NONE;
-    } else if (!consecUrlFramesIn && !consecUidFramesIn && !consecTlmFramesIn) {
+    } else if (!consecUidFramesIn) {
         /* Nothing to do, the user wants 0 consecutive frames of everything */
         return EDDYSTONE_ERROR_INVALID_CONSEC_FRAMES;
     } else if (!beaconPeriod) {
@@ -135,9 +135,9 @@
      * cause URL or UID frames to be advertised first!
      */
     currentAdvertisedFrame            = EDDYSTONE_FRAME_TLM;
-    consecFrames[EDDYSTONE_FRAME_URL] = consecUrlFramesIn;
+    
     consecFrames[EDDYSTONE_FRAME_UID] = consecUidFramesIn;
-    consecFrames[EDDYSTONE_FRAME_TLM] = consecTlmFramesIn;
+  //  consecFrames[EDDYSTONE_FRAME_TLM] = consecTlmFramesIn;
 
     memset(currentConsecFrames, 0, sizeof(uint16_t) * NUM_EDDYSTONE_FRAMES);
 
@@ -232,14 +232,14 @@
         currentAdvertisedFrame = (currentAdvertisedFrame + 1) % NUM_EDDYSTONE_FRAMES;
 
         if (currentAdvertisedFrame == EDDYSTONE_FRAME_URL && consecFrames[EDDYSTONE_FRAME_URL] > 0) {
-            updateAdvertisementPacket(rawUrlFrame, urlFrame.getRawFrameSize());
+            updateAdvertisementPacket(rawUidFrame, uidFrame.getRawFrameSize());
             return;
         } else if (currentAdvertisedFrame == EDDYSTONE_FRAME_UID && consecFrames[EDDYSTONE_FRAME_UID] > 0) {
             updateAdvertisementPacket(rawUidFrame, uidFrame.getRawFrameSize());
             return;
         } else if (currentAdvertisedFrame == EDDYSTONE_FRAME_TLM && consecFrames[EDDYSTONE_FRAME_UID] > 0) {
-            updateRawTLMFrame();
-            updateAdvertisementPacket(rawTlmFrame, tlmFrame.getRawFrameSize());
+          //  updateRawTLMFrame();
+            updateAdvertisementPacket(rawUidFrame, uidFrame.getRawFrameSize());
             return;
         }
     }

--- a/main.cpp	Tue Sep 20 14:13:43 2016 +0100
+++ b/main.cpp	Tue Oct 17 06:21:39 2017 +0000
@@ -55,19 +55,19 @@
     }
 
     /* Set UID and TLM frame data */
-    const UIDNamespaceID_t uidNamespaceID = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99};
-    const UIDInstanceID_t  uidInstanceID  = {0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF};
+    const UIDNamespaceID_t uidNamespaceID = {0x87, 0x4c, 0x88, 0xb2, 0x4e, 0xb5, 0x4a, 0xda, 0xb0, 0x52};
+    const UIDInstanceID_t  uidInstanceID  = {0x33, 0x92, 0xd0, 0x34, 0xaf, 0xdb};
     uint8_t tlmVersion = 0x00;
 
     /* Initialize a EddystoneBeaconConfig service providing config params, default URI, and power levels. */
     static const PowerLevels_t defaultAdvPowerLevels = {-47, -33, -21, -13}; // Values for ADV packets related to firmware levels, calibrated based on measured values at 1m
-    static const PowerLevels_t radioPowerLevels      = {-30, -16, -4, 4};    // Values for radio power levels, provided by manufacturer.
+    static const PowerLevels_t radioPowerLevels      = {4, -30, -16, -4};    // Values for radio power levels, provided by manufacturer.
 
     /* Set everything to defaults */
     eddyServicePtr = new EddystoneService(ble, defaultAdvPowerLevels, radioPowerLevels);
 
     /* Set default URL, UID and TLM frame data if not initialized through the config service */
-    eddyServicePtr->setURLData("http://mbed.org");
+    eddyServicePtr->setURLData("https://goo.gl/XPGJj6");
     eddyServicePtr->setUIDData(&uidNamespaceID, &uidInstanceID);
     eddyServicePtr->setTLMData(tlmVersion);
 
@@ -76,7 +76,7 @@
     eddyServicePtr->onTLMBeaconTemperatureUpdate(tlmBeaconTemperatureCallback);
 
     /* Start Eddystone in config mode */
-    eddyServicePtr->startBeaconService(5, 5, 5);
+    eddyServicePtr->startBeaconService(0, 20, 0);
 }
 
 int main(void)