To Be Deploy
Dependencies: BLE_API mbed nRF51822 X_NUCLEO_IDB0XA1
Fork of BLE_EddystoneBeacon_Serviceprod by
Diff: EddystoneService.cpp
- Revision:
- 37:acd9b4823178
- Parent:
- 34:f6d4a699a1ea
diff -r 17b4a0ff9abb -r acd9b4823178 EddystoneService.cpp --- 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; } }