Add Battery Service over BLE

Fix issue #733

Author: nseidle

Firmware/RTK_Everywhere/Bluetooth.ino

@@ -30,9 +30,13 @@
 static volatile BTState bluetoothState = BT_OFF;
 
 #ifdef COMPILE_BT
+
+#include <BleBatteryService.h>
+
 BTSerialInterface *bluetoothSerialSpp;
 BTSerialInterface *bluetoothSerialBle;
 BTSerialInterface *bluetoothSerialBleCommands; // Second BLE serial for CLI interface to mobile app
+BleBatteryService bluetoothBatteryService;
 
 #define BLE_SERVICE_UUID "6e400001-b5a3-f393-e0a9-e50e24dcca9e"
 #define BLE_RX_UUID "6e400002-b5a3-f393-e0a9-e50e24dcca9e"
@@ -503,6 +507,7 @@ void bluetoothStart()
                 deviceName, false, false, settings.sppRxQueueSize, settings.sppTxQueueSize, BLE_COMMAND_SERVICE_UUID,
                 BLE_COMMAND_RX_UUID, BLE_COMMAND_TX_UUID); // localName, isMaster, disableBLE, rxBufferSize,
                                                            // txBufferSize, serviceID, rxID, txID
+            bluetoothBatteryService.begin();
         }
         else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP)
         {
@@ -522,7 +527,9 @@ void bluetoothStart()
             beginSuccess &= bluetoothSerialBleCommands->begin(
                 deviceName, false, false, settings.sppRxQueueSize, settings.sppTxQueueSize, BLE_COMMAND_SERVICE_UUID,
                 BLE_COMMAND_RX_UUID, BLE_COMMAND_TX_UUID); // localName, isMaster, disableBLE, rxBufferSize,
-                                                           // txBufferSize, serviceID, rxID, txID
+            // txBufferSize, serviceID, rxID, txID
+
+            bluetoothBatteryService.begin();
         }
         else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP_ACCESSORY_MODE)
         {
@@ -750,3 +757,11 @@ void bluetoothPrintStatus()
 
     systemPrintln();
 }
+
+// Send over dedicated BLE service
+void bluetoothSendBatteryPercent(int batteryLevelPercent)
+{
+#ifdef COMPILE_BT
+    bluetoothBatteryService.reportBatteryPercent(batteryLevelPercent);
+#endif // COMPILE_BT
+}

Firmware/RTK_Everywhere/System.ino

@@ -156,6 +156,8 @@ void updateBattery()
 
             checkBatteryLevels();
 
+            bluetoothSendBatteryPercent(batteryLevelPercent); // Send over dedicated BLE service
+
             // Display the battery data
             if (settings.enablePrintBatteryMessages)
             {
@@ -951,7 +953,7 @@ void gpioExpanderSelectImu()
         gpioExpanderSwitches->digitalWrite(gpioExpanderSwitch_S3, LOW);
 }
 
-//Connect ESP32 UART2 to LoRa UART2 for configuration and bootloading/firmware updates
+// Connect ESP32 UART2 to LoRa UART2 for configuration and bootloading/firmware updates
 void gpioExpanderSelectLoraConfigure()
 {
     if (online.gpioExpanderSwitches == true)
@@ -990,7 +992,7 @@ bool gpioExpanderLoraIsOn()
         if (gpioExpanderSwitches->digitalRead(gpioExpanderSwitch_LoraEnable) == HIGH)
             return (true);
     }
-    return(false);
+    return (false);
 }
 void gpioExpanderLoraBootEnable()
 {