From 1b81b155d6e1c52d0b1992c10faaa604a92b16d4 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Mon, 10 Jan 2022 18:23:39 -0800 Subject: [PATCH 1/3] Fix for battery level on tlora32 2.1 https://github.com/meshtastic/Meshtastic-device/issues/1039 --- src/configuration.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/configuration.h b/src/configuration.h index 57469bfd5..fdab3d9c0 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -453,7 +453,8 @@ along with this program. If not, see . #define GPS_RX_PIN 15 // per @der_bear on the forum, 36 is incorrect for this board type and 15 is a better pick #define GPS_TX_PIN 13 -#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage +// Updated to pin 36 per https://resource.heltec.cn/download/WiFi_LoRa_32/V2.1/WIFI_LoRa_32_V2.1(868-915).PDF +#define BATTERY_PIN 36 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage #define I2C_SDA 21 // I2C pins for this board #define I2C_SCL 22 From ad31d558a17f007f974ffc8ddf865f2d071636d1 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Mon, 10 Jan 2022 21:15:43 -0800 Subject: [PATCH 2/3] Revert "Fix for battery level on tlora32 2.1" This reverts commit 1b81b155d6e1c52d0b1992c10faaa604a92b16d4. --- src/configuration.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/configuration.h b/src/configuration.h index fdab3d9c0..57469bfd5 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -453,8 +453,7 @@ along with this program. If not, see . #define GPS_RX_PIN 15 // per @der_bear on the forum, 36 is incorrect for this board type and 15 is a better pick #define GPS_TX_PIN 13 -// Updated to pin 36 per https://resource.heltec.cn/download/WiFi_LoRa_32/V2.1/WIFI_LoRa_32_V2.1(868-915).PDF -#define BATTERY_PIN 36 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage +#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage #define I2C_SDA 21 // I2C pins for this board #define I2C_SCL 22 From a8f1115c0579ff39d9dd702d1b3ff5a3979bda72 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Tue, 11 Jan 2022 15:56:58 -0800 Subject: [PATCH 3/3] Fix typo --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index b90dbc82a..09253657e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -397,7 +397,7 @@ void setup() } #endif - DEBUG_MSG("\n\n//\\ E S H T A /\\ S T / C\n\n"); + DEBUG_MSG("\n\n//\\ E S H T /\\ S T / C\n\n"); initDeepSleep();