From 75fee2f42b89e3992c2e9cb2cac7a4250df3dc48 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Mon, 13 May 2024 19:03:27 -0400 Subject: [PATCH] TDECK battery readings fix --- src/menu_utils.cpp | 2 +- src/pins_config.h | 6 +++--- src/power_utils.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/menu_utils.cpp b/src/menu_utils.cpp index 63f350c..22a7f4a 100644 --- a/src/menu_utils.cpp +++ b/src/menu_utils.cpp @@ -592,7 +592,7 @@ namespace MENU_Utils { if (POWER_Utils::getBatteryInfoIsConnected()) { String batteryVoltage = POWER_Utils::getBatteryInfoVoltage(); String batteryCharge = POWER_Utils::getBatteryInfoCurrent(); - #if defined(TTGO_T_Beam_V0_7) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) + #if defined(TTGO_T_Beam_V0_7) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS) sixthRowMainMenu = "Bat: " + batteryVoltage + "V"; #endif #if defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_SX1268) diff --git a/src/pins_config.h b/src/pins_config.h index ee11f44..bd281d7 100644 --- a/src/pins_config.h +++ b/src/pins_config.h @@ -185,11 +185,11 @@ #ifdef TTGO_T_DECK_GPS #define GPS_RX 43 #define GPS_TX 44 - #define BOARD_I2C_SDA 18 - #define BOARD_I2C_SCL 8 #define BOARD_POWERON 10 #define BOARD_SDCARD_CS 39 - + #define BATTERY_PIN 4 + #define BOARD_I2C_SDA 18 + #define BOARD_I2C_SCL 8 #define RADIO_SCLK_PIN 40 #define RADIO_MISO_PIN 38 #define RADIO_MOSI_PIN 41 diff --git a/src/power_utils.cpp b/src/power_utils.cpp index eb4724a..8ee338e 100644 --- a/src/power_utils.cpp +++ b/src/power_utils.cpp @@ -69,7 +69,7 @@ namespace POWER_Utils { batteryMeasurmentTime = millis(); #endif double voltage = (adc_value * 3.3 ) / 4095.0; - #if defined(TTGO_T_Beam_V0_7) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(OE5HWN_MeshCom) + #if defined(TTGO_T_Beam_V0_7) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_LoRa_GPS) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(OE5HWN_MeshCom) || defined(TTGO_T_DECK_GPS) return (2 * (voltage + 0.1)) * (1 + (lora32BatReadingCorr/100)); // (2 x 100k voltage divider) 2 x voltage divider/+0.1 because ESP32 nonlinearity ~100mV ADC offset/extra correction #endif #if defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(ESP32_C3_DIY_LoRa_GPS)