Changed to conform with PR comments

Author: PilnyTomas

libraries/BLE/examples/BLE_Beacon_Scanner/BLE_Beacon_Scanner.ino

@@ -101,13 +101,11 @@ class MyAdvertisedDeviceCallbacks : public BLEAdvertisedDeviceCallbacks
         }
         if (advertisedDevice.getPayloadLength() >= 22 && payLoad[22] == 0x20)
         {
-          Serial.printf("Found an EddystoneTLM beacon! payload length = %d B; minus 22 = %d\n", advertisedDevice.getPayloadLength(), advertisedDevice.getPayloadLength() - 22);
+          Serial.println("Found an EddystoneTLM beacon!");
           BLEEddystoneTLM eddystoneTLM;
-          //std::string TLMframe(payLoad[22], advertisedDevice.getPayloadLength() - 22);
-          //eddystoneTLM.setData(TLMFrame);
           eddystoneTLM.setData(std::string((char*)payLoad+22, advertisedDevice.getPayloadLength() - 22));
           Serial.printf("Reported battery voltage: %dmV\n", eddystoneTLM.getVolt());
-          Serial.printf("Reported temperature: %.2f°C (raw data=0x%04X)\n", eddystoneTLM.getFloatTemp(), eddystoneTLM.getTemp());
+          Serial.printf("Reported temperature: %.2f°C (raw data=0x%04X)\n", eddystoneTLM.getTemp(), eddystoneTLM.getRawTemp());
           Serial.printf("Reported advertise count: %d\n", eddystoneTLM.getCount());
           Serial.printf("Reported time since last reboot: %ds\n", eddystoneTLM.getTime());
         }

libraries/BLE/examples/BLE_EddystoneTLM_Beacon/BLE_EddystoneTLM_Beacon.ino

@@ -51,7 +51,7 @@ void setBeacon()
   uint16_t volt = random(2800, 3700); // 3300mV = 3.3V
   float tempFloat = random(-3000, 3000) / 100.0f;
   Serial.printf("Random temperature is %.2f°C\n", tempFloat);
-  int temp = EDDYSTONE_TEMP_FLOAT_TO_U16(tempFloat);
+  int temp = (int)(tempFloat * 256);
   Serial.printf("Converted to 8.8 format 0x%04X\n", temp);
 
   BLEAdvertisementData oAdvertisementData = BLEAdvertisementData();

libraries/BLE/src/BLEAdvertising.cpp

@@ -443,11 +443,6 @@ void BLEAdvertisementData::setPartialServices(BLEUUID uuid) {
  * @brief Set the service data (UUID + data)
  * @param [in] uuid The UUID to set with the service data.  Size of UUID will be used.
  * @param [in] data The data to be associated with the service data advert.
- * Data frame:
- * | Field  || Len | Type | UUID        | EddyStone Frame |
- * | Offset || 0   | 1    | 2           | 4               |
- * | Len    || 1   | 1    | 2           | up to 20        |
- * | Data   || ??  | ??   | 0xAA | 0xFE | ???             |
  */
 void BLEAdvertisementData::setServiceData(BLEUUID uuid, std::string data) {
 	char cdata[2];

libraries/BLE/src/BLEEddystoneTLM.cpp

@@ -44,14 +44,14 @@ uint16_t BLEEddystoneTLM::getVolt() {
 	return ENDIAN_CHANGE_U16(m_eddystoneData.volt);
 } // getVolt
 
-uint16_t BLEEddystoneTLM::getTemp() {
+float BLEEddystoneTLM::getTemp() {
+  return EDDYSTONE_TEMP_U16_TO_FLOAT(m_eddystoneData.temp);
+} // getFloatTemp
+
+uint16_t BLEEddystoneTLM::getRawTemp() {
 	return ENDIAN_CHANGE_U16(m_eddystoneData.temp);
 } // getTemp
 
-float BLEEddystoneTLM::getFloatTemp() {
-  return EDDYSTONE_TEMP_U16_TO_FLOAT(ENDIAN_CHANGE_U16(m_eddystoneData.temp));
-} // getFloatTemp
-
 uint32_t BLEEddystoneTLM::getCount() {
 	return ENDIAN_CHANGE_U32(m_eddystoneData.advCount);
 } // getCount
@@ -115,6 +115,18 @@ std::string BLEEddystoneTLM::toString() {
  * Example:
  * uint8_t *payLoad = advertisedDevice.getPayload();
  * eddystoneTLM.setData(std::string((char*)payLoad+22, advertisedDevice.getPayloadLength() - 22));
+ * Note: the offset 22 works for current implementation of example BLE_EddystoneTLM Beacon.ino, however it is not static and will be reimplemented
+ * Data frame:
+ * | Field  || Len | Type | UUID        | EddyStone TLM |
+ * | Offset || 0   | 1    | 2           | 4             |
+ * | Len    || 1 B | 1 B  | 2 B         | 14 B          |
+ * | Data   || ??  | ??   | 0xAA | 0xFE | ???           |
+ *
+ * EddyStone TLM frame:
+ * | Field  || Type  | Version | Batt mV     | Beacon temp | Cnt since boot | Time since boot |
+ * | Offset || 0     | 1       | 2           | 4           | 6              | 10              |
+ * | Len    || 1 B   | 1 B     | 2 B         | 2 B         | 4 B            | 4 B             |
+ * | Data   || 0x20  | ??      | ??   | ??   | ??    | ??  |   |   |   |    |   |   |   |     |
  */
 void BLEEddystoneTLM::setData(std::string data) {
 	if (data.length() != sizeof(m_eddystoneData)) {

libraries/BLE/src/BLEEddystoneTLM.h

@@ -27,8 +27,8 @@ class BLEEddystoneTLM {
   BLEUUID   getUUID();
   uint8_t   getVersion();
   uint16_t  getVolt();
-  uint16_t  getTemp();
-  float     getFloatTemp();
+  float     getTemp();
+  uint16_t  getRawTemp();
   uint32_t  getCount();
   uint32_t  getTime();
   std::string toString();