Updated TLM

Author: PilnyTomas

libraries/BLE/examples/EddystoneTLM_Beacon/EddystoneTLM_Beacon.ino

@@ -28,6 +28,7 @@
 #include "esp_sleep.h"
 
 #define GPIO_DEEP_SLEEP_DURATION 10     // sleep x seconds and then wake up
+#define BEACON_POWER ESP_PWR_LVL_N12
 RTC_DATA_ATTR static time_t last;    // remember last boot in RTC Memory
 RTC_DATA_ATTR static uint32_t bootcount; // remember number of boots in RTC Memory
 
@@ -46,19 +47,17 @@ time_t lastTenth;
 // for the temperature value. It is a 8.8 fixed-point notation
 void setBeacon()
 {
-  char beacon_data[25];
-  uint16_t beconUUID = 0xFEAA;
-  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 = (int)(tempFloat * 256);
-  Serial.printf("Converted to 8.8 format %0X%0X\n", (temp >> 8) & 0xFF, (temp & 0xFF)); 
+  BLEEddystoneTLM EddystoneTLM;
+  EddystoneTLM.setVolt((uint16_t)random(2800, 3700)); // 3300mV = 3.3V
+  EddystoneTLM.setTemp(random(-3000, 3000) / 100.0f); // 3000 = 30.00 ˚C
+  Serial.printf("Random Battery voltage is %d mV = 0x%04X\n", EddystoneTLM.getVolt(), EddystoneTLM.getVolt());
+  Serial.printf("Random temperature is %.2f°C\n", EddystoneTLM.getTemp());
+  Serial.printf("Converted to 8.8 format: 0x%04X\n", EddystoneTLM.getRawTemp());
 
   BLEAdvertisementData oAdvertisementData = BLEAdvertisementData();
   BLEAdvertisementData oScanResponseData = BLEAdvertisementData();
+  oScanResponseData.setServiceData(BLEUUID((uint16_t)0xFEAA), std::string(EddystoneTLM.getData().c_str(), EddystoneTLM.getData().length()));
 
-  oScanResponseData.setCompleteServices(BLEUUID(beconUUID));
-  oScanResponseData.setServiceData(BLEUUID(beconUUID), std::string(beacon_data, 14));
   oAdvertisementData.setName("ESP32 TLM Beacon");
   pAdvertising->setAdvertisementData(oAdvertisementData);
   pAdvertising->setScanResponseData(oScanResponseData);
@@ -78,7 +77,7 @@ void setup()
   // Create the BLE Device
   BLEDevice::init("TLMBeacon");
 
-  BLEDevice::setPower(ESP_PWR_LVL_N12);
+  BLEDevice::setPower(BEACON_POWER);
 
   pAdvertising = BLEDevice::getAdvertising();
 

libraries/BLE/src/BLEEddystoneTLM.cpp

@@ -22,7 +22,6 @@
 static const char LOG_TAG[] = "BLEEddystoneTLM";
 
 BLEEddystoneTLM::BLEEddystoneTLM() {
-  beaconUUID = 0xFEAA;
   m_eddystoneData.frameType = EDDYSTONE_TLM_FRAME_TYPE;
   m_eddystoneData.version = 0;
   m_eddystoneData.volt = 3300; // 3300mV = 3.3V
@@ -42,12 +41,12 @@ BLEEddystoneTLM::BLEEddystoneTLM(BLEAdvertisedDevice *advertisedDevice){
   }
 }
 
-std::string BLEEddystoneTLM::getData() {
-  return std::string((char*) &m_eddystoneData, sizeof(m_eddystoneData));
+String BLEEddystoneTLM::getData() {
+  return String((char*) &m_eddystoneData, sizeof(m_eddystoneData));
 } // getData
 
 BLEUUID BLEEddystoneTLM::getUUID() {
-  return BLEUUID(beaconUUID);
+  return beaconUUID;
 } // getUUID
 
 uint8_t BLEEddystoneTLM::getVersion() {
@@ -74,8 +73,8 @@ uint32_t BLEEddystoneTLM::getTime() {
   return (ENDIAN_CHANGE_U32(m_eddystoneData.tmil)) / 10;
 } // getTime
 
-std::string BLEEddystoneTLM::toString() {
-  std::string out = "";
+String BLEEddystoneTLM::toString() {
+  String out = "";
   uint32_t rawsec = ENDIAN_CHANGE_U32(m_eddystoneData.tmil);
   char val[12];
 
@@ -152,15 +151,16 @@ void BLEEddystoneTLM::setData(std::string data) {
 } // setData
 
 void BLEEddystoneTLM::setUUID(BLEUUID l_uuid) {
-  beaconUUID = l_uuid.getNative()->uuid.uuid16;
+  beaconUUID = l_uuid;
 } // setUUID
 
 void BLEEddystoneTLM::setVersion(uint8_t version) {
   m_eddystoneData.version = version;
 } // setVersion
 
+// Set voltage in ESP32 native Big endian and convert it to little endian used for BLE Frame
 void BLEEddystoneTLM::setVolt(uint16_t volt) {
-  m_eddystoneData.volt = volt;
+  m_eddystoneData.volt = ENDIAN_CHANGE_U16(volt);
 } // setVolt
 
 void BLEEddystoneTLM::setTemp(float temp) {
@@ -175,5 +175,5 @@ void BLEEddystoneTLM::setTime(uint32_t tmil) {
   m_eddystoneData.tmil = tmil;
 } // setTime
 
-#endif
+#endif /* CONFIG_BLUEDROID_ENABLED */
 #endif /* SOC_BLE_SUPPORTED */

libraries/BLE/src/BLEEddystoneTLM.h

@@ -12,6 +12,7 @@
 
 #include "BLEUUID.h"
 #include <BLEAdvertisedDevice.h>
+#include <Arduino.h>
 
 #define EDDYSTONE_TLM_FRAME_TYPE 0x20
 #define ENDIAN_CHANGE_U16(x) ((((x)&0xFF00)>>8) + (((x)&0xFF)<<8))
@@ -28,15 +29,15 @@ class BLEEddystoneTLM {
 public:
   BLEEddystoneTLM();
   BLEEddystoneTLM(BLEAdvertisedDevice *advertisedDevice);
-  std::string getData();
+  String getData();
   BLEUUID   getUUID();
   uint8_t   getVersion();
   uint16_t  getVolt();
   float     getTemp();
   uint16_t  getRawTemp();
   uint32_t  getCount();
   uint32_t  getTime();
-  std::string toString();
+  String toString();
   void      setData(std::string data);
   void      setUUID(BLEUUID l_uuid);
   void      setVersion(uint8_t version);
@@ -46,7 +47,7 @@ class BLEEddystoneTLM {
   void      setTime(uint32_t tmil);
 
 private:
-  uint16_t beaconUUID;
+  BLEUUID beaconUUID;
   struct {
     uint8_t frameType;
     uint8_t version;
@@ -55,7 +56,6 @@ class BLEEddystoneTLM {
     uint32_t advCount;
     uint32_t tmil;
   } __attribute__((packed)) m_eddystoneData;
-
 }; // BLEEddystoneTLM
 
 #endif /* SOC_BLE_SUPPORTED */

libraries/BLE/src/BLEEddystoneURL.cpp

@@ -207,7 +207,6 @@ void BLEEddystoneURL::setPower(int8_t advertisedTxPower) {
 // | Length  | 1 B     | 0 - 17 B              |
 // | Example | 0x02    | 0x676F6F676C65 0x07   |
 // | Decoded | http:// |   g o o g l e  .com   |
-// Example: 0x00676F6F676C6507
 void BLEEddystoneURL::setURL(std::string url) {
   if (url.length() > sizeof(m_eddystoneData.url)) {
   log_e("Unable to set the url ... length passed in was %d and max expected %d", url.length(), sizeof(m_eddystoneData.url));
@@ -288,7 +287,7 @@ void BLEEddystoneURL::_initHeadder(){
   BLEHeadder[8]  = 0x16; // Type Service Data
   BLEHeadder[9]  = 0xAA; // Eddystone UUID 2 -> 0xFEAA LSB
   BLEHeadder[10] = 0xFE; // Eddystone UUID 1 MSB
-  BLEHeadder[11] = 0x10; // Eddystone Frame Type
+  BLEHeadder[11] = 0x10; // Eddystone Frame Type - URL
 }
 
 #endif