From c5dcc4c7ab4d5386bd46f58794c0dd66bdccd043 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Mon, 8 Sep 2025 21:28:54 -0300 Subject: [PATCH] SensorRead with UEM fix --- src/LoRa_APRS_iGate.cpp | 2 +- src/power_utils.cpp | 23 +++++++++---------- src/wx_utils.cpp | 1 + .../ESP32_C3_OctopusLab_LoRa/board_pinout.h | 3 +++ variants/ESP32_DIY_1W_LoRa/board_pinout.h | 3 +++ variants/ESP32_DIY_1W_LoRa_915/board_pinout.h | 5 +++- .../ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h | 3 +++ .../board_pinout.h | 3 +++ variants/ESP32_DIY_LoRa/board_pinout.h | 3 +++ variants/ESP32_DIY_LoRa_915/board_pinout.h | 3 +++ variants/ESP32_DIY_LoRa_A7670/board_pinout.h | 3 +++ .../ESP32_DIY_LoRa_A7670_915/board_pinout.h | 3 +++ variants/OE5HWN_MeshCom/board_pinout.h | 3 +++ .../QRPLabs_LightGateway_1_0/board_pinout.h | 3 +++ .../board_pinout.h | 3 +++ variants/TROY_LoRa_APRS/board_pinout.h | 3 +++ variants/WEMOS-D1-R32-RA02/board_pinout.h | 3 +++ .../WEMOS-LOLIN32-OLED-DIY/board_pinout.h | 5 +++- .../WEMOS_S2_MINI_DIY_LoRa/board_pinout.h | 5 ++++ .../XIAO_ESP32S3_WIO_SX1262/board_pinout.h | 7 +++++- variants/heltec-lora32-v2/board_pinout.h | 3 +++ .../heltec_wifi_lora_32_V3/board_pinout.h | 8 +++++-- .../heltec_wifi_lora_32_V3_2/board_pinout.h | 8 +++++-- .../heltec_wireless_paper_v1/board_pinout.h | 7 ++++-- variants/heltec_wireless_stick/board_pinout.h | 3 +++ .../board_pinout.h | 7 ++++-- .../board_pinout.h | 7 ++++-- .../heltec_wireless_tracker/board_pinout.h | 7 ++++-- variants/ttgo-lora32-v21/board_pinout.h | 7 ++++-- variants/ttgo-lora32-v21_915/board_pinout.h | 3 +++ variants/ttgo_lora32_t3s3_v1_2/board_pinout.h | 3 +++ variants/ttgo_t_deck_GPS/board_pinout.h | 8 ++++--- variants/ttgo_t_deck_plus/board_pinout.h | 8 ++++--- 33 files changed, 130 insertions(+), 36 deletions(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 0cc9fcd..6d84272 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -67,7 +67,7 @@ ___________________________________________________________________*/ #endif -String versionDate = "2025-09-02"; +String versionDate = "2025-09-08"; String versionNumber = "3.1"; Configuration Config; WiFiClient aprsIsClient; diff --git a/src/power_utils.cpp b/src/power_utils.cpp index 35a2edc..28eaabf 100644 --- a/src/power_utils.cpp +++ b/src/power_utils.cpp @@ -296,18 +296,6 @@ namespace POWER_Utils { adc_ctrl_OFF(); #endif - #if defined(HELTEC_WIRELESS_TRACKER) - Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL); - #endif - - #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0) || defined(TTGO_LORA32_T3S3_V1_2) || defined(HELTEC_V2) - Wire.begin(OLED_SDA, OLED_SCL); - #endif - - #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP_V1) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) - Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL); - #endif - #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS) pinMode(BOARD_POWERON, OUTPUT); digitalWrite(BOARD_POWERON, HIGH); @@ -321,9 +309,20 @@ namespace POWER_Utils { digitalWrite(TFT_CS, HIGH); delay(500); + #endif + + #ifdef USE_WIRE_WITH_OLED_PINS + Wire.begin(OLED_SDA, OLED_SCL); + #endif + + #ifdef USE_WIRE_WITH_BOARD_I2C_PINS Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL); #endif + #ifdef USE_WIRE1_WITH_BOARD_I2C_PINS + Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL); + #endif + delay(1000); BATTERY_Utils::setup(); BATTERY_Utils::startupBatteryHealth(); diff --git a/src/wx_utils.cpp b/src/wx_utils.cpp index 7268bce..c73d1e7 100644 --- a/src/wx_utils.cpp +++ b/src/wx_utils.cpp @@ -71,6 +71,7 @@ namespace WX_Utils { #endif err = Wire.endTransmission(); #endif + delay(5); if (err == 0) { //Serial.println(addr); //this shows any connected board to I2C if (addr == 0x76 || addr == 0x77) { // BME or BMP diff --git a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h index e36f0ef..13650b5 100644 --- a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h +++ b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h @@ -32,6 +32,9 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_NUM_3 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_1W_LoRa/board_pinout.h b/variants/ESP32_DIY_1W_LoRa/board_pinout.h index b78a5fa..b39e690 100644 --- a/variants/ESP32_DIY_1W_LoRa/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa/board_pinout.h @@ -34,6 +34,9 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_12 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h index cbd0df2..eb427e5 100644 --- a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h @@ -34,8 +34,11 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_12 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display - #define HAS_DISPLAY + #define HAS_DISPLAY #undef OLED_SDA #undef OLED_SCL diff --git a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h index a64303b..b5e8368 100644 --- a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h @@ -34,6 +34,9 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_12 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h index a509d64..f3e694d 100644 --- a/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h @@ -34,6 +34,9 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_33 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_LoRa/board_pinout.h b/variants/ESP32_DIY_LoRa/board_pinout.h index 1852f91..aaf64e9 100644 --- a/variants/ESP32_DIY_LoRa/board_pinout.h +++ b/variants/ESP32_DIY_LoRa/board_pinout.h @@ -30,6 +30,9 @@ #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_26 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_LoRa_915/board_pinout.h b/variants/ESP32_DIY_LoRa_915/board_pinout.h index dd98976..9826b6a 100644 --- a/variants/ESP32_DIY_LoRa_915/board_pinout.h +++ b/variants/ESP32_DIY_LoRa_915/board_pinout.h @@ -30,6 +30,9 @@ #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_26 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_LoRa_A7670/board_pinout.h b/variants/ESP32_DIY_LoRa_A7670/board_pinout.h index 1f5237e..a8a0e4e 100644 --- a/variants/ESP32_DIY_LoRa_A7670/board_pinout.h +++ b/variants/ESP32_DIY_LoRa_A7670/board_pinout.h @@ -28,6 +28,9 @@ #define RADIO_RST_PIN 0 #define RADIO_BUSY_PIN 32 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h b/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h index 521645b..ba04b52 100644 --- a/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h +++ b/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h @@ -28,6 +28,9 @@ #define RADIO_RST_PIN 0 #define RADIO_BUSY_PIN 32 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/OE5HWN_MeshCom/board_pinout.h b/variants/OE5HWN_MeshCom/board_pinout.h index a2746bf..df8c637 100644 --- a/variants/OE5HWN_MeshCom/board_pinout.h +++ b/variants/OE5HWN_MeshCom/board_pinout.h @@ -34,6 +34,9 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_33 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/QRPLabs_LightGateway_1_0/board_pinout.h b/variants/QRPLabs_LightGateway_1_0/board_pinout.h index 117583f..5973641 100644 --- a/variants/QRPLabs_LightGateway_1_0/board_pinout.h +++ b/variants/QRPLabs_LightGateway_1_0/board_pinout.h @@ -34,6 +34,9 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_5 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h b/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h index f91031b..1267c60 100644 --- a/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h +++ b/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h @@ -35,6 +35,9 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_5 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/TROY_LoRa_APRS/board_pinout.h b/variants/TROY_LoRa_APRS/board_pinout.h index ceb5e76..b1b63ce 100644 --- a/variants/TROY_LoRa_APRS/board_pinout.h +++ b/variants/TROY_LoRa_APRS/board_pinout.h @@ -30,6 +30,9 @@ #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_26 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/WEMOS-D1-R32-RA02/board_pinout.h b/variants/WEMOS-D1-R32-RA02/board_pinout.h index 4be24ed..992d660 100644 --- a/variants/WEMOS-D1-R32-RA02/board_pinout.h +++ b/variants/WEMOS-D1-R32-RA02/board_pinout.h @@ -31,6 +31,9 @@ #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_12 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h index 96cc05d..36672b4 100644 --- a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h +++ b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h @@ -30,7 +30,10 @@ #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_25 - // Display + // I2C + #define USE_WIRE_WITH_OLED_PINS + + // Display #define HAS_DISPLAY #undef OLED_SDA diff --git a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h index cf29f3a..73da5a5 100644 --- a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h +++ b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h @@ -30,6 +30,11 @@ #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_38 + // I2C + #define USE_WIRE_WITH_BOARD_I2C_PINS + #define BOARD_I2C_SDA 11 + #define BOARD_I2C_SCL 12 + // Aditional Config #define INTERNAL_LED_PIN 15 diff --git a/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h b/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h index 31ecdad..4c99b47 100644 --- a/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h +++ b/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h @@ -36,5 +36,10 @@ #define BUTTON_PIN 21 #define INTERNAL_LED_PIN 48 - + + // I2C + #define USE_WIRE_WITH_OLED_PINS + #define OLED_SDA 5 + #define OLED_SCL 6 + #endif \ No newline at end of file diff --git a/variants/heltec-lora32-v2/board_pinout.h b/variants/heltec-lora32-v2/board_pinout.h index 05dba23..923dd41 100644 --- a/variants/heltec-lora32-v2/board_pinout.h +++ b/variants/heltec-lora32-v2/board_pinout.h @@ -30,6 +30,9 @@ #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_26 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/heltec_wifi_lora_32_V3/board_pinout.h b/variants/heltec_wifi_lora_32_V3/board_pinout.h index 37f3944..4731f2d 100644 --- a/variants/heltec_wifi_lora_32_V3/board_pinout.h +++ b/variants/heltec_wifi_lora_32_V3/board_pinout.h @@ -31,6 +31,12 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_14 + // I2C + #define USE_WIRE_WITH_OLED_PINS + #define USE_WIRE1_WITH_BOARD_I2C_PINS + #define BOARD_I2C_SDA 41 + #define BOARD_I2C_SCL 42 + // Display #define HAS_DISPLAY @@ -48,7 +54,5 @@ #define BATTERY_PIN 1 #define VEXT_CTRL 36 #define ADC_CTRL 37 - #define BOARD_I2C_SDA 41 - #define BOARD_I2C_SCL 42 #endif \ No newline at end of file diff --git a/variants/heltec_wifi_lora_32_V3_2/board_pinout.h b/variants/heltec_wifi_lora_32_V3_2/board_pinout.h index 37f3944..4731f2d 100644 --- a/variants/heltec_wifi_lora_32_V3_2/board_pinout.h +++ b/variants/heltec_wifi_lora_32_V3_2/board_pinout.h @@ -31,6 +31,12 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_14 + // I2C + #define USE_WIRE_WITH_OLED_PINS + #define USE_WIRE1_WITH_BOARD_I2C_PINS + #define BOARD_I2C_SDA 41 + #define BOARD_I2C_SCL 42 + // Display #define HAS_DISPLAY @@ -48,7 +54,5 @@ #define BATTERY_PIN 1 #define VEXT_CTRL 36 #define ADC_CTRL 37 - #define BOARD_I2C_SDA 41 - #define BOARD_I2C_SCL 42 #endif \ No newline at end of file diff --git a/variants/heltec_wireless_paper_v1/board_pinout.h b/variants/heltec_wireless_paper_v1/board_pinout.h index f715d04..0bcccfd 100644 --- a/variants/heltec_wireless_paper_v1/board_pinout.h +++ b/variants/heltec_wireless_paper_v1/board_pinout.h @@ -31,6 +31,11 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_14 + // I2C + #define USE_WIRE1_WITH_BOARD_I2C_PINS + #define BOARD_I2C_SDA 37 + #define BOARD_I2C_SCL 36 + // Display #define HAS_DISPLAY #define HAS_EPAPER @@ -46,7 +51,5 @@ #define BATTERY_PIN 20 #define ADC_CTRL 19 #define VEXT_CTRL 45 - #define BOARD_I2C_SDA 37 - #define BOARD_I2C_SCL 36 #endif \ No newline at end of file diff --git a/variants/heltec_wireless_stick/board_pinout.h b/variants/heltec_wireless_stick/board_pinout.h index 37f3944..b8ca55b 100644 --- a/variants/heltec_wireless_stick/board_pinout.h +++ b/variants/heltec_wireless_stick/board_pinout.h @@ -31,6 +31,9 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_14 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/heltec_wireless_stick_lite_v3/board_pinout.h b/variants/heltec_wireless_stick_lite_v3/board_pinout.h index 966d0af..2aa4cba 100644 --- a/variants/heltec_wireless_stick_lite_v3/board_pinout.h +++ b/variants/heltec_wireless_stick_lite_v3/board_pinout.h @@ -31,12 +31,15 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_14 + // I2C + #define USE_WIRE1_WITH_BOARD_I2C_PINS + #define BOARD_I2C_SDA 41 + #define BOARD_I2C_SCL 42 + // Aditional Config #define INTERNAL_LED_PIN 35 #define BATTERY_PIN 1 #define VEXT_CTRL 36 #define ADC_CTRL 37 - #define BOARD_I2C_SDA 41 - #define BOARD_I2C_SCL 42 #endif \ No newline at end of file diff --git a/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h b/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h index e4d0f64..14c68ea 100644 --- a/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h +++ b/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h @@ -31,6 +31,11 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_14 + // I2C + #define USE_WIRE1_WITH_BOARD_I2C_PINS + #define BOARD_I2C_SDA 41 + #define BOARD_I2C_SCL 42 + // Display #define HAS_DISPLAY #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) @@ -40,7 +45,5 @@ #define BATTERY_PIN 1 #define VEXT_CTRL 36 #define ADC_CTRL 37 - #define BOARD_I2C_SDA 41 - #define BOARD_I2C_SCL 42 #endif \ No newline at end of file diff --git a/variants/heltec_wireless_tracker/board_pinout.h b/variants/heltec_wireless_tracker/board_pinout.h index b5f8e18..9296c8c 100644 --- a/variants/heltec_wireless_tracker/board_pinout.h +++ b/variants/heltec_wireless_tracker/board_pinout.h @@ -30,6 +30,11 @@ #define RADIO_BUSY_PIN 13 // SX1262 BUSY #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_14 + + // I2C + #define USE_WIRE_WITH_BOARD_I2C_PINS + #define BOARD_I2C_SDA 7 + #define BOARD_I2C_SCL 6 // Display #define HAS_DISPLAY @@ -40,8 +45,6 @@ #define BATTERY_PIN 1 #define ADC_CTRL 2 // HELTEC Wireless Tracker ADC_CTRL = HIGH powers the voltage divider to read BatteryPin. Only on V05 = V1.1 #define VEXT_CTRL 3 // To turn on GPS and TFT - #define BOARD_I2C_SDA 7 - #define BOARD_I2C_SCL 6 // GPS #define HAS_GPS diff --git a/variants/ttgo-lora32-v21/board_pinout.h b/variants/ttgo-lora32-v21/board_pinout.h index 80ebd7c..5b3ca15 100644 --- a/variants/ttgo-lora32-v21/board_pinout.h +++ b/variants/ttgo-lora32-v21/board_pinout.h @@ -30,6 +30,9 @@ #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_26 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY @@ -43,7 +46,7 @@ // Aditional Config #define INTERNAL_LED_PIN 25 // Green Led - #define BATTERY_PIN 35 - #define HAS_ADC_CALIBRATION + #define BATTERY_PIN 35 + #define HAS_ADC_CALIBRATION #endif \ No newline at end of file diff --git a/variants/ttgo-lora32-v21_915/board_pinout.h b/variants/ttgo-lora32-v21_915/board_pinout.h index 79e153a..c3d6b6a 100644 --- a/variants/ttgo-lora32-v21_915/board_pinout.h +++ b/variants/ttgo-lora32-v21_915/board_pinout.h @@ -30,6 +30,9 @@ #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_26 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h index b4802e5..88bee38 100644 --- a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h +++ b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h @@ -31,6 +31,9 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_33 + // I2C + #define USE_WIRE_WITH_OLED_PINS + // Display #define HAS_DISPLAY diff --git a/variants/ttgo_t_deck_GPS/board_pinout.h b/variants/ttgo_t_deck_GPS/board_pinout.h index 36713a9..f3593fa 100644 --- a/variants/ttgo_t_deck_GPS/board_pinout.h +++ b/variants/ttgo_t_deck_GPS/board_pinout.h @@ -31,6 +31,11 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_45 + // I2C + #define USE_WIRE_WITH_BOARD_I2C_PINS + #define BOARD_I2C_SDA 18 + #define BOARD_I2C_SCL 8 + // Display #define HAS_DISPLAY #define HAS_TFT @@ -50,7 +55,4 @@ #define BOARD_SDCARD_CS 39 #define BOARD_BL_PIN 42 - #define BOARD_I2C_SDA 18 - #define BOARD_I2C_SCL 8 - #endif \ No newline at end of file diff --git a/variants/ttgo_t_deck_plus/board_pinout.h b/variants/ttgo_t_deck_plus/board_pinout.h index cdcc33a..6ba1bde 100644 --- a/variants/ttgo_t_deck_plus/board_pinout.h +++ b/variants/ttgo_t_deck_plus/board_pinout.h @@ -31,6 +31,11 @@ #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN #define GPIO_WAKEUP_PIN GPIO_SEL_45 + // I2C + #define USE_WIRE_WITH_BOARD_I2C_PINS + #define BOARD_I2C_SDA 18 + #define BOARD_I2C_SCL 8 + // Display #define HAS_DISPLAY #define HAS_TFT @@ -51,7 +56,4 @@ #define BOARD_SDCARD_CS 39 #define BOARD_BL_PIN 42 - #define BOARD_I2C_SDA 18 - #define BOARD_I2C_SCL 8 - #endif \ No newline at end of file