From 2d52d03276c9c4cdf2790ea8bed7b7d6dad6975e Mon Sep 17 00:00:00 2001 From: richonguzman Date: Sun, 5 Jan 2025 12:17:29 -0300 Subject: [PATCH] ready to test --- src/power_utils.cpp | 2 +- variants/TROY_LoRa_APRS/board_pinout.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/power_utils.cpp b/src/power_utils.cpp index b50b219..577cddc 100644 --- a/src/power_utils.cpp +++ b/src/power_utils.cpp @@ -77,7 +77,7 @@ namespace POWER_Utils { #ifdef LIGHTTRACKER_PLUS_1_0 return voltage * 6.783; #endif - #if defined(TTGO_T_Beam_V0_7) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_GPS_915) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(TTGO_T_LORA32_V2_1_TNC_915) || defined(ESP32_DIY_LoRa_GPS) || defined(ESP32_DIY_LoRa_GPS_915) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(ESP32_DIY_1W_LoRa_GPS_915) || defined(ESP32_DIY_1W_LoRa_GPS_LLCC68) || defined(OE5HWN_MeshCom) || defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS) || defined(ESP32S3_DIY_LoRa_GPS) || defined(ESP32S3_DIY_LoRa_GPS_915) + #if defined(TTGO_T_Beam_V0_7) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_GPS_915) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(TTGO_T_LORA32_V2_1_TNC_915) || defined(ESP32_DIY_LoRa_GPS) || defined(ESP32_DIY_LoRa_GPS_915) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(ESP32_DIY_1W_LoRa_GPS_915) || defined(ESP32_DIY_1W_LoRa_GPS_LLCC68) || defined(OE5HWN_MeshCom) || defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS) || defined(ESP32S3_DIY_LoRa_GPS) || defined(ESP32S3_DIY_LoRa_GPS_915) || defined(TROY_LoRa_APRS) 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_V3_TNC)|| defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WSL_V3_GPS_DISPLAY) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(ESP32_C3_DIY_LoRa_GPS_915) || defined(WEMOS_ESP32_Bat_LoRa_GPS) diff --git a/variants/TROY_LoRa_APRS/board_pinout.h b/variants/TROY_LoRa_APRS/board_pinout.h index 5767b18..869e070 100644 --- a/variants/TROY_LoRa_APRS/board_pinout.h +++ b/variants/TROY_LoRa_APRS/board_pinout.h @@ -17,15 +17,15 @@ #define OLED_SDA 21 #define OLED_SCL 22 - #define OLED_RST 16 + #define OLED_RST -1 // GPS #define GPS_RX 12 #define GPS_TX 34 // OTHER - #define BUTTON_PIN 15 - #define BATTERY_PIN 35 //LoRa32 Battery PIN 100k/100k + #define BUTTON_PIN 4 + #define BATTERY_PIN 35 #define HAS_BT_CLASSIC