adding battery info

data/tracker_config.json

@@ -1,7 +1,7 @@
 {
 	"beacons": [
 		{
-			"callsign": "NOCALL-7",
+			"callsign": "CD2RXU-7",
 			"symbol": "[",
 			"comment": "",
 			"smart_beacon": {
@@ -17,7 +17,7 @@
 			}
 		},
 		{
-			"callsign": "NOCALL-7",
+			"callsign": "CD2RXU-7",
 			"symbol": ">",
 			"comment": "",
 			"smart_beacon": {
@@ -33,8 +33,8 @@
 			}
 		},
 		{
-			"callsign": "NOCALL-7",
-			"symbol": "b",
+			"callsign": "CD2RXU-7",
+			"symbol": "j",
 			"comment": "",
 			"smart_beacon": {
 				"active": true,
@@ -67,6 +67,7 @@
 		"rememberStationTime": 30,
 		"maxDistanceToTracker": 30, 
 		"standingUpdateTime": 15,
-		"sendAltitude": true
+		"sendAltitude": true,
+		"sendBatteryInfo": false
 	}
 }

src/LoRa_APRS_Tracker.cpp

@@ -82,12 +82,12 @@ void setup() {
   GPS_Utils::setup();
   LoRa_Utils::setup();
 
-  /*WiFi.mode(WIFI_OFF);
+  WiFi.mode(WIFI_OFF);
   btStop();
   logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Main", "WiFi and BT controller stopped");
   esp_bt_controller_disable();
-  logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Main", "BT controller disabled");*/
-  BLE_Utils::setup();
+  logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Main", "BT controller disabled");
+  //BLE_Utils::setup();
 
   userButton.attachClick(BUTTON_Utils::singlePress);
   userButton.attachLongPressStart(BUTTON_Utils::longPress);

src/configuration.cpp

@@ -61,6 +61,7 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) {
     maxDistanceToTracker          = data["other"]["maxDistanceToTracker"].as<int>();
     standingUpdateTime            = data["other"]["standingUpdateTime"].as<int>();
     sendAltitude                  = data["other"]["sendAltitude"].as<bool>();
+    sendBatteryInfo               = data["other"]["sendBatteryInfo"].as<bool>();
 
     configFile.close();
 }

src/configuration.h

@@ -47,6 +47,7 @@ public:
   int     maxDistanceToTracker;
   int     standingUpdateTime;
   bool    sendAltitude;
+  bool    sendBatteryInfo;
 
   Configuration();
   void validateConfigFile(String currentBeaconCallsign);

src/station_utils.cpp

@@ -2,6 +2,7 @@
 #include <vector>
 #include "station_utils.h"
 #include "configuration.h"
+#include "power_utils.h"
 #include "lora_utils.h"
 #include "msg_utils.h"
 #include "gps_utils.h"
@@ -13,6 +14,7 @@ extern Configuration        Config;
 extern Beacon               *currentBeacon;
 extern logging::Logger      logger;
 extern TinyGPSPlus          gps;
+extern PowerManagement      powerManagement;
 extern std::vector<String>  lastHeardStation;
 extern std::vector<String>  lastHeardStation_temp;
 extern String               fourthLine;
@@ -395,6 +397,17 @@ void sendBeacon() {
     } 
   }
 
+  if (Config.sendBatteryInfo) {
+    String batteryVoltage = powerManagement.getBatteryInfoVoltage();
+    String batteryChargeCurrent = powerManagement.getBatteryInfoCurrent();
+    #ifdef TTGO_T_Beam_V1_0
+    packet += " Bat=" + batteryVoltage + "V (" + batteryChargeCurrent + "mA)";
+    #endif
+    #ifdef TTGO_T_Beam_V1_2
+    packet += " Bat=" + String(batteryVoltage.toFloat()/1000,2) + "V (" + batteryChargeCurrent + "%)";
+    #endif
+  }
+
   logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "Loop", "%s", packet.c_str());
   show_display("<<< TX >>>", "", packet,100);
   LoRa_Utils::sendNewPacket(packet);