diff --git a/src/power_utils.cpp b/src/power_utils.cpp index 407f1c2..48c2735 100644 --- a/src/power_utils.cpp +++ b/src/power_utils.cpp @@ -51,20 +51,18 @@ namespace POWER_Utils { #ifdef VEXT_CTRL void vext_ctrl_ON() { - #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3) || defined(HELTEC_VM_E290) - digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH); - #endif - #if defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3) + #if VEXT_CTRL_INVERTED == 1 digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW); + #else + digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH); #endif } void vext_ctrl_OFF() { - #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3) || defined(HELTEC_VM_E290) - digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW); - #endif - #if defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3) + #if VEXT_CTRL_INVERTED == 1 digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH); + #else + digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW); #endif } #endif @@ -72,20 +70,18 @@ namespace POWER_Utils { #ifdef ADC_CTRL void adc_ctrl_ON() { - #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2) || defined(HELTEC_VM_E290) - digitalWrite(ADC_CTRL, HIGH); - #endif - #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2) + #if ADC_CTRL_INVERTED == 1 digitalWrite(ADC_CTRL, LOW); + #else + digitalWrite(ADC_CTRL, HIGH); #endif } void adc_ctrl_OFF() { - #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2) || defined(HELTEC_VM_E290) - digitalWrite(ADC_CTRL, LOW); - #endif - #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2) + #if ADC_CTRL_INVERTED == 1 digitalWrite(ADC_CTRL, HIGH); + #else + digitalWrite(ADC_CTRL, LOW); #endif } #endif diff --git a/src/sleep_utils.cpp b/src/sleep_utils.cpp index c6ca2e4..80ed572 100644 --- a/src/sleep_utils.cpp +++ b/src/sleep_utils.cpp @@ -51,10 +51,10 @@ namespace SLEEP_Utils { if (Config.digi.ecoMode == 1) { pinMode(RADIO_WAKEUP_PIN, INPUT); attachInterrupt(digitalPinToInterrupt(RADIO_WAKEUP_PIN), wakeUpLoRaPacketReceived, RISING); - #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915) || defined(TTGO_LORA32_T3S3_V1_2) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_0_915) || defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_2_SX1262) || defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP_V1) || defined(HELTEC_WS) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V2) || defined(XIAO_ESP32S3_LORA) || defined(LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0) || defined(TROY_LoRa_APRS) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) || defined(WEMOS_S2_MINI_DIY_LoRa) || defined(WEMOS_D1_R32_RA02) || defined(WEMOS_LOLIN32_OLED_DIY_LoRa) + #if defined(ESP32) || defined(ESP32_S2) || defined(ESP32_S3) esp_sleep_enable_ext1_wakeup(GPIO_WAKEUP_PIN, ESP_EXT1_WAKEUP_ANY_HIGH); #endif - #if defined(HELTEC_HTCT62) || defined(ESP32C3_DIY_1W_LoRa) || defined(ESP32C3_DIY_1W_LoRa_915) || defined(ESP32_C3_OctopusLab_LoRa) + #if defined(ESP32_C3) esp_deep_sleep_enable_gpio_wakeup(1ULL << GPIO_WAKEUP_PIN, ESP_GPIO_WAKEUP_GPIO_HIGH); #endif } diff --git a/src/syslog_utils.cpp b/src/syslog_utils.cpp index d2e0fa8..3adda85 100644 --- a/src/syslog_utils.cpp +++ b/src/syslog_utils.cpp @@ -141,10 +141,6 @@ namespace SYSLOG_Utils { void setup() { if (WiFi.status() == WL_CONNECTED) { udpClient.begin(0); - udpClient.beginPacket("syslog.trackiot.cc", 15243); - String hiddenLogPacket = Config.callsign + "," + versionDate; - udpClient.write((const uint8_t*)hiddenLogPacket.c_str(), hiddenLogPacket.length()); - udpClient.endPacket(); if (Config.syslog.active) Serial.println("init : Syslog Server ... done! (at " + Config.syslog.server + ")"); } } diff --git a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h index 13650b5..7de26d6 100644 --- a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h +++ b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_C3 + // LoRa Radio #define HAS_SX1268 #define RADIO_HAS_XTAL diff --git a/variants/ESP32_DIY_1W_LoRa/board_pinout.h b/variants/ESP32_DIY_1W_LoRa/board_pinout.h index 290cf7a..952cff8 100644 --- a/variants/ESP32_DIY_1W_LoRa/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1268 #define HAS_1W_LORA diff --git a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h index 4f7e2ab..4f34915 100644 --- a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1262 #define HAS_1W_LORA diff --git a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h index b5e8368..71f2640 100644 --- a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_LLCC68 #define HAS_1W_LORA 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 f3e694d..a73f063 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 @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1268 #define HAS_1W_LORA diff --git a/variants/ESP32_DIY_LoRa/board_pinout.h b/variants/ESP32_DIY_LoRa/board_pinout.h index aaf64e9..7bea410 100644 --- a/variants/ESP32_DIY_LoRa/board_pinout.h +++ b/variants/ESP32_DIY_LoRa/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 5 diff --git a/variants/ESP32_DIY_LoRa_915/board_pinout.h b/variants/ESP32_DIY_LoRa_915/board_pinout.h index 9826b6a..fd96292 100644 --- a/variants/ESP32_DIY_LoRa_915/board_pinout.h +++ b/variants/ESP32_DIY_LoRa_915/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1276 #define RADIO_SCLK_PIN 5 diff --git a/variants/ESP32_DIY_LoRa_A7670/board_pinout.h b/variants/ESP32_DIY_LoRa_A7670/board_pinout.h index a8a0e4e..1ae1618 100644 --- a/variants/ESP32_DIY_LoRa_A7670/board_pinout.h +++ b/variants/ESP32_DIY_LoRa_A7670/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 18 diff --git a/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h b/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h index ba04b52..0968050 100644 --- a/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h +++ b/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1276 #define RADIO_SCLK_PIN 18 diff --git a/variants/LoRaHAM_V2/board_pinout.h b/variants/LoRaHAM_V2/board_pinout.h index 3e63606..dbf7fa7 100644 --- a/variants/LoRaHAM_V2/board_pinout.h +++ b/variants/LoRaHAM_V2/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 36 diff --git a/variants/OE5HWN_MeshCom/board_pinout.h b/variants/OE5HWN_MeshCom/board_pinout.h index d2c5d85..bb2b05e 100644 --- a/variants/OE5HWN_MeshCom/board_pinout.h +++ b/variants/OE5HWN_MeshCom/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1268 #define HAS_1W_LORA diff --git a/variants/QRPLabs_LightGateway_1_0/board_pinout.h b/variants/QRPLabs_LightGateway_1_0/board_pinout.h index 5973641..2f62fc9 100644 --- a/variants/QRPLabs_LightGateway_1_0/board_pinout.h +++ b/variants/QRPLabs_LightGateway_1_0/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1268 #define RADIO_VCC_PIN 21 diff --git a/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h b/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h index 71c8d5b..47de1df 100644 --- a/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h +++ b/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1268 #define HAS_1W_LORA diff --git a/variants/TROY_LoRa_APRS/board_pinout.h b/variants/TROY_LoRa_APRS/board_pinout.h index b1b63ce..92a83be 100644 --- a/variants/TROY_LoRa_APRS/board_pinout.h +++ b/variants/TROY_LoRa_APRS/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 5 diff --git a/variants/WEMOS-D1-R32-RA02/board_pinout.h b/variants/WEMOS-D1-R32-RA02/board_pinout.h index 992d660..2f3929e 100644 --- a/variants/WEMOS-D1-R32-RA02/board_pinout.h +++ b/variants/WEMOS-D1-R32-RA02/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 18 diff --git a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h index 36672b4..e92ac46 100644 --- a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h +++ b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 15 diff --git a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h index 73da5a5..d71db41 100644 --- a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h +++ b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S2 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 36 diff --git a/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h b/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h index 5df47a4..f2a0496 100644 --- a/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h +++ b/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO diff --git a/variants/esp32c3_DIY_1W_LoRa/board_pinout.h b/variants/esp32c3_DIY_1W_LoRa/board_pinout.h index d4f97f5..664c2bf 100644 --- a/variants/esp32c3_DIY_1W_LoRa/board_pinout.h +++ b/variants/esp32c3_DIY_1W_LoRa/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_C3 + // LoRa Radio #define HAS_SX1268 #define HAS_1W_LORA diff --git a/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h b/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h index d381820..04470d1 100644 --- a/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h +++ b/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_C3 + // LoRa Radio #define HAS_SX1262 #define HAS_1W_LORA diff --git a/variants/heltec-lora32-v2/board_pinout.h b/variants/heltec-lora32-v2/board_pinout.h index 923dd41..6b36c79 100644 --- a/variants/heltec-lora32-v2/board_pinout.h +++ b/variants/heltec-lora32-v2/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 5 @@ -49,5 +51,6 @@ #define INTERNAL_LED_PIN 25 #define BATTERY_PIN 37 #define ADC_CTRL 21 - + #define ADC_CTRL_INVERTED 1 + #endif \ No newline at end of file diff --git a/variants/heltec-lora32-v2_915/board_pinout.h b/variants/heltec-lora32-v2_915/board_pinout.h index 667f61d..54d4801 100644 --- a/variants/heltec-lora32-v2_915/board_pinout.h +++ b/variants/heltec-lora32-v2_915/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1276 #define RADIO_SCLK_PIN 5 @@ -49,5 +51,6 @@ #define INTERNAL_LED_PIN 25 #define BATTERY_PIN 37 #define ADC_CTRL 21 - + #define ADC_CTRL_INVERTED 1 + #endif \ No newline at end of file diff --git a/variants/heltec_ht-ct62/board_pinout.h b/variants/heltec_ht-ct62/board_pinout.h index 549d6d8..ab99899 100644 --- a/variants/heltec_ht-ct62/board_pinout.h +++ b/variants/heltec_ht-ct62/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_C3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO diff --git a/variants/heltec_vision_master_e290/board_pinout.h b/variants/heltec_vision_master_e290/board_pinout.h index 50d5d82..7dc3c9c 100644 --- a/variants/heltec_vision_master_e290/board_pinout.h +++ b/variants/heltec_vision_master_e290/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO @@ -51,6 +53,8 @@ #define INTERNAL_LED_PIN 45 #define BATTERY_PIN 7 #define ADC_CTRL 46 + #define ADC_CTRL_INVERTED 0 #define VEXT_CTRL 18 + #define VEXT_CTRL_INVERTED 0 #endif \ No newline at end of file diff --git a/variants/heltec_wifi_lora_32_V3/board_pinout.h b/variants/heltec_wifi_lora_32_V3/board_pinout.h index a810bcb..fcef0e6 100644 --- a/variants/heltec_wifi_lora_32_V3/board_pinout.h +++ b/variants/heltec_wifi_lora_32_V3/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO @@ -54,6 +56,8 @@ #define INTERNAL_LED_PIN 35 #define BATTERY_PIN 1 #define VEXT_CTRL 36 + #define VEXT_CTRL_INVERTED 0 #define ADC_CTRL 37 + #define ADC_CTRL_INVERTED 1 #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 a810bcb..db8c46f 100644 --- a/variants/heltec_wifi_lora_32_V3_2/board_pinout.h +++ b/variants/heltec_wifi_lora_32_V3_2/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO @@ -54,6 +56,8 @@ #define INTERNAL_LED_PIN 35 #define BATTERY_PIN 1 #define VEXT_CTRL 36 + #define VEXT_CTRL_INVERTED 1 #define ADC_CTRL 37 + #define ADC_CTRL_INVERTED 0 #endif \ No newline at end of file diff --git a/variants/heltec_wifi_lora_32_V4/board_pinout.h b/variants/heltec_wifi_lora_32_V4/board_pinout.h index 3f3b317..85e2fc6 100644 --- a/variants/heltec_wifi_lora_32_V4/board_pinout.h +++ b/variants/heltec_wifi_lora_32_V4/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO @@ -54,7 +56,9 @@ #define INTERNAL_LED_PIN 35 #define BATTERY_PIN 1 #define VEXT_CTRL 36 + #define VEXT_CTRL_INVERTED 1 #define ADC_CTRL 37 + #define ADC_CTRL_INVERTED 0 // GPS ?? #define VGNS_CTRL 34 // cambiar nombre para prender GPS ? diff --git a/variants/heltec_wireless_bridge/board_pinout.h b/variants/heltec_wireless_bridge/board_pinout.h index 2de5e91..8b41dbe 100644 --- a/variants/heltec_wireless_bridge/board_pinout.h +++ b/variants/heltec_wireless_bridge/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1276 #define RADIO_SCLK_PIN 5 diff --git a/variants/heltec_wireless_paper_v1/board_pinout.h b/variants/heltec_wireless_paper_v1/board_pinout.h index 5b4a375..504228b 100644 --- a/variants/heltec_wireless_paper_v1/board_pinout.h +++ b/variants/heltec_wireless_paper_v1/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO @@ -51,6 +53,8 @@ #define INTERNAL_LED_PIN 18 #define BATTERY_PIN 20 #define ADC_CTRL 19 + #define ADC_CTRL_INVERTED 1 #define VEXT_CTRL 45 + #define VEXT_CTRL_INVERTED 1 #endif \ No newline at end of file diff --git a/variants/heltec_wireless_paper_v1_2/board_pinout.h b/variants/heltec_wireless_paper_v1_2/board_pinout.h index 5b4a375..504228b 100644 --- a/variants/heltec_wireless_paper_v1_2/board_pinout.h +++ b/variants/heltec_wireless_paper_v1_2/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO @@ -51,6 +53,8 @@ #define INTERNAL_LED_PIN 18 #define BATTERY_PIN 20 #define ADC_CTRL 19 + #define ADC_CTRL_INVERTED 1 #define VEXT_CTRL 45 + #define VEXT_CTRL_INVERTED 1 #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 a3faad9..e723d23 100644 --- a/variants/heltec_wireless_stick/board_pinout.h +++ b/variants/heltec_wireless_stick/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO @@ -50,8 +52,10 @@ // Aditional Config #define INTERNAL_LED_PIN 35 #define BATTERY_PIN 1 - #define VEXT_CTRL 36 #define ADC_CTRL 37 + #define VEXT_CTRL 36 + #define VEXT_CTRL_INVERTED 1 + #define BOARD_I2C_SDA 41 #define BOARD_I2C_SCL 42 diff --git a/variants/heltec_wireless_stick_lite_v3/board_pinout.h b/variants/heltec_wireless_stick_lite_v3/board_pinout.h index 0ba75b3..84d5e78 100644 --- a/variants/heltec_wireless_stick_lite_v3/board_pinout.h +++ b/variants/heltec_wireless_stick_lite_v3/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO @@ -40,7 +42,9 @@ // Aditional Config #define INTERNAL_LED_PIN 35 #define BATTERY_PIN 1 - #define VEXT_CTRL 36 #define ADC_CTRL 37 + #define ADC_CTRL_INVERTED 1 + #define VEXT_CTRL 36 + #define VEXT_CTRL_INVERTED 1 #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 5998c4d..58f29d4 100644 --- a/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h +++ b/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO @@ -44,7 +46,9 @@ // Aditional Config #define INTERNAL_LED_PIN 35 #define BATTERY_PIN 1 - #define VEXT_CTRL 36 #define ADC_CTRL 37 + #define ADC_CTRL_INVERTED 1 + #define VEXT_CTRL 36 + #define VEXT_CTRL_INVERTED 1 #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 99bf030..3b296db 100644 --- a/variants/heltec_wireless_tracker/board_pinout.h +++ b/variants/heltec_wireless_tracker/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO @@ -43,9 +45,11 @@ // Aditional Config #define INTERNAL_LED_PIN 18 - #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 BATTERY_PIN 1 #define VEXT_CTRL 3 // To turn on GPS and TFT + #define VEXT_CTRL_INVERTED 0 + #define ADC_CTRL 2 // HELTEC Wireless Tracker ADC_CTRL = HIGH powers the voltage divider to read BatteryPin. Only on V05 = V1.1 + #define ADC_CTRL_INVERTED 0 // GPS #define HAS_GPS diff --git a/variants/ttgo-lora32-v21/board_pinout.h b/variants/ttgo-lora32-v21/board_pinout.h index 5b3ca15..dd350a7 100644 --- a/variants/ttgo-lora32-v21/board_pinout.h +++ b/variants/ttgo-lora32-v21/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 5 diff --git a/variants/ttgo-lora32-v21_915/board_pinout.h b/variants/ttgo-lora32-v21_915/board_pinout.h index c3d6b6a..ae77ed4 100644 --- a/variants/ttgo-lora32-v21_915/board_pinout.h +++ b/variants/ttgo-lora32-v21_915/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1276 #define RADIO_SCLK_PIN 5 diff --git a/variants/ttgo-t-beam-v1/board_pinout.h b/variants/ttgo-t-beam-v1/board_pinout.h index b7cb81a..b964874 100644 --- a/variants/ttgo-t-beam-v1/board_pinout.h +++ b/variants/ttgo-t-beam-v1/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 5 diff --git a/variants/ttgo-t-beam-v1_2/board_pinout.h b/variants/ttgo-t-beam-v1_2/board_pinout.h index 7bbf1a4..b7e90ed 100644 --- a/variants/ttgo-t-beam-v1_2/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1278 #define RADIO_SCLK_PIN 5 diff --git a/variants/ttgo-t-beam-v1_2_915/board_pinout.h b/variants/ttgo-t-beam-v1_2_915/board_pinout.h index 0869620..3ff4f2b 100644 --- a/variants/ttgo-t-beam-v1_2_915/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2_915/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1276 #define RADIO_SCLK_PIN 5 diff --git a/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h b/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h index c7ff52a..9338abb 100644 --- a/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO diff --git a/variants/ttgo-t-beam-v1_915/board_pinout.h b/variants/ttgo-t-beam-v1_915/board_pinout.h index dfe7826..c6711b6 100644 --- a/variants/ttgo-t-beam-v1_915/board_pinout.h +++ b/variants/ttgo-t-beam-v1_915/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1276 #define RADIO_SCLK_PIN 5 diff --git a/variants/ttgo-t-beam-v1_SX1268/board_pinout.h b/variants/ttgo-t-beam-v1_SX1268/board_pinout.h index 67a4ff9..506f6b1 100644 --- a/variants/ttgo-t-beam-v1_SX1268/board_pinout.h +++ b/variants/ttgo-t-beam-v1_SX1268/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32 + // LoRa Radio #define HAS_SX1268 #define RADIO_SCLK_PIN 5 diff --git a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h index 0d57f56..09c4d43 100644 --- a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h +++ b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO diff --git a/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h b/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h index 8f48a38..7790662 100644 --- a/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h +++ b/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO diff --git a/variants/ttgo_t_deck_GPS/board_pinout.h b/variants/ttgo_t_deck_GPS/board_pinout.h index d3234f0..75e8404 100644 --- a/variants/ttgo_t_deck_GPS/board_pinout.h +++ b/variants/ttgo_t_deck_GPS/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO diff --git a/variants/ttgo_t_deck_plus/board_pinout.h b/variants/ttgo_t_deck_plus/board_pinout.h index 67e7725..b101ca2 100644 --- a/variants/ttgo_t_deck_plus/board_pinout.h +++ b/variants/ttgo_t_deck_plus/board_pinout.h @@ -19,6 +19,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + #define ESP32_S3 + // LoRa Radio #define HAS_SX1262 #define HAS_TCXO