aapje monkey
Bike service
Fork of
BLE_API
by 
Bluetooth Low Energy
Revision 830:a6ef72e0697a, committed 2015-09-29
- Comitter:
- rgrover1
- Date:
- Tue Sep 29 09:54:18 2015 +0100
- Parent:
- 829:9072de50087b
- Child:
- 831:47413688398a
- Commit message:
- Synchronized with git rev 1811f210
Author: Austin Blackstone
updated eddystone service and added config service.
Changed in this revision
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ble/services/EddystoneConfigService.h Tue Sep 29 09:54:18 2015 +0100
@@ -0,0 +1,548 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SERVICES_EDDYSTONEBEACONCONFIGSERVICE_H_
+#define SERVICES_EDDYSTONEBEACONCONFIGSERVICE_H_
+
+#include "mbed.h"
+#include "ble/BLE.h"
+#include "ble/services/EddystoneService.h"
+
+#define EDDYSTONE_NUM_UID_FRAMES 10
+#define EDDYSTONE_NUM_URL_FRAMES 50
+
+
+#define UUID_URI_BEACON(FIRST, SECOND) { \
+ 0xee, 0x0c, FIRST, SECOND, 0x87, 0x86, 0x40, 0xba, \
+ 0xab, 0x96, 0x99, 0xb9, 0x1a, 0xc9, 0x81, 0xd8, \
+}
+
+static const uint8_t UUID_URI_BEACON_SERVICE[] = UUID_URI_BEACON(0x20, 0x80);
+static const uint8_t UUID_LOCK_STATE_CHAR[] = UUID_URI_BEACON(0x20, 0x81);
+static const uint8_t UUID_LOCK_CHAR[] = UUID_URI_BEACON(0x20, 0x82);
+static const uint8_t UUID_UNLOCK_CHAR[] = UUID_URI_BEACON(0x20, 0x83);
+static const uint8_t UUID_URI_DATA_CHAR[] = UUID_URI_BEACON(0x20, 0x84);
+static const uint8_t UUID_FLAGS_CHAR[] = UUID_URI_BEACON(0x20, 0x85);
+static const uint8_t UUID_ADV_POWER_LEVELS_CHAR[] = UUID_URI_BEACON(0x20, 0x86);
+static const uint8_t UUID_TX_POWER_MODE_CHAR[] = UUID_URI_BEACON(0x20, 0x87);
+static const uint8_t UUID_BEACON_PERIOD_CHAR[] = UUID_URI_BEACON(0x20, 0x88);
+static const uint8_t UUID_RESET_CHAR[] = UUID_URI_BEACON(0x20, 0x89);
+extern const uint8_t BEACON_EDDYSTONE[2];
+
+/**
+* @class EddystoneConfigService
+* @brief Eddystone Configuration Service. Can be used to set URL, adjust power levels, and set flags.
+* See https://github.com/google/eddystone
+*
+*/
+class EddystoneConfigService
+{
+public:
+ /**
+ * @brief Transmission Power Modes for UriBeacon
+ */
+ static const uint8_t TX_POWER_MODE_LOWEST = 0; /*!< Lowest TX power mode */
+ static const uint8_t TX_POWER_MODE_LOW = 1; /*!< Low TX power mode */
+ static const uint8_t TX_POWER_MODE_MEDIUM = 2; /*!< Medium TX power mode */
+ static const uint8_t TX_POWER_MODE_HIGH = 3; /*!< High TX power mode */
+ static const unsigned NUM_POWER_MODES = 4; /*!< Number of Power Modes defined */
+
+ static const int ADVERTISING_INTERVAL_MSEC = 1000; // Advertising interval for config service.
+ static const int SERVICE_DATA_MAX = 31; // Maximum size of service data in ADV packets
+
+ typedef uint8_t Lock_t[16]; /* 128 bits */
+ typedef int8_t PowerLevels_t[NUM_POWER_MODES];
+
+ // There are currently 3 subframes defined, URI, UID, and TLM
+#define EDDYSTONE_MAX_FRAMETYPE 3
+ void (*frames[EDDYSTONE_MAX_FRAMETYPE])(uint8_t *, uint32_t);
+ uint8_t frameIndex;
+ static const int URI_DATA_MAX = 18;
+ typedef uint8_t UriData_t[URI_DATA_MAX];
+
+ // UID Frame Type subfields
+ static const int UID_NAMESPACEID_SIZE = 10;
+ typedef uint8_t UIDNamespaceID_t[UID_NAMESPACEID_SIZE];
+ static const int UID_INSTANCEID_SIZE = 6;
+ typedef uint8_t UIDInstanceID_t[UID_INSTANCEID_SIZE];
+
+ // Eddystone Frame Type ID
+ static const uint8_t FRAME_TYPE_UID = 0x00;
+ static const uint8_t FRAME_TYPE_URL = 0x10;
+ static const uint8_t FRAME_TYPE_TLM = 0x20;
+
+ static const uint8_t FRAME_SIZE_TLM = 14; // TLM frame is a constant 14Bytes
+ static const uint8_t FRAME_SIZE_UID = 20; // includes RFU bytes
+
+ struct Params_t {
+ // Config Data
+ bool isConfigured; // Flag for configuration being complete, True = configured, false = not configured. Reset at instantiation, used for external callbacks.
+ uint8_t lockedState;
+ Lock_t lock;
+ uint8_t flags;
+ PowerLevels_t advPowerLevels; // Current value of AdvertisedPowerLevels
+ uint8_t txPowerMode; // Firmware power levels used with setTxPower()
+ uint16_t beaconPeriod;
+ // TLM Frame Data
+ uint8_t tlmVersion; // version of TLM packet
+ bool tlmEnabled;
+ float tlmBeaconPeriod; // how often to broadcat TLM frame, in S
+ // URI Frame Data
+ uint8_t uriDataLength;
+ UriData_t uriData;
+ bool uriEnabled;
+ float uriBeaconPeriod; // how often to broadcast URIFrame, in S
+ // UID Frame Data
+ UIDNamespaceID_t uidNamespaceID; // UUID type, Namespace ID, 10B
+ UIDInstanceID_t uidInstanceID; // UUID type, Instance ID, 6B
+ bool uidEnabled;
+ float uidBeaconPeriod; // how often to broadcast UID Frame, in S
+ };
+
+ /**
+ * @param[ref] ble
+ * BLEDevice object for the underlying controller.
+ * @param[in/out] paramsIn
+ * Reference to application-visible beacon state, loaded
+ * from persistent storage at startup.
+ * @param[in] defaultAdvPowerLevelsIn
+ * Default power-levels array; applies only if the resetToDefaultsFlag is true.
+ */
+ EddystoneConfigService(BLEDevice &bleIn,
+ Params_t ¶msIn,
+ PowerLevels_t &defaultAdvPowerLevelsIn,
+ PowerLevels_t &radioPowerLevelsIn) :
+ ble(bleIn),
+ params(paramsIn), // Initialize URL Data
+ defaultAdvPowerLevels(defaultAdvPowerLevelsIn),
+ radioPowerLevels(radioPowerLevelsIn),
+ initSucceeded(false),
+ resetFlag(),
+ defaultUidNamespaceID(), // Initialize UID Data
+ defaultUidInstanceID(),
+ defaultUidPower(defaultAdvPowerLevelsIn[params.txPowerMode]),
+ uidIsSet(false),
+ defaultUriDataLength(),
+ defaultUriData(),
+ defaultUrlPower(defaultAdvPowerLevelsIn[params.txPowerMode]),
+ urlIsSet(false),
+ tlmIsSet(false),
+ lockedStateChar(UUID_LOCK_STATE_CHAR, ¶ms.lockedState),
+ lockChar(UUID_LOCK_CHAR, ¶ms.lock),
+ uriDataChar(UUID_URI_DATA_CHAR, params.uriData, 0, URI_DATA_MAX,
+ GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE),
+ unlockChar(UUID_UNLOCK_CHAR, ¶ms.lock),
+ flagsChar(UUID_FLAGS_CHAR, ¶ms.flags),
+ advPowerLevelsChar(UUID_ADV_POWER_LEVELS_CHAR, ¶ms.advPowerLevels),
+ txPowerModeChar(UUID_TX_POWER_MODE_CHAR, ¶ms.txPowerMode),
+ beaconPeriodChar(UUID_BEACON_PERIOD_CHAR, ¶ms.beaconPeriod),
+ resetChar(UUID_RESET_CHAR, &resetFlag)
+ {
+ // set eddystone as not configured yet. Used to exit config before timeout if GATT services are written to.
+ params.isConfigured = false;
+ }
+
+ /*
+ * @breif Start EddystoneConfig advertising. This function should be called after the EddystoneConfig constructor and after all the frames have been added.
+ * @paramsP[in] resetToDefaultsFlag
+ * Applies to the state of the 'paramsIn' parameter.
+ * If true, it indicates that paramsIn is potentially
+ * un-initialized, and default values should be used
+ * instead. Otherwise, paramsIn overrides the defaults.
+ *
+ */
+ void start(bool resetToDefaultsFlag){
+ INFO("reset to defaults flag = %d", resetToDefaultsFlag);
+ if (!resetToDefaultsFlag && (params.uriDataLength > URI_DATA_MAX)) {
+ INFO("Reset to Defaults triggered");
+ resetToDefaultsFlag = true;
+ }
+
+ lockChar.setWriteAuthorizationCallback(this, &EddystoneConfigService::lockAuthorizationCallback);
+ unlockChar.setWriteAuthorizationCallback(this, &EddystoneConfigService::unlockAuthorizationCallback);
+ uriDataChar.setWriteAuthorizationCallback(this, &EddystoneConfigService::uriDataWriteAuthorizationCallback);
+ flagsChar.setWriteAuthorizationCallback(this, &EddystoneConfigService::basicAuthorizationCallback<uint8_t>);
+ advPowerLevelsChar.setWriteAuthorizationCallback(this, &EddystoneConfigService::basicAuthorizationCallback<PowerLevels_t>);
+ txPowerModeChar.setWriteAuthorizationCallback(this, &EddystoneConfigService::powerModeAuthorizationCallback);
+ beaconPeriodChar.setWriteAuthorizationCallback(this, &EddystoneConfigService::basicAuthorizationCallback<uint16_t>);
+ resetChar.setWriteAuthorizationCallback(this, &EddystoneConfigService::basicAuthorizationCallback<uint8_t>);
+
+ static GattCharacteristic *charTable[] = {
+ &lockedStateChar, &lockChar, &unlockChar, &uriDataChar,
+ &flagsChar, &advPowerLevelsChar, &txPowerModeChar, &beaconPeriodChar, &resetChar
+ };
+
+ GattService configService(UUID_URI_BEACON_SERVICE, charTable, sizeof(charTable) / sizeof(GattCharacteristic *));
+
+ ble.addService(configService);
+ if (resetToDefaultsFlag) {
+ resetToDefaults();
+ } else {
+ updateCharacteristicValues();
+ }
+
+ ble.onDataWritten(this, &EddystoneConfigService::onDataWrittenCallback);
+
+ setupEddystoneConfigAdvertisements(); /* Setup advertising for the configService. */
+
+ initSucceeded = true;
+ }
+
+ /*
+ * Check if eddystone initialized successfully
+ */
+ bool initSuccessfully(void) const {
+ return initSucceeded;
+ }
+
+ /*
+ * @breif Function to update the default values for the TLM frame. Only applied if Reset Defaults is applied.
+ *
+ * @param[in] tlmVersionIn Version of the TLM frame being used
+ * @param[in] advPeriodInMin how long between TLM frames being advertised, this is measured in minutes.
+ *
+ */
+ void setDefaultTLMFrameData(uint8_t tlmVersionIn = 0, float advPeriodInSec = 60){
+ DBG("Setting Default TLM Data, version = %d, advPeriodInMind= %f",tlmVersionIn,advPeriodInSec);
+ defaultTlmVersion = tlmVersionIn;
+ TlmBatteryVoltage = 0;
+ TlmBeaconTemp = 0;
+ TlmPduCount = 0;
+ TlmTimeSinceBoot = 0;
+ defaultTlmAdvPeriod = advPeriodInSec;
+ tlmIsSet = true; // flag to add this to eddystone service when config is done
+
+ }
+
+ /*
+ * @breif Function to update the default values for the URI frame. Only applied if Reset Defaults is applied.
+ *
+ * @param[in] uriIn url to advertise
+ * @param[in] advPeriod how long to advertise the url for, measured in number of ADV frames.
+ *
+ */
+ void setDefaultURIFrameData(const char * uriIn, float advPeriod = 1){
+ DBG("Setting Default URI Data");
+ // Set URL Frame
+ EddystoneService::encodeURL(uriIn, defaultUriData, defaultUriDataLength); // encode URL to URL Formatting
+ if (defaultUriDataLength > URI_DATA_MAX) {
+ return;
+ }
+ memcpy(defaultUriData,uriIn,URI_DATA_MAX);
+ //defaultUriDataLength = strlen(uriIn);
+ INFO("\t default URI = %s : %d", uriIn, defaultUriDataLength);
+// defaultUriData = (UriData_t *)uriIn;
+ defaultUriAdvPeriod = advPeriod;
+ urlIsSet = true; // flag to add this to eddystone service when config is done
+ }
+
+ /*
+ * @breif Function to update the default values for the UID frame. Only applied if Reset Defaults is applied.
+ *
+ * @param[in] namespaceID 10Byte Namespace ID
+ * @param[in] instanceID 6Byte Instance ID
+ * @param[in] advPeriod how long to advertise the URL for, measured in the number of adv frames.
+ *
+ */
+ void setDefaultUIDFrameData(UIDNamespaceID_t *namespaceID, UIDInstanceID_t *instanceID, float advPeriod = 10){
+ //Set UID frame
+ DBG("Setting default UID Data");
+ memcpy(defaultUidNamespaceID, namespaceID, UID_NAMESPACEID_SIZE);
+ memcpy(defaultUidInstanceID, instanceID, UID_INSTANCEID_SIZE);
+ defaultUidAdvPeriod = advPeriod;
+ uidIsSet = true; // flag to add this to eddystone service when config is done
+ }
+
+ /* Start out by advertising the configService for a limited time after
+ * startup; and switch to the normal non-connectible beacon functionality
+ * afterwards. */
+ void setupEddystoneConfigAdvertisements() {
+ const char DEVICE_NAME[] = "eddystone Config";
+
+ ble.clearAdvertisingPayload();
+
+ ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
+
+ // UUID is in different order in the ADV frame (!)
+ uint8_t reversedServiceUUID[sizeof(UUID_URI_BEACON_SERVICE)];
+ for (unsigned int i = 0; i < sizeof(UUID_URI_BEACON_SERVICE); i++) {
+ reversedServiceUUID[i] = UUID_URI_BEACON_SERVICE[sizeof(UUID_URI_BEACON_SERVICE) - i - 1];
+ }
+ ble.accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_128BIT_SERVICE_IDS, reversedServiceUUID, sizeof(reversedServiceUUID));
+ ble.accumulateAdvertisingPayload(GapAdvertisingData::GENERIC_TAG);
+ ble.accumulateScanResponse(GapAdvertisingData::COMPLETE_LOCAL_NAME, reinterpret_cast<const uint8_t *>(&DEVICE_NAME), sizeof(DEVICE_NAME));
+ ble.accumulateScanResponse(
+ GapAdvertisingData::TX_POWER_LEVEL,
+ reinterpret_cast<uint8_t *>(&defaultAdvPowerLevels[EddystoneConfigService::TX_POWER_MODE_LOW]),
+ sizeof(uint8_t));
+
+ ble.setTxPower(radioPowerLevels[params.txPowerMode]);
+ ble.setDeviceName(reinterpret_cast<const uint8_t *>(&DEVICE_NAME));
+ ble.setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
+ ble.setAdvertisingInterval(GapAdvertisingParams::MSEC_TO_ADVERTISEMENT_DURATION_UNITS(ADVERTISING_INTERVAL_MSEC));
+ }
+
+ /*
+ * This function actually impliments the Eddystone Beacon service. It can be called with the help of the wrapper function
+ * to load saved config params, or it can be called explicitly to reset the eddystone beacon to hardcoded values on each reset.
+ *
+ */
+ void setupEddystoneAdvertisements() {
+ DBG("Switching Config -> adv");
+ // Save params to storage
+ extern void saveURIBeaconConfigParams(const Params_t *paramsP); /* forward declaration; necessary to avoid a circular dependency. */
+ saveURIBeaconConfigParams(¶ms);
+ INFO("Saved Params to Memory.")
+ // Setup Eddystone Service
+ static EddystoneService eddyServ(ble,params.beaconPeriod,radioPowerLevels[params.txPowerMode]);
+ // Set configured frames (TLM,UID,URI...etc)
+ if(params.tlmEnabled){
+ eddyServ.setTLMFrameData(params.tlmVersion,params.tlmBeaconPeriod);
+ }
+ if(params.uriEnabled){
+ eddyServ.setURLFrameData(params.advPowerLevels[params.txPowerMode], (const char *) params.uriData, params.uriBeaconPeriod);
+ }
+ if(params.uidEnabled){
+ eddyServ.setUIDFrameData(params.advPowerLevels[params.txPowerMode], (uint8_t *) params.uidNamespaceID, (uint8_t *) params.uidInstanceID, params.uidBeaconPeriod);
+ }
+ // Start Advertising the eddystone service.
+ eddyServ.start();
+ }
+
+private:
+
+ /*
+ * This callback is invoked when a GATT client attempts to modify any of the
+ * characteristics of this service. Attempts to do so are also applied to
+ * the internal state of this service object.
+ */
+ void onDataWrittenCallback(const GattWriteCallbackParams *writeParams) {
+ uint16_t handle = writeParams->handle;
+
+ if (handle == lockChar.getValueHandle()) {
+ // Validated earlier
+ memcpy(params.lock, writeParams->data, sizeof(Lock_t));
+ // Set the state to be locked by the lock code (note: zeros are a valid lock)
+ params.lockedState = true;
+ INFO("Device Locked");
+ } else if (handle == unlockChar.getValueHandle()) {
+ // Validated earlier
+ params.lockedState = false;
+ INFO("Device Unlocked");
+ } else if (handle == uriDataChar.getValueHandle()) {
+ params.uriDataLength = writeParams->len;
+ memset(params.uriData,0x00,URI_DATA_MAX); // clear URI string
+ memcpy(params.uriData, writeParams->data, params.uriDataLength); // set URI string
+ params.uriEnabled = true;
+ INFO("URI = %s, URILen = %d", writeParams->data, writeParams->len);
+ } else if (handle == flagsChar.getValueHandle()) {
+ params.flags = *(writeParams->data);
+ INFO("flagsChar = 0x%x",params.flags);
+ } else if (handle == advPowerLevelsChar.getValueHandle()) {
+ memcpy(params.advPowerLevels, writeParams->data, sizeof(PowerLevels_t));
+ INFO("PowerLevelsChar = %4x",params.advPowerLevels);
+ } else if (handle == txPowerModeChar.getValueHandle()) {
+ params.txPowerMode = *(writeParams->data);
+ INFO("TxPowerModeChar = %d",params.txPowerMode);
+ } else if (handle == beaconPeriodChar.getValueHandle()) {
+ params.beaconPeriod = *((uint16_t *)(writeParams->data));
+ INFO("BeaconPeriod = %d",params.beaconPeriod);
+
+ /* Re-map beaconPeriod to within permissible bounds if necessary. */
+ if (params.beaconPeriod != 0) {
+ bool paramsUpdated = false;
+ if (params.beaconPeriod < ble.getMinAdvertisingInterval()) {
+ params.beaconPeriod = ble.getMinAdvertisingInterval();
+ paramsUpdated = true;
+ } else if (params.beaconPeriod > ble.getMaxAdvertisingInterval()) {
+ params.beaconPeriod = ble.getMaxAdvertisingInterval();
+ paramsUpdated = true;
+ }
+ if (paramsUpdated) {
+ ble.updateCharacteristicValue(beaconPeriodChar.getValueHandle(), reinterpret_cast<uint8_t *>(¶ms.beaconPeriod), sizeof(uint16_t));
+ }
+ }
+ } else if (handle == resetChar.getValueHandle()) {
+ INFO("Reset triggered from Config Service, resetting to defaults");
+ resetToDefaults();
+ }
+ updateCharacteristicValues();
+ params.isConfigured = true; // some configuration data has been passed, on disconnect switch to advertising mode.
+ }
+
+ /*
+ * Reset the default values.
+ */
+ void resetToDefaults(void) {
+ INFO("Resetting to defaults");
+ // General
+ params.lockedState = false;
+ memset(params.lock, 0, sizeof(Lock_t));
+ params.flags = 0x10;
+ memcpy(params.advPowerLevels, defaultAdvPowerLevels, sizeof(PowerLevels_t));
+ params.txPowerMode = TX_POWER_MODE_LOW;
+ params.beaconPeriod = 1000;
+
+ // TLM Frame
+ params.tlmVersion = defaultTlmVersion;
+ params.tlmBeaconPeriod = defaultTlmAdvPeriod;
+ params.tlmEnabled = tlmIsSet;
+
+ // URL Frame
+ memcpy(params.uriData, defaultUriData, URI_DATA_MAX);
+ params.uriDataLength = defaultUriDataLength;
+ params.uriBeaconPeriod = defaultUriAdvPeriod;
+ params.uriEnabled = urlIsSet;
+
+ // UID Frame
+ memcpy(params.uidNamespaceID, defaultUidNamespaceID, UID_NAMESPACEID_SIZE);
+ memcpy(params.uidInstanceID, defaultUidInstanceID, UID_INSTANCEID_SIZE);
+ params.uidBeaconPeriod = defaultUidAdvPeriod;
+ params.uidEnabled = uidIsSet;
+
+ updateCharacteristicValues();
+ }
+
+ /*
+ * Internal helper function used to update the GATT database following any
+ * change to the internal state of the service object.
+ */
+ void updateCharacteristicValues(void) {
+ ble.updateCharacteristicValue(lockedStateChar.getValueHandle(), ¶ms.lockedState, 1);
+ ble.updateCharacteristicValue(uriDataChar.getValueHandle(), params.uriData, params.uriDataLength); // TODO: this isnt updating the initial URI in config mode, need to figure out why.
+ INFO("updateCharacteristicValues - URI, %s : %d",params.uriData, params.uriDataLength);
+ ble.updateCharacteristicValue(flagsChar.getValueHandle(), ¶ms.flags, 1);
+ ble.updateCharacteristicValue(beaconPeriodChar.getValueHandle(),
+ reinterpret_cast<uint8_t *>(¶ms.beaconPeriod), sizeof(uint16_t));
+ ble.updateCharacteristicValue(txPowerModeChar.getValueHandle(), ¶ms.txPowerMode, 1);
+ ble.updateCharacteristicValue(advPowerLevelsChar.getValueHandle(),
+ reinterpret_cast<uint8_t *>(params.advPowerLevels), sizeof(PowerLevels_t));
+ }
+
+private:
+ void lockAuthorizationCallback(GattWriteAuthCallbackParams *authParams) {
+ if (params.lockedState) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION;
+ } else if (authParams->len != sizeof(Lock_t)) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INVALID_ATT_VAL_LENGTH;
+ } else if (authParams->offset != 0) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INVALID_OFFSET;
+ } else {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_SUCCESS;
+ }
+ }
+
+
+ void unlockAuthorizationCallback(GattWriteAuthCallbackParams *authParams) {
+ if ((!params.lockedState) && (authParams->len == sizeof(Lock_t))) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_SUCCESS;
+ } else if (authParams->len != sizeof(Lock_t)) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INVALID_ATT_VAL_LENGTH;
+ } else if (authParams->offset != 0) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INVALID_OFFSET;
+ } else if (memcmp(authParams->data, params.lock, sizeof(Lock_t)) != 0) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION;
+ } else {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_SUCCESS;
+ }
+ }
+
+ void uriDataWriteAuthorizationCallback(GattWriteAuthCallbackParams *authParams) {
+ if (params.lockedState) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION;
+ } else if (authParams->offset != 0) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INVALID_OFFSET;
+ } else {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_SUCCESS;
+ }
+ }
+
+ void powerModeAuthorizationCallback(GattWriteAuthCallbackParams *authParams) {
+ if (params.lockedState) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION;
+ } else if (authParams->len != sizeof(uint8_t)) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INVALID_ATT_VAL_LENGTH;
+ } else if (authParams->offset != 0) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INVALID_OFFSET;
+ } else if (*((uint8_t *)authParams->data) >= NUM_POWER_MODES) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_WRITE_NOT_PERMITTED;
+ } else {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_SUCCESS;
+ }
+ }
+
+ template <typename T>
+ void basicAuthorizationCallback(GattWriteAuthCallbackParams *authParams) {
+ if (params.lockedState) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION;
+ } else if (authParams->len != sizeof(T)) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INVALID_ATT_VAL_LENGTH;
+ } else if (authParams->offset != 0) {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_ATTERR_INVALID_OFFSET;
+ } else {
+ authParams->authorizationReply = AUTH_CALLBACK_REPLY_SUCCESS;
+ }
+ }
+
+ BLEDevice &ble;
+ Params_t ¶ms;
+ Ticker timeSinceBootTick;
+ Timeout switchFrame;
+// Default value that is restored on reset
+ PowerLevels_t &defaultAdvPowerLevels; // this goes into the advertising frames (radio power measured at 1m from device)
+ PowerLevels_t &radioPowerLevels; // this configures the power levels of the radio
+ uint8_t lockedState;
+ bool initSucceeded;
+ uint8_t resetFlag;
+ bool switchFlag;
+
+//UID Default value that is restored on reset
+ UIDNamespaceID_t defaultUidNamespaceID;
+ UIDInstanceID_t defaultUidInstanceID;
+ float defaultUidAdvPeriod;
+ int8_t defaultUidPower;
+ uint16_t uidRFU;
+ bool uidIsSet;
+
+//URI Default value that is restored on reset
+ uint8_t defaultUriDataLength;
+ UriData_t defaultUriData;
+ int8_t defaultUrlPower;
+ float defaultUriAdvPeriod;
+ bool urlIsSet;
+
+//TLM Default value that is restored on reset
+ uint8_t defaultTlmVersion;
+ float defaultTlmAdvPeriod;
+ volatile uint16_t TlmBatteryVoltage;
+ volatile uint16_t TlmBeaconTemp;
+ volatile uint32_t TlmPduCount;
+ volatile uint32_t TlmTimeSinceBoot;
+ bool tlmIsSet;
+
+ ReadOnlyGattCharacteristic<uint8_t> lockedStateChar;
+ WriteOnlyGattCharacteristic<Lock_t> lockChar;
+ GattCharacteristic uriDataChar;
+ WriteOnlyGattCharacteristic<Lock_t> unlockChar;
+ ReadWriteGattCharacteristic<uint8_t> flagsChar;
+ ReadWriteGattCharacteristic<PowerLevels_t> advPowerLevelsChar;
+ ReadWriteGattCharacteristic<uint8_t> txPowerModeChar;
+ ReadWriteGattCharacteristic<uint16_t> beaconPeriodChar;
+ WriteOnlyGattCharacteristic<uint8_t> resetChar;
+
+};
+
+#endif // SERVICES_EDDYSTONEBEACONCONFIGSERVICE_H_
\ No newline at end of file
--- a/ble/services/EddystoneService.h Tue Sep 29 09:54:18 2015 +0100
+++ b/ble/services/EddystoneService.h Tue Sep 29 09:54:18 2015 +0100
@@ -19,7 +19,7 @@
#include "ble/BLE.h"
#include "mbed.h"
-
+#include "CircularBuffer.h"
static const uint8_t BEACON_EDDYSTONE[] = {0xAA, 0xFE};
//Debug is disabled by default
@@ -48,19 +48,21 @@
class EddystoneService
{
public:
- /**
- * @brief Transmission Power Modes for UriBeacon
- */
+ enum FrameTypes {
+ NONE,
+ url,
+ uid,
+ tlm
+ };
- static const int ADVERTISING_INTERVAL_MSEC = 1000; // Advertising interval for config service.
static const int SERVICE_DATA_MAX = 31; // Maximum size of service data in ADV packets
// There are currently 3 subframes defined, URI, UID, and TLM
#define EDDYSTONE_MAX_FRAMETYPE 3
void (*frames[EDDYSTONE_MAX_FRAMETYPE])(uint8_t *, uint32_t);
- uint8_t frameIndex;
static const int URI_DATA_MAX = 18;
typedef uint8_t UriData_t[URI_DATA_MAX];
+ CircularBuffer<FrameTypes,EDDYSTONE_MAX_FRAMETYPE> overflow;
// UID Frame Type subfields
static const int UID_NAMESPACEID_SIZE = 10;
@@ -84,7 +86,11 @@
* @param RFU 2B of RFU, initialized to 0x0000 and not broadcast, included for future reference.
*
*/
- void setUIDFrameData(int8_t power, UIDNamespaceID_t namespaceID, UIDInstanceID_t instanceID, uint16_t RFU = 0x0000) {
+ void setUIDFrameData(int8_t power, UIDNamespaceID_t namespaceID, UIDInstanceID_t instanceID, uint32_t uidAdvPeriodIn, uint16_t RFU = 0x0000) {
+ if(0 == uidAdvPeriodIn){
+ uidIsSet = false;
+ return;
+ }
if(power > 20) {
power = 20;
}
@@ -95,6 +101,8 @@
memcpy(defaultUidNamespaceID, namespaceID, UID_NAMESPACEID_SIZE);
memcpy(defaultUidInstanceID, instanceID, UID_INSTANCEID_SIZE);
uidRFU = (uint16_t)RFU; // this is probably bad form, but it doesnt really matter yet.
+ uidAdvPeriod = uidAdvPeriodIn;
+ uidIsSet = true; // set toggle to advertise UID frames
return;
}
@@ -115,12 +123,18 @@
defaultUidPower = -100;
}
Data[index++] = defaultUidPower; // 1B Power @ 0meter
+ DBG("UID NamespaceID = '0x");
for(int x = 0; x < UID_NAMESPACEID_SIZE; x++) { // 10B Namespce ID
Data[index++] = defaultUidNamespaceID[x];
+ DBG("%x,",defaultUidNamespaceID[x]);
}
+ DBG("'\r\n");
+ DBG("UID InstancdID = '0x");
for(int x = 0; x< UID_INSTANCEID_SIZE; x++) { // 6B Instance ID
Data[index++] = defaultUidInstanceID[x];
+ DBG("%x,",defaultUidInstanceID[x]);
}
+ DBG("'\r\n");
if(0 != uidRFU) { // 2B RFU, include if non-zero, otherwise ignore
Data[index++] = (uint8_t)(uidRFU >> 0);
Data[index++] = (uint8_t)(uidRFU >> 8);
@@ -133,14 +147,21 @@
* Set Eddystone URL Frame information.
* @param[in] power TX Power in dB measured at 0 meters from the device.
* @param url URL to encode
+ * @param urlAdvPeriodIn How long to advertise the URL frame (measured in # of adv periods)
* @return false on success, true on failure.
*/
- bool setURLFrameData(int8_t power, const char * url) {
+ bool setURLFrameData(int8_t power, const char * urlIn, uint32_t urlAdvPeriodIn) {
+ if(0 == urlAdvPeriodIn){
+ urlIsSet = false;
+ return false;
+ }
defaultUrlPower = power;
- encodeURL(url, defaultUriData, defaultUriDataLength); // encode URL to URL Formatting
+ encodeURL(urlIn, defaultUriData, defaultUriDataLength); // encode URL to URL Formatting
if (defaultUriDataLength > URI_DATA_MAX) {
return true; // error, URL is too big
}
+ urlAdvPeriod = urlAdvPeriodIn;
+ urlIsSet = true;
return false;
}
@@ -164,16 +185,23 @@
/*
* Set Eddystone TLM Frame information.
* @param[in] Version of the TLM beacon data format
+ * @param[in] advPeriod how often to advertise the TLM frame for (in minutes)
* @param batteryVoltage in milivolts
* @param beaconTemp in 8.8 floating point notation
*
*/
- void setTLMFrameData(uint8_t version, uint16_t batteryVoltage, uint16_t beaconTemp, uint32_t pduCount = 0, uint32_t timeSinceBoot = 0) {
+ void setTLMFrameData(uint8_t version = 0, uint32_t advPeriod = 60, uint16_t batteryVoltage = 0, uint16_t beaconTemp = 0, uint32_t pduCount = 0, uint32_t timeSinceBoot = 0) {
+ if(0 == advPeriod){
+ tlmIsSet = false;
+ return;
+ }
TlmVersion = version;
TlmBatteryVoltage = batteryVoltage;
TlmBeaconTemp = beaconTemp;
TlmPduCount = pduCount; // reset
TlmTimeSinceBoot = timeSinceBoot; // reset
+ TlmAdvPeriod = advPeriod;
+ tlmIsSet = true; // TLM Data has been enabled
return;
}
@@ -191,14 +219,14 @@
Data[index++] = (uint8_t)(TlmBatteryVoltage>>0); // Battery Voltage[1]
Data[index++] = (uint8_t)(TlmBeaconTemp>>8); // Beacon Temp[0]
Data[index++] = (uint8_t)(TlmBeaconTemp>>0); // Beacon Temp[1]
- Data[index++] = (uint8_t)(TlmPduCount>>24); // PDU Count [0]
- Data[index++] = (uint8_t)(TlmPduCount>>16); // PDU Count [1]
- Data[index++] = (uint8_t)(TlmPduCount>>8); // PDU Count [2]
- Data[index++] = (uint8_t)(TlmPduCount>>0); // PDU Count [3]
- Data[index++] = (uint8_t)(TlmTimeSinceBoot>>24); // Time Since Boot [0]
- Data[index++] = (uint8_t)(TlmTimeSinceBoot>>16); // Time Since Boot [1]
- Data[index++] = (uint8_t)(TlmTimeSinceBoot>>8); // Time Since Boot [2]
- Data[index++] = (uint8_t)(TlmTimeSinceBoot>>0); // Time Since Boot [3]
+ Data[index++] = (uint8_t)(TlmPduCount>>24); // PDU Count [0]
+ Data[index++] = (uint8_t)(TlmPduCount>>16); // PDU Count [1]
+ Data[index++] = (uint8_t)(TlmPduCount>>8); // PDU Count [2]
+ Data[index++] = (uint8_t)(TlmPduCount>>0); // PDU Count [3]
+ Data[index++] = (uint8_t)(TlmTimeSinceBoot>>24); // Time Since Boot [0]
+ Data[index++] = (uint8_t)(TlmTimeSinceBoot>>16); // Time Since Boot [1]
+ Data[index++] = (uint8_t)(TlmTimeSinceBoot>>8); // Time Since Boot [2]
+ Data[index++] = (uint8_t)(TlmTimeSinceBoot>>0); // Time Since Boot [3]
DBG("constructURLFrame: %d, %d",maxSize,index);
return index;
}
@@ -264,10 +292,13 @@
// }
// printf("\r\n");
ble.clearAdvertisingPayload();
+ ble.setAdvertisingType(GapAdvertisingParams::ADV_NON_CONNECTABLE_UNDIRECTED);
+ ble.setAdvertisingInterval(100);
ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
ble.accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_16BIT_SERVICE_IDS, BEACON_EDDYSTONE, sizeof(BEACON_EDDYSTONE));
ble.accumulateAdvertisingPayload(GapAdvertisingData::SERVICE_DATA, serviceData, serviceDataLen);
+
return true;
}
@@ -277,7 +308,7 @@
* This function exists because of time constraints in the radioNotificationCallback, so it is effectively
* broken up into two functions.
*/
- void swapOutFrames(void) {
+ void swapOutFrames(FrameTypes frameType) {
uint8_t serviceData[SERVICE_DATA_MAX];
unsigned serviceDataLen = 0;
//hard code in the eddystone UUID
@@ -285,37 +316,114 @@
serviceData[serviceDataLen++] = BEACON_EDDYSTONE[1];
// if certain frames are not enabled, then skip them. Worst case TLM is always enabled
- switch(frameIndex) {
- case 1:
+ switch(frameType) {
+ case tlm:
+ // TLM frame
+ if(tlmIsSet) {
+ DBG("Swapping in TLM Frame: version=%x, Batt=%d, Temp = %d, PDUCnt = %d, TimeSinceBoot=%d",TlmVersion, TlmBatteryVoltage, TlmBeaconTemp, TlmPduCount, TlmTimeSinceBoot);
+ serviceDataLen += constructTLMFrame(serviceData+serviceDataLen,20);
+ DBG("\t Swapping in TLM Frame: len=%d",serviceDataLen);
+ updateAdvPacket(serviceData,serviceDataLen);
+ }
+ break;
+ case url:
// URL Frame
if(urlIsSet) {
- INFO("Swapping in URL Frame: Power: %d",defaultUrlPower);
+ DBG("Swapping in URL Frame: Power: %d",defaultUrlPower);
serviceDataLen += constructURLFrame(serviceData+serviceDataLen,20);
DBG("\t Swapping in URL Frame: len=%d ",serviceDataLen);
updateAdvPacket(serviceData,serviceDataLen);
- switchFlag = false;
- frameIndex++;
- break;
+ //switchFlag = false;
}
- case 2:
+ break;
+ case uid:
// UID Frame
if(uidIsSet) {
- INFO("Swapping in UID Frame: Power: %d",defaultUidPower);
+ DBG("Swapping in UID Frame: Power: %d",defaultUidPower);
serviceDataLen += constructUIDFrame(serviceData+serviceDataLen,20);
DBG("\t Swapping in UID Frame: len=%d",serviceDataLen);
updateAdvPacket(serviceData,serviceDataLen);
- switchFlag = false;
- frameIndex++;
- break;
+ //switchFlag = false;
}
+ break;
default:
- // TLM frame
- INFO("Swapping in TLM Frame: version=%x, Batt=%d, Temp = %d, PDUCnt = %d, TimeSinceBoot=%d",TlmVersion, TlmBatteryVoltage, TlmBeaconTemp, TlmPduCount, TlmTimeSinceBoot);
- serviceDataLen += constructTLMFrame(serviceData+serviceDataLen,20);
- DBG("\t Swapping in TLM Frame: len=%d",serviceDataLen);
- updateAdvPacket(serviceData,serviceDataLen);
- frameIndex++;
- break;
+ ERR("You have not initialized a Frame yet, please initialize one before starting a beacon");
+ ERR("uidIsSet = %d, urlIsSet = %d, tlmIsSet = %d", uidIsSet, urlIsSet, tlmIsSet);
+ }
+ }
+
+ /*
+ * Callback to swap in URL frame
+ */
+ void urlCallback(void) {
+ DBG("urlCallback");
+ if( false == advLock) {
+ advLock = true;
+ DBG("advLock = url")
+ frameIndex = url;
+ swapOutFrames(frameIndex);
+ ble.startAdvertising();
+ } else {
+ // Someone else is broadcasting, toss it into the overflow buffer to retransmit when free
+ INFO("URI(%d) cannot complete, %d is currently broadcasting",url, frameIndex);
+ FrameTypes x = url;
+ overflow.push(x);
+ }
+ return;
+ }
+
+ /*
+ * Callback to swap in UID frame
+ */
+ void uidCallback(void) {
+ DBG("uidCallback");
+ if( false == advLock) {
+ advLock = true;
+ DBG("advLock = uid")
+ frameIndex = uid;
+ swapOutFrames(frameIndex);
+ ble.startAdvertising();
+ } else {
+ // Someone else is broadcasting, toss it into the overflow buffer to retransmit when free
+ INFO("UID(%d) cannot complete, %d is currently broadcasting", uid,frameIndex);
+ FrameTypes x = uid; // have to do this to satisfy cont vs volatile keywords... sigh...
+ overflow.push(x);
+ }
+ return;
+ }
+
+ /*
+ * Callback to swap in TLM frame
+ */
+ void tlmCallback(void) {
+ DBG("tlmCallback");
+ if( false == advLock) {
+ // OK to broadcast
+ advLock = true;
+ DBG("advLock = tlm")
+ frameIndex = tlm;
+ swapOutFrames(frameIndex);
+ ble.startAdvertising();
+ } else {
+ // Someone else is broadcasting, toss it into the overflow buffer to retransmit when free
+ INFO("TLM(%d) cannot complete, %d is currently broadcasting",tlm ,frameIndex);
+ FrameTypes x = tlm;
+ overflow.push(x);
+ }
+ return;
+ }
+
+ void stopAdvCallback(void) {
+ if(overflow.empty()) {
+ // if nothing left to transmit, stop
+ ble.stopAdvertising();
+ advLock = false; // unlock lock
+ } else {
+ // transmit other packets at current time index
+ FrameTypes x = NONE;
+ overflow.pop(x);
+ INFO("Re-Transmitting %d",x);
+ swapOutFrames(x);
}
}
@@ -324,47 +432,15 @@
*/
#define EDDYSTONE_SWAPFRAME_DELAYMS 1
void radioNotificationCallback(bool radioActive) {
- //DBG("RadioNotificationCallback : %d, %d, %d, %d",radioActive,frameIndex,TlmPduCount,TlmTimeSinceBoot);
// Update PDUCount
TlmPduCount++;
- frameIndex = frameIndex % EDDYSTONE_MAX_FRAMETYPE;
-
-
- // True just before an frame is sent, fale just after a frame is sent
+ // True just before an frame is sent, false just after a frame is sent
if(radioActive) {
// Do Nothing
} else {
- // state machine to control which packet is being sent
- switch(frameIndex) {
- case 0: // TLM Frame
- switchFrame.attach_us(this, &EddystoneService::swapOutFrames, EDDYSTONE_SWAPFRAME_DELAYMS);
- switchFlag = true;
- break;
- case 1: // URL Frame
- // switch out packets
- if(switchFlag) {
- switchFrame.attach_us(this, &EddystoneService::swapOutFrames, EDDYSTONE_SWAPFRAME_DELAYMS);
- switchFlag = false;
- } else {
- if((TlmPduCount % 10) == 0) { // every 10 adv packets switch the frame
- switchFlag = true;
- }
- }
- break;
- case 2: // UIDFrame
- // switch out packets
- if(switchFlag ) {
- switchFrame.attach_us(this, &EddystoneService::swapOutFrames, EDDYSTONE_SWAPFRAME_DELAYMS);
- switchFlag = false;
- } else {
- if((TlmPduCount % 10) == 0) { // every 10 adv packets switch the frame
- switchFlag = true;
- }
- }
- break;
- }
+ // Packet has been sent, disable advertising
+ stopAdv.attach_us(this, &EddystoneService::stopAdvCallback, 1);
}
-
return;
}
@@ -373,102 +449,102 @@
* this function should be used in leu of the config service.
*
* @param bleIn ble object used to broadcast eddystone information
- * @oaram beaconPeriodus is how often ble broadcasts are mde, in mili seconds
+ * @param beaconPeriodus is how often ble broadcasts are mde, in mili seconds
* @param txPowerLevel sets the broadcasting power level.
- * @param uidNamespaceID 10Byte Namespace UUID
- * @param uidInstanceID 6Byte Instance UUID
- * @param url shortened URL to broadcast (pass in as a string)
- * @param urlLen length of shortened url
- * @param tlmVersion version of telemetry data field to use (default to 0x00)
*
*/
EddystoneService(BLEDevice &bleIn,
- uint16_t beaconPeriodus = 100,
- uint8_t txPowerLevel = 0,
- uint8_t * uidNamespaceID = NULL,
- uint8_t * uidInstanceID = NULL,
- const char * url = NULL,
- uint8_t urlLen = 0,
- uint8_t tlmVersion = 0) :
- ble(bleIn)
- {
- uint8_t serviceData[SERVICE_DATA_MAX];
- unsigned serviceDataLen = 0;
- ERR("This function is not fully implemented yet, dont use it!!");
- // Check optional frames, set their 'isSet' flags appropriately
- if((uidNamespaceID != NULL) & (uidInstanceID != NULL)) {
- uidIsSet = true;
- setUIDFrameData(txPowerLevel,uidNamespaceID, uidInstanceID);
- } else {
- uidIsSet = false;
- }
- if(url != NULL) {
- urlIsSet = true;
- setURLFrameData(txPowerLevel,url);
- } else {
- uidIsSet = false;
+ uint16_t beaconPeriodus = 100,
+ uint8_t txPowerIn = 0) :
+ ble(bleIn),
+ advPeriodus(beaconPeriodus),
+ txPower(txPowerIn),
+ advLock(false),
+ frameIndex(NONE) {
+
+ }
+
+ /*
+ * @breif this function starts eddystone advertising based on configured frames.
+ */
+ void start(void) {
+ // Initialize Frame transition, start with URL to pass eddystone validator app on first try
+ if (urlIsSet) {
+ frameIndex = url;
+ urlTicker.attach(this, &EddystoneService::urlCallback, urlAdvPeriod);
+ DBG("attached urlCallback every %d seconds", urlAdvPeriod);
}
- // Default TLM frame to version 0x00, start all values at zero to be spec compliant.
- setTLMFrameData(tlmVersion, 0x00,0x00);
-
- // Initialize Frame transition
- frameIndex = 0;
- uidRFU = 0;
- switchFlag = true;
-
- /* Reinitialize the BLE stack. This will clear away the existing services and advertising state. */
- ble.shutdown();
- ble.init();
- ble.setTxPower(txPowerLevel);
- ble.setAdvertisingType(GapAdvertisingParams::ADV_NON_CONNECTABLE_UNDIRECTED);
- ble.setAdvertisingInterval(beaconPeriodus);
+ if (uidIsSet) {
+ frameIndex = uid;
+ uidTicker.attach(this, &EddystoneService::uidCallback, uidAdvPeriod);
+ DBG("attached uidCallback every %d seconds", uidAdvPeriod);
+ }
+ if(tlmIsSet) {
+ frameIndex = tlm;
+ // Make double sure the PDUCount and TimeSinceBoot fields are set to zero at reset
+ updateTlmPduCount(0);
+ updateTlmTimeSinceBoot(0);
+ timeSinceBootTick.attach(this,&EddystoneService::tsbCallback,0.1); // incriment the TimeSinceBoot ticker every 0.1s
+ tlmTicker.attach(this, &EddystoneService::tlmCallback, TlmAdvPeriod);
+ DBG("attached tlmCallback every %d seconds", TlmAdvPeriod);
+ }
+ if(NONE == frameIndex) {
+ error("No Frames were Initialized! Please initialize a frame before starting an eddystone beacon.");
+ }
+ //uidRFU = 0;
- // Make double sure the PDUCount and TimeSinceBoot fields are set to zero at reset
- updateTlmPduCount(0);
- updateTlmTimeSinceBoot(0);
-
- // Construct TLM Frame in initial advertising.
- serviceData[serviceDataLen++] = BEACON_EDDYSTONE[0];
- serviceData[serviceDataLen++] = BEACON_EDDYSTONE[1];
- serviceDataLen += constructTLMFrame(serviceData+serviceDataLen,SERVICE_DATA_MAX);
-
- updateAdvPacket(serviceData, serviceDataLen);
- ble.gap().startAdvertising();
- ble.gap().onRadioNotification(this,&EddystoneService::radioNotificationCallback);
- timeSinceBootTick.attach(this,&EddystoneService::tsbCallback,0.1); // incriment the TimeSinceBoot ticker every 0.1s
-
+ ble.setTxPower(txPower);
+// ble.setAdvertisingType(GapAdvertisingParams::ADV_NON_CONNECTABLE_UNDIRECTED);
+// ble.setAdvertisingInterval(advPeriodus);
+// ble.gap().startAdvertising();
+ ble.gap().onRadioNotification(this,&EddystoneService::radioNotificationCallback);
}
private:
-
+ // Eddystone Variables
BLEDevice &ble;
- Ticker timeSinceBootTick;
- Timeout switchFrame;
-// Default value that is restored on reset
- size_t defaultUriDataLength;
+ uint16_t advPeriodus;
+ uint8_t txPower;
+ Ticker timeSinceBootTick; // counter that counts time since boot
+ volatile bool advLock;
+ volatile FrameTypes frameIndex;
+ Timeout stopAdv;
+
+
+ // URI Frame Variables
+ uint8_t defaultUriDataLength;
UriData_t defaultUriData;
+ int8_t defaultUrlPower;
+ bool urlIsSet; // flag that enables / disable URI Frames
+ uint32_t urlAdvPeriod; // how long the url frame will be advertised for
+ Ticker urlTicker;
+
+ // UID Frame Variables
UIDNamespaceID_t defaultUidNamespaceID;
UIDInstanceID_t defaultUidInstanceID;
int8_t defaultUidPower;
- int8_t defaultUrlPower;
uint16_t uidRFU;
- bool uidIsSet;
- bool urlIsSet;
- bool switchFlag;
+ bool uidIsSet; // flag that enables / disable UID Frames
+ uint32_t uidAdvPeriod; // how long the uid frame will be advertised for
+ Ticker uidTicker;
-// Private Variables for Telemetry Data
+ // TLM Frame Variables
uint8_t TlmVersion;
volatile uint16_t TlmBatteryVoltage;
volatile uint16_t TlmBeaconTemp;
volatile uint32_t TlmPduCount;
volatile uint32_t TlmTimeSinceBoot;
+ bool tlmIsSet; // flag that enables / disables TLM frames
+ uint32_t TlmAdvPeriod; // number of minutes between adv frames
+ Ticker tlmTicker;
public:
/*
* Encode a human-readable URI into the binary format defined by URIBeacon spec (https://github.com/google/uribeacon/tree/master/specification).
*/
- static void encodeURL(const char *uriDataIn, UriData_t uriDataOut, size_t &sizeofURIDataOut) {
+ static void encodeURL(const char *uriDataIn, UriData_t uriDataOut, uint8_t &sizeofURIDataOut) {
+ DBG("Encode URL = %s",uriDataIn);
const char *prefixes[] = {
"http://www.",
"https://www.",
@@ -528,6 +604,7 @@
}
}
/* This is the default case where we've got an ordinary character which doesn't match a suffix. */
+ INFO("Encoding URI: No Suffix Found");
if (i == NUM_SUFFIXES) {
uriDataOut[sizeofURIDataOut++] = *uriDataIn;
++uriDataIn;