RP2040: report battery charge level over BLE [skip ci]

lyusupov · May 13, 2023 · f8b363b · f8b363b
1 parent f1b8f82
commit f8b363b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# SoftRF &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [![Join the chat at https://gitter.im/lyusupov/SoftRF](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lyusupov/SoftRF?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://github.com/lyusupov/SoftRF/actions/workflows/main.yml/badge.svg)](https://github.com/lyusupov/SoftRF/actions/workflows/main.yml "Build Status") 
+# SoftRF &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [![Join the chat at https://gitter.im/lyusupov/SoftRF](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lyusupov/SoftRF?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://github.com/lyusupov/SoftRF/actions/workflows/main.yml/badge.svg)](https://github.com/lyusupov/SoftRF/actions/workflows/main.yml "Build Status") ![](https://github.com/lyusupov/SoftRF/raw/master/documents/images/radio_day_small.jpg)
 DIY, multi-functional, compatible, sub-1 GHz ISM band radio based proximity awareness system for general aviation.
 
 [<img src="https://github.com/lyusupov/SoftRF/raw/master/documents/images/Prime3-banner.jpg">](https://github.com/lyusupov/SoftRF/wiki/Prime-Edition-MkIII)

diff --git a/documents/images/radio_day_small.jpg b/documents/images/radio_day_small.jpg
diff --git a/software/firmware/source/SoftRF/src/driver/Bluetooth.cpp b/software/firmware/source/SoftRF/src/driver/Bluetooth.cpp
@@ -1591,6 +1591,7 @@ IODev_ops_t nRF52_Bluetooth_ops = {
 #include "EEPROM.h"
 #include "WiFi.h"
 #include "Bluetooth.h"
+#include "Battery.h"
 
 static bool _running = false;
 static mutex_t _mutex;
@@ -2163,7 +2164,6 @@ static void att_attributes_init(void){
  (const uint8_t *) "HMSoft", strlen("HMSoft"));
 }
 
-uint8_t _battery = 100; /* TBD */
 static unsigned long BLE_Aux_Tx_TimeMarker = 0;
 
 /* ------- BLE END ------ */
@@ -2241,7 +2241,7 @@ static void CYW43_Bluetooth_setup()
  att_server_init(_attdb, NULL, att_write_callback);
 
  // Setup battery service
- battery_service_server_init(_battery);
+ battery_service_server_init((uint8_t) Battery_charge());
 
  static char SerialNum[9];
  snprintf(SerialNum, sizeof(SerialNum), "%08X", SoC->getChipId());
@@ -2305,6 +2305,10 @@ static void CYW43_Bluetooth_loop()
  }
  BLE_Aux_Tx_TimeMarker = millis();
  }
+
+ if (isTimeToBattery()) {
+ battery_service_server_set_battery_value((uint8_t) Battery_charge());
+ }
  break;
  case BLUETOOTH_NONE:
  case BLUETOOTH_SPP: