Merge pull request #141 from lora-aprs/platformio_dependabot/ArduinoJson/7.0.4

Bump ArduinoJson from 6.21.3 to 7.0.4

.github/workflows/buid_check.yml

@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - master
+  merge_group:
 
 jobs:
   build:

README.md

@@ -10,7 +10,8 @@ Try it out and be part of the APRS network.
 You can use one of the Lora32 boards:
 
 * TTGO T-Beam V0.7 (433MHz SX1278)
-* TTGO T-Beam V1 (433MHz SX1278)
+* TTGO T-Beam V1.0 and V1.1 (433MHz SX1278)
+* TTGO T-Beam V1.2 AXP2101 (433MHz SX1278)
 
 This boards cost around 30 Euros, they are very cheap but perfect for an LoRa iGate.
 Keep in minde: you need a 433MHz version!

platformio.ini

@@ -2,19 +2,19 @@
 default_envs = ttgo-t-beam-v1
 
 [env]
-platform = espressif32 @ 6.3.2
+platform = espressif32 @ 6.7.0
 framework = arduino
 lib_ldf_mode = deep+
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
 lib_deps = 
-	adafruit/Adafruit GFX Library @ 1.11.7
-	adafruit/Adafruit SSD1306 @ 2.5.7
-	bblanchon/ArduinoJson @ 6.21.2
-	lewisxhe/XPowersLib @ 0.1.8
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+	bblanchon/ArduinoJson @ 7.0.4
+	lewisxhe/XPowersLib @ 0.2.4
 	sandeepmistry/LoRa @ 0.8.0
 	peterus/APRS-Decoder-Lib @ 0.0.6
-	mikalhart/TinyGPSPlus @ 1.0.3
+	mikalhart/TinyGPSPlus @ 1.1.0
 	paulstoffregen/Time @ 1.6
 	shaggydog/OneButton @ 1.5.0
 	peterus/esp-logger @ 1.0.0

src/LoRa_APRS_Tracker.cpp

@@ -13,7 +13,7 @@
 #include "pins.h"
 #include "power_management.h"
 
-#define VERSION "23.36.0"
+#define VERSION "23.36.01"
 
 logging::Logger logger;
 
@@ -71,24 +71,12 @@ static void toggle_display() {
 void setup() {
   Serial.begin(115200);
 
-#ifdef TTGO_T_Beam_V1_0
+#if defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_2)
   Wire.begin(SDA, SCL);
   if (powerManagement->begin(Wire)) {
-    logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "AXP192", "init done!");
+    logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "PMU", "init done!");
   } else {
-    logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, "AXP192", "init failed!");
-  }
-  powerManagement->activateLoRa();
-  powerManagement->activateOLED();
-  powerManagement->activateGPS();
-  powerManagement->activateMeasurement();
-#endif
-#ifdef TTGO_T_Beam_V1_2
-  Wire.begin(SDA, SCL);
-  if (powerManagement->begin(Wire)) {
-    logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "AXP2101", "init done!");
-  } else {
-    logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, "AXP2101", "init failed!");
+    logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, "PMU", "init failed!");
   }
   powerManagement->activateLoRa();
   powerManagement->activateOLED();
@@ -197,7 +185,7 @@ void loop() {
   static bool   BatteryIsConnected   = false;
   static String batteryVoltage       = "";
   static String batteryChargeCurrent = "";
-#ifdef TTGO_T_Beam_V1_0
+#if defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_2)
   static unsigned int rate_limit_check_battery = 0;
   if (!(rate_limit_check_battery++ % 60)) {
     BatteryIsConnected = powerManagement->isBatteryConnect();
@@ -301,7 +289,10 @@ void loop() {
       aprsmsg += BeaconMan.getCurrentBeaconConfig()->message;
     }
     if (BatteryIsConnected) {
-      aprsmsg += " -  _Bat.: " + batteryVoltage + "V - Cur.: " + batteryChargeCurrent + "mA";
+      aprsmsg += " - Bat.: " + batteryVoltage + "V";
+#ifdef TTGO_T_Beam_V1_0
+      aprsmsg += " - Cur.: " + batteryChargeCurrent + "mA";
+#endif
     }
 
     if (BeaconMan.getCurrentBeaconConfig()->enhance_precision) {
@@ -376,6 +367,9 @@ void loop() {
            would lead to decrease of beacon rate in between 5 to 20 km/h. what
            is even below the slow speed rate.
         */
+        if (curr_speed == 0) {
+          curr_speed = 1;
+        }
         txInterval = min(BeaconMan.getCurrentBeaconConfig()->smart_beacon.slow_rate,
                          BeaconMan.getCurrentBeaconConfig()->smart_beacon.fast_speed * BeaconMan.getCurrentBeaconConfig()->smart_beacon.fast_rate / curr_speed) *
                      1000;

src/power_management.cpp

@@ -146,13 +146,13 @@ bool AXP2101::begin(TwoWire &port) {
   _pmu->enablePowerOutput(XPOWERS_ALDO3);
 
   // disable all axp chip interrupt
-  _pmu->disableIRQ(XPOWERS_AXP192_ALL_IRQ);
+  _pmu->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
 
   // Set constant current charging current
-  _pmu->setChargerConstantCurr(XPOWERS_AXP192_CHG_CUR_780MA);
+  _pmu->setChargerConstantCurr(XPOWERS_AXP2101_CHG_CUR_800MA);
 
   // Set up the charging voltage
-  _pmu->setChargeTargetVoltage(XPOWERS_AXP192_CHG_VOL_4V2);
+  _pmu->setChargeTargetVoltage(XPOWERS_AXP2101_CHG_VOL_4V2);
 
   _pmu->setChargingLedMode(XPOWERS_CHG_LED_CTRL_CHG);