From 970d743b809c891285818342fe18c01ecd6d327b Mon Sep 17 00:00:00 2001 From: richonguzman Date: Tue, 5 Nov 2024 23:21:05 -0300 Subject: [PATCH] refactor inis --- common_settings.ini | 44 +++++++++++++++++ platformio.ini | 48 +------------------ src/LoRa_APRS_iGate.cpp | 2 +- .../ESP32_C3_OctopusLab_LoRa/board_pinout.h | 23 +++++---- variants/ESP32_DIY_1W_LoRa/board_pinout.h | 25 +++++----- variants/ESP32_DIY_1W_LoRa_915/board_pinout.h | 25 +++++----- .../ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h | 22 +++++---- .../board_pinout.h | 23 +++++---- variants/ESP32_DIY_LoRa/board_pinout.h | 17 ++++--- variants/ESP32_DIY_LoRa_915/board_pinout.h | 17 ++++--- variants/ESP32_DIY_LoRa_A7670/board_pinout.h | 21 ++++---- .../ESP32_DIY_LoRa_A7670_915/board_pinout.h | 19 ++++---- variants/OE5HWN_MeshCom/board_pinout.h | 22 +++++---- .../QRPLabs_LightGateway_1_0/board_pinout.h | 31 ++++++------ variants/WEMOS-D1-R32-RA02/board_pinout.h | 18 +++---- .../WEMOS-LOLIN32-OLED-DIY/board_pinout.h | 16 ++++--- .../WEMOS_S2_MINI_DIY_LoRa/board_pinout.h | 7 +-- variants/esp32c3_DIY_1W_LoRa/board_pinout.h | 10 +--- .../esp32c3_DIY_1W_LoRa_915/board_pinout.h | 10 +--- variants/heltec-lora32-v2/board_pinout.h | 20 ++++---- variants/heltec_ht-ct62/board_pinout.h | 15 ++---- .../heltec_wifi_lora_32_V3/board_pinout.h | 22 +++++---- variants/heltec_wireless_paper/board_pinout.h | 31 +++++------- variants/heltec_wireless_stick/board_pinout.h | 22 +++++---- .../board_pinout.h | 18 ++----- .../board_pinout.h | 25 ++++------ .../heltec_wireless_tracker/board_pinout.h | 33 ++++++------- variants/ttgo-lora32-v21/board_pinout.h | 21 ++++---- variants/ttgo-lora32-v21_915/board_pinout.h | 19 ++++---- variants/ttgo-t-beam-v1/board_pinout.h | 21 ++++---- variants/ttgo-t-beam-v1_2/board_pinout.h | 21 ++++---- variants/ttgo-t-beam-v1_2_915/board_pinout.h | 21 ++++---- .../ttgo-t-beam-v1_2_SX1262/board_pinout.h | 28 ++++++----- variants/ttgo-t-beam-v1_915/board_pinout.h | 22 +++++---- variants/ttgo-t-beam-v1_SX1268/board_pinout.h | 27 ++++++----- variants/ttgo_lora32_t3s3_v1_2/board_pinout.h | 19 ++++---- 36 files changed, 406 insertions(+), 379 deletions(-) create mode 100644 common_settings.ini diff --git a/common_settings.ini b/common_settings.ini new file mode 100644 index 0000000..2d15365 --- /dev/null +++ b/common_settings.ini @@ -0,0 +1,44 @@ +[common] +build_flags = + -Werror -Wall + -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 + -DRADIOLIB_EXCLUDE_CC1101=1 + -DRADIOLIB_EXCLUDE_NRF24=1 + -DRADIOLIB_EXCLUDE_RF69=1 + -DRADIOLIB_EXCLUDE_SX1231=1 + -DRADIOLIB_EXCLUDE_SX1233=1 + -DRADIOLIB_EXCLUDE_SI443X=1 + -DRADIOLIB_EXCLUDE_RFM2X=1 + -DRADIOLIB_EXCLUDE_AFSK=1 + -DRADIOLIB_EXCLUDE_BELL=1 + -DRADIOLIB_EXCLUDE_HELLSCHREIBER=1 + -DRADIOLIB_EXCLUDE_MORSE=1 + -DRADIOLIB_EXCLUDE_RTTY=1 + -DRADIOLIB_EXCLUDE_SSTV=1 + -DRADIOLIB_EXCLUDE_AX25=1 + -DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1 + -DRADIOLIB_EXCLUDE_BELL=1 + -DRADIOLIB_EXCLUDE_PAGER=1 + -DRADIOLIB_EXCLUDE_FSK4=1 + -DRADIOLIB_EXCLUDE_APRS=1 + -DRADIOLIB_EXCLUDE_LORAWAN=1 + -I variants/${PIOENV} +lib_deps = + adafruit/Adafruit Unified Sensor @ 1.1.14 + adafruit/Adafruit BME280 Library @ 2.2.4 + adafruit/Adafruit BMP280 Library @ 2.6.8 + adafruit/Adafruit BME680 Library @ 2.0.4 + adafruit/Adafruit Si7021 Library @ 1.5.3 + arduino-libraries/NTPClient @ 3.2.1 + ayushsharma82/ElegantOTA @ 3.1.5 + bblanchon/ArduinoJson @ 6.21.3 + jgromes/RadioLib @ 6.6.0 + mathieucarbou/AsyncTCP @ 3.2.5 + mathieucarbou/ESPAsyncWebServer @ 3.2.3 + mikalhart/TinyGPSPlus @ 1.0.3 +display_libs = + adafruit/Adafruit GFX Library @ 1.11.9 + adafruit/Adafruit SSD1306 @ 2.5.10 +usb_flags= + -DARDUINO_USB_MODE=1 + -DARDUINO_USB_CDC_ON_BOOT=1 \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index e461a91..e483260 100644 --- a/platformio.ini +++ b/platformio.ini @@ -12,6 +12,7 @@ default_envs = ttgo-lora32-v21 extra_configs = + common_settings.ini variants/*/platformio.ini [env] @@ -28,49 +29,4 @@ board_build.embed_files = data_embed/favicon.png.gz extra_scripts = pre:tools/compress.py -debug_tool = esp-prog - -[common] -build_flags = - -Werror -Wall - -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 - -DRADIOLIB_EXCLUDE_CC1101=1 - -DRADIOLIB_EXCLUDE_NRF24=1 - -DRADIOLIB_EXCLUDE_RF69=1 - -DRADIOLIB_EXCLUDE_SX1231=1 - -DRADIOLIB_EXCLUDE_SX1233=1 - -DRADIOLIB_EXCLUDE_SI443X=1 - -DRADIOLIB_EXCLUDE_RFM2X=1 - -DRADIOLIB_EXCLUDE_AFSK=1 - -DRADIOLIB_EXCLUDE_BELL=1 - -DRADIOLIB_EXCLUDE_HELLSCHREIBER=1 - -DRADIOLIB_EXCLUDE_MORSE=1 - -DRADIOLIB_EXCLUDE_RTTY=1 - -DRADIOLIB_EXCLUDE_SSTV=1 - -DRADIOLIB_EXCLUDE_AX25=1 - -DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1 - -DRADIOLIB_EXCLUDE_BELL=1 - -DRADIOLIB_EXCLUDE_PAGER=1 - -DRADIOLIB_EXCLUDE_FSK4=1 - -DRADIOLIB_EXCLUDE_APRS=1 - -DRADIOLIB_EXCLUDE_LORAWAN=1 - -I variants/${PIOENV} -lib_deps = - adafruit/Adafruit Unified Sensor @ 1.1.14 - adafruit/Adafruit BME280 Library @ 2.2.4 - adafruit/Adafruit BMP280 Library @ 2.6.8 - adafruit/Adafruit BME680 Library @ 2.0.4 - adafruit/Adafruit Si7021 Library @ 1.5.3 - arduino-libraries/NTPClient @ 3.2.1 - ayushsharma82/ElegantOTA @ 3.1.5 - bblanchon/ArduinoJson @ 6.21.3 - jgromes/RadioLib @ 6.6.0 - mathieucarbou/AsyncTCP @ 3.2.5 - mathieucarbou/ESPAsyncWebServer @ 3.2.3 - mikalhart/TinyGPSPlus @ 1.0.3 -display_libs = - adafruit/Adafruit GFX Library @ 1.11.9 - adafruit/Adafruit SSD1306 @ 2.5.10 -usb_flags= - -DARDUINO_USB_MODE=1 - -DARDUINO_USB_CDC_ON_BOOT=1 \ No newline at end of file +debug_tool = esp-prog \ No newline at end of file diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 4eb2663..57224ed 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -40,7 +40,7 @@ ________________________________________________________________________________ #include "A7670_utils.h" #endif -String versionDate = "2024.11.05"; +String versionDate = "2024.11.06"; Configuration Config; WiFiClient espClient; #ifdef HAS_GPS diff --git a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h index e3a9bd1..e6f8691 100644 --- a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h +++ b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h @@ -1,9 +1,19 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1268 - #define HAS_DISPLAY #define RADIO_HAS_XTAL + #define RADIO_SCLK_PIN 6 + #define RADIO_MISO_PIN 4 + #define RADIO_MOSI_PIN 7 + #define RADIO_CS_PIN 5 + #define RADIO_DIO1_PIN 3 + #define RADIO_RST_PIN -1 + #define RADIO_BUSY_PIN 8 + + // Display + #define HAS_DISPLAY #undef OLED_SDA #undef OLED_SCL @@ -13,15 +23,8 @@ #define OLED_SCL 1 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 25 // Green Led - #define BATTERY_PIN 35 - - #define RADIO_SCLK_PIN 6 - #define RADIO_MISO_PIN 4 - #define RADIO_MOSI_PIN 7 - #define RADIO_CS_PIN 5 - #define RADIO_DIO1_PIN 3 - #define RADIO_RST_PIN -1 - #define RADIO_BUSY_PIN 8 + #define BATTERY_PIN 35 #endif \ No newline at end of file diff --git a/variants/ESP32_DIY_1W_LoRa/board_pinout.h b/variants/ESP32_DIY_1W_LoRa/board_pinout.h index 076e6e3..9549198 100644 --- a/variants/ESP32_DIY_1W_LoRa/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa/board_pinout.h @@ -1,9 +1,21 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1268 - #define HAS_DISPLAY #define HAS_1W_LORA + #define RADIO_SCLK_PIN 18 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 23 + #define RADIO_CS_PIN 5 + #define RADIO_RST_PIN 27 + #define RADIO_DIO1_PIN 12 + #define RADIO_BUSY_PIN 14 + #define RADIO_RXEN 32 + #define RADIO_TXEN 25 + + // Display + #define HAS_DISPLAY #undef OLED_SDA #undef OLED_SCL @@ -13,16 +25,7 @@ #define OLED_SCL 21 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 2 - #define RADIO_SCLK_PIN 18 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 23 - #define RADIO_CS_PIN 5 - #define RADIO_RST_PIN 27 - #define RADIO_DIO1_PIN 12 - #define RADIO_BUSY_PIN 14 - #define RADIO_RXEN 32 - #define RADIO_TXEN 25 - #endif \ No newline at end of file diff --git a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h index d7aa4a8..cfaa7cf 100644 --- a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h @@ -1,9 +1,21 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 - #define HAS_DISPLAY #define HAS_1W_LORA + #define RADIO_SCLK_PIN 18 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 23 + #define RADIO_CS_PIN 5 + #define RADIO_RST_PIN 27 + #define RADIO_DIO1_PIN 12 + #define RADIO_BUSY_PIN 14 + #define RADIO_RXEN 32 + #define RADIO_TXEN 25 + + // Display + #define HAS_DISPLAY #undef OLED_SDA #undef OLED_SCL @@ -13,16 +25,7 @@ #define OLED_SCL 21 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 2 - #define RADIO_SCLK_PIN 18 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 23 - #define RADIO_CS_PIN 5 - #define RADIO_RST_PIN 27 - #define RADIO_DIO1_PIN 12 - #define RADIO_BUSY_PIN 14 - #define RADIO_RXEN 32 - #define RADIO_TXEN 25 - #endif \ No newline at end of file diff --git a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h index 3eeecbc..8ead59d 100644 --- a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h @@ -1,18 +1,9 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_LLCC68 - #define HAS_DISPLAY #define HAS_1W_LORA - - #undef OLED_SDA - #undef OLED_SCL - #undef OLED_RST - - #define OLED_SDA 21 - #define OLED_SCL 22 - #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) - #define RADIO_SCLK_PIN 18 #define RADIO_MISO_PIN 19 #define RADIO_MOSI_PIN 23 @@ -23,4 +14,15 @@ #define RADIO_RXEN 32 #define RADIO_TXEN 25 + // Display + #define HAS_DISPLAY + + #undef OLED_SDA + #undef OLED_SCL + #undef OLED_RST + + #define OLED_SDA 21 + #define OLED_SCL 22 + #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + #endif \ No newline at end of file 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 47ba7e1..99536ff 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 @@ -1,18 +1,9 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1268 - #define HAS_DISPLAY #define HAS_1W_LORA - - #undef OLED_SDA - #undef OLED_SCL - #undef OLED_RST - - #define OLED_SDA 22 - #define OLED_SCL 21 - #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) - #define RADIO_SCLK_PIN 5 // https://github.com/NanoVHF/Meshtastic-DIY/tree/main/PCB/ESP-32-devkit_EBYTE-E22/Mesh-v1.02-2LCD-FreePins #define RADIO_MISO_PIN 19 #define RADIO_MOSI_PIN 27 @@ -22,4 +13,16 @@ #define RADIO_BUSY_PIN 32 #define RADIO_RXEN 14 #define RADIO_TXEN 13 + + // Display + #define HAS_DISPLAY + + #undef OLED_SDA + #undef OLED_SCL + #undef OLED_RST + + #define OLED_SDA 22 + #define OLED_SCL 21 + #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + #endif \ No newline at end of file diff --git a/variants/ESP32_DIY_LoRa/board_pinout.h b/variants/ESP32_DIY_LoRa/board_pinout.h index 7bc581e..2a7feaf 100644 --- a/variants/ESP32_DIY_LoRa/board_pinout.h +++ b/variants/ESP32_DIY_LoRa/board_pinout.h @@ -1,7 +1,16 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1278 + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_RST_PIN 14 + #define RADIO_BUSY_PIN 26 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -12,13 +21,7 @@ #define OLED_SCL 21 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 2 - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_RST_PIN 14 - #define RADIO_BUSY_PIN 26 - #endif \ No newline at end of file diff --git a/variants/ESP32_DIY_LoRa_915/board_pinout.h b/variants/ESP32_DIY_LoRa_915/board_pinout.h index ab0509a..b981a7c 100644 --- a/variants/ESP32_DIY_LoRa_915/board_pinout.h +++ b/variants/ESP32_DIY_LoRa_915/board_pinout.h @@ -1,7 +1,16 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1276 + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_RST_PIN 14 + #define RADIO_BUSY_PIN 26 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -12,13 +21,7 @@ #define OLED_SCL 21 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 2 - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_RST_PIN 14 - #define RADIO_BUSY_PIN 26 - #endif \ No newline at end of file diff --git a/variants/ESP32_DIY_LoRa_A7670/board_pinout.h b/variants/ESP32_DIY_LoRa_A7670/board_pinout.h index 3aba4f9..f7e3cf4 100644 --- a/variants/ESP32_DIY_LoRa_A7670/board_pinout.h +++ b/variants/ESP32_DIY_LoRa_A7670/board_pinout.h @@ -1,8 +1,16 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1278 - #define HAS_A7670 + #define RADIO_SCLK_PIN 18 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 23 + #define RADIO_CS_PIN 2 + #define RADIO_RST_PIN 0 + #define RADIO_BUSY_PIN 32 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -13,16 +21,11 @@ #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 13 // 13 for V1.1 and 12 for V1.0 - #define BATTERY_PIN 35 - - #define RADIO_SCLK_PIN 18 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 23 - #define RADIO_CS_PIN 2 - #define RADIO_RST_PIN 0 - #define RADIO_BUSY_PIN 32 + #define BATTERY_PIN 35 + #define HAS_A7670 #define A7670_PWR_PIN 4 #define A7670_ResetPin 5 #define A7670_TX_PIN 26 diff --git a/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h b/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h index 9b60f59..9a1731a 100644 --- a/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h +++ b/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h @@ -1,8 +1,16 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1276 - #define HAS_A7670 + #define RADIO_SCLK_PIN 18 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 23 + #define RADIO_CS_PIN 2 + #define RADIO_RST_PIN 0 + #define RADIO_BUSY_PIN 32 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -13,16 +21,11 @@ #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 13 // 13 for V1.1 and 12 for V1.0 #define BATTERY_PIN 35 - #define RADIO_SCLK_PIN 18 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 23 - #define RADIO_CS_PIN 2 - #define RADIO_RST_PIN 0 - #define RADIO_BUSY_PIN 32 - + #define HAS_A7670 #define A7670_PWR_PIN 4 #define A7670_ResetPin 5 #define A7670_TX_PIN 26 diff --git a/variants/OE5HWN_MeshCom/board_pinout.h b/variants/OE5HWN_MeshCom/board_pinout.h index 0f7477b..bff8b74 100644 --- a/variants/OE5HWN_MeshCom/board_pinout.h +++ b/variants/OE5HWN_MeshCom/board_pinout.h @@ -1,18 +1,9 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1268 - #define HAS_DISPLAY #define HAS_1W_LORA - - #undef OLED_SDA - #undef OLED_SCL - #undef OLED_RST - - #define OLED_SDA 21 - #define OLED_SCL 22 - #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) - #define RADIO_SCLK_PIN 18 #define RADIO_MISO_PIN 19 #define RADIO_MOSI_PIN 23 @@ -23,4 +14,15 @@ #define RADIO_RXEN 14 #define RADIO_TXEN 13 + // Display + #define HAS_DISPLAY + + #undef OLED_SDA + #undef OLED_SCL + #undef OLED_RST + + #define OLED_SDA 21 + #define OLED_SCL 22 + #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + #endif \ No newline at end of file diff --git a/variants/QRPLabs_LightGateway_1_0/board_pinout.h b/variants/QRPLabs_LightGateway_1_0/board_pinout.h index 479e8a4..73a2bd3 100644 --- a/variants/QRPLabs_LightGateway_1_0/board_pinout.h +++ b/variants/QRPLabs_LightGateway_1_0/board_pinout.h @@ -1,7 +1,20 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1268 + #define RADIO_VCC_PIN 21 + #define RADIO_SCLK_PIN 12 + #define RADIO_MISO_PIN 13 + #define RADIO_MOSI_PIN 11 + #define RADIO_CS_PIN 10 + #define RADIO_RST_PIN 9 + #define RADIO_DIO1_PIN 5 + #define RADIO_BUSY_PIN 6 + #define RADIO_RXEN 42 + #define RADIO_TXEN 14 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -12,23 +25,9 @@ #define OLED_SCL 4 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 16 #define BATTERY_PIN 1 #define BUTTON_PIN 0 - #define RADIO_VCC_PIN 21 - - #define RADIO_SCLK_PIN 12 - #define RADIO_MISO_PIN 13 - #define RADIO_MOSI_PIN 11 - #define RADIO_CS_PIN 10 - #define RADIO_RST_PIN 9 - #define RADIO_DIO1_PIN 5 - #define RADIO_BUSY_PIN 6 - #define RADIO_RXEN 42 - #define RADIO_TXEN 14 - - -#endif - - \ No newline at end of file +#endif \ No newline at end of file diff --git a/variants/WEMOS-D1-R32-RA02/board_pinout.h b/variants/WEMOS-D1-R32-RA02/board_pinout.h index feb23be..22c3704 100644 --- a/variants/WEMOS-D1-R32-RA02/board_pinout.h +++ b/variants/WEMOS-D1-R32-RA02/board_pinout.h @@ -1,7 +1,17 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1278 + #define RADIO_SCLK_PIN 18 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 23 + #define RADIO_CS_PIN 5 + #define RADIO_RST_PIN 13 + #define RADIO_DIO1_PIN 14 + #define RADIO_BUSY_PIN 12 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -12,12 +22,4 @@ #define OLED_SCL 22 #define OLED_RST 36 - #define RADIO_SCLK_PIN 18 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 23 - #define RADIO_CS_PIN 5 - #define RADIO_RST_PIN 13 - #define RADIO_DIO1_PIN 14 - #define RADIO_BUSY_PIN 12 - #endif \ No newline at end of file diff --git a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h index c2a5510..c27523f 100644 --- a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h +++ b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h @@ -1,7 +1,16 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1278 + #define RADIO_SCLK_PIN 15 + #define RADIO_MISO_PIN 13 + #define RADIO_MOSI_PIN 12 + #define RADIO_CS_PIN 14 + #define RADIO_RST_PIN 2 + #define RADIO_BUSY_PIN 25 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -12,11 +21,4 @@ #define OLED_SCL 4 #define OLED_RST -1 - #define RADIO_SCLK_PIN 15 - #define RADIO_MISO_PIN 13 - #define RADIO_MOSI_PIN 12 - #define RADIO_CS_PIN 14 - #define RADIO_RST_PIN 2 - #define RADIO_BUSY_PIN 25 - #endif \ No newline at end of file diff --git a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h index 5f5eefc..d372f45 100644 --- a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h +++ b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h @@ -1,10 +1,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1278 - - #define INTERNAL_LED_PIN 15 - #define RADIO_SCLK_PIN 36 #define RADIO_MISO_PIN 37 #define RADIO_MOSI_PIN 35 @@ -12,4 +10,7 @@ #define RADIO_RST_PIN 33 #define RADIO_BUSY_PIN 38 + // Aditional Config + #define INTERNAL_LED_PIN 15 + #endif \ No newline at end of file diff --git a/variants/esp32c3_DIY_1W_LoRa/board_pinout.h b/variants/esp32c3_DIY_1W_LoRa/board_pinout.h index c21fade..de8a339 100644 --- a/variants/esp32c3_DIY_1W_LoRa/board_pinout.h +++ b/variants/esp32c3_DIY_1W_LoRa/board_pinout.h @@ -1,17 +1,9 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1268 #define HAS_1W_LORA - - /*#undef OLED_SDA - #undef OLED_SCL - #undef OLED_RST - - #define OLED_SDA 18 - #define OLED_SCL 17 - #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin)*/ - #define RADIO_SCLK_PIN 8 #define RADIO_MISO_PIN 9 #define RADIO_MOSI_PIN 10 diff --git a/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h b/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h index 2ca34d2..7ed7d6d 100644 --- a/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h +++ b/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h @@ -1,17 +1,9 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 #define HAS_1W_LORA - - /*#undef OLED_SDA - #undef OLED_SCL - #undef OLED_RST - - #define OLED_SDA 18 - #define OLED_SCL 17 - #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin)*/ - #define RADIO_SCLK_PIN 8 #define RADIO_MISO_PIN 9 #define RADIO_MOSI_PIN 10 diff --git a/variants/heltec-lora32-v2/board_pinout.h b/variants/heltec-lora32-v2/board_pinout.h index aaa65cd..203c4b3 100644 --- a/variants/heltec-lora32-v2/board_pinout.h +++ b/variants/heltec-lora32-v2/board_pinout.h @@ -1,7 +1,16 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1278 + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_RST_PIN 14 + #define RADIO_BUSY_PIN 26 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -12,16 +21,9 @@ #define OLED_SCL 15 #define OLED_RST 16 + // Aditional Config #define INTERNAL_LED_PIN 25 #define BATTERY_PIN 37 - - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_RST_PIN 14 - #define RADIO_BUSY_PIN 26 - #define ADC_CTRL 21 -#endif +#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 e0ca312..aad1963 100644 --- a/variants/heltec_ht-ct62/board_pinout.h +++ b/variants/heltec_ht-ct62/board_pinout.h @@ -1,18 +1,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 - - /*#undef OLED_SDA - #undef OLED_SCL - #undef OLED_RST - - #define OLED_SDA 18 - #define OLED_SCL 17 - #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin)*/ - - #define BATTERY_PIN 1 - #define RADIO_SCLK_PIN 10 #define RADIO_MISO_PIN 6 #define RADIO_MOSI_PIN 7 @@ -21,4 +11,7 @@ #define RADIO_DIO1_PIN 3 #define RADIO_BUSY_PIN 4 + // Aditional Config + #define BATTERY_PIN 1 + #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 3ab453e..cd06dd7 100644 --- a/variants/heltec_wifi_lora_32_V3/board_pinout.h +++ b/variants/heltec_wifi_lora_32_V3/board_pinout.h @@ -1,7 +1,17 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 + #define RADIO_SCLK_PIN 9 + #define RADIO_MISO_PIN 11 + #define RADIO_MOSI_PIN 10 + #define RADIO_CS_PIN 8 + #define RADIO_RST_PIN 12 + #define RADIO_DIO1_PIN 14 + #define RADIO_BUSY_PIN 13 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -12,19 +22,11 @@ #define OLED_SCL 18 #define OLED_RST 21 + // Aditional Config #define INTERNAL_LED_PIN 35 #define BATTERY_PIN 1 - - #define RADIO_SCLK_PIN 9 - #define RADIO_MISO_PIN 11 - #define RADIO_MOSI_PIN 10 - #define RADIO_CS_PIN 8 - #define RADIO_RST_PIN 12 - #define RADIO_DIO1_PIN 14 - #define RADIO_BUSY_PIN 13 - #define VEXT_CTRL 36 - #define ADC_CTRL 37 + #define ADC_CTRL 37 #define BOARD_I2C_SDA 41 #define BOARD_I2C_SCL 42 diff --git a/variants/heltec_wireless_paper/board_pinout.h b/variants/heltec_wireless_paper/board_pinout.h index db1af0b..30bc620 100644 --- a/variants/heltec_wireless_paper/board_pinout.h +++ b/variants/heltec_wireless_paper/board_pinout.h @@ -1,21 +1,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 - #define HAS_DISPLAY - #define HAS_EPAPER - - /*#undef OLED_SDA - #undef OLED_SCL - #undef OLED_RST - - #define OLED_SDA 18 - #define OLED_SCL 17 - #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin)*/ - - #define INTERNAL_LED_PIN 18 - #define BATTERY_PIN 20 - #define RADIO_SCLK_PIN 9 #define RADIO_MISO_PIN 11 #define RADIO_MOSI_PIN 10 @@ -24,11 +11,9 @@ #define RADIO_DIO1_PIN 14 #define RADIO_BUSY_PIN 13 - #define ADC_CTRL 19 - #define VEXT_CTRL 45 - #define BOARD_I2C_SDA 37 - #define BOARD_I2C_SCL 36 - + // Display + #define HAS_DISPLAY + #define HAS_EPAPER #define EPAPER_BUSY 7 #define EPAPER_RST 6 #define EPAPER_DC 5 @@ -36,4 +21,12 @@ #define EPAPER_SCL 3 #define EPAPER_SDA 2 + // Aditional Config + #define INTERNAL_LED_PIN 18 + #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 32e83c3..c560037 100644 --- a/variants/heltec_wireless_stick/board_pinout.h +++ b/variants/heltec_wireless_stick/board_pinout.h @@ -1,7 +1,17 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 + #define RADIO_SCLK_PIN 9 + #define RADIO_MISO_PIN 11 + #define RADIO_MOSI_PIN 10 + #define RADIO_CS_PIN 8 + #define RADIO_RST_PIN 12 + #define RADIO_DIO1_PIN 14 + #define RADIO_BUSY_PIN 13 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -12,19 +22,11 @@ #define OLED_SCL 15 #define OLED_RST 16 + // Aditional Config #define INTERNAL_LED_PIN 35 #define BATTERY_PIN 1 - - #define RADIO_SCLK_PIN 9 - #define RADIO_MISO_PIN 11 - #define RADIO_MOSI_PIN 10 - #define RADIO_CS_PIN 8 - #define RADIO_RST_PIN 12 - #define RADIO_DIO1_PIN 14 - #define RADIO_BUSY_PIN 13 - #define VEXT_CTRL 36 - #define ADC_CTRL 37 + #define ADC_CTRL 37 #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 7e7ee52..649e754 100644 --- a/variants/heltec_wireless_stick_lite_v3/board_pinout.h +++ b/variants/heltec_wireless_stick_lite_v3/board_pinout.h @@ -1,19 +1,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 - - /*#undef OLED_SDA - #undef OLED_SCL - #undef OLED_RST - - #define OLED_SDA 18 - #define OLED_SCL 17 - #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin)*/ - - #define INTERNAL_LED_PIN 35 - #define BATTERY_PIN 1 - #define RADIO_SCLK_PIN 9 #define RADIO_MISO_PIN 11 #define RADIO_MOSI_PIN 10 @@ -22,8 +11,11 @@ #define RADIO_DIO1_PIN 14 #define RADIO_BUSY_PIN 13 + // Aditional Config + #define INTERNAL_LED_PIN 35 + #define BATTERY_PIN 1 #define VEXT_CTRL 36 - #define ADC_CTRL 37 + #define ADC_CTRL 37 #define BOARD_I2C_SDA 41 #define BOARD_I2C_SCL 42 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 5ccd2fd..b4c395b 100644 --- a/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h +++ b/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h @@ -1,20 +1,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 - #define HAS_DISPLAY - - /*#undef OLED_SDA - #undef OLED_SCL - #undef OLED_RST - - #define OLED_SDA 18 - #define OLED_SCL 17*/ - #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) - - #define INTERNAL_LED_PIN 35 - #define BATTERY_PIN 1 - #define RADIO_SCLK_PIN 9 #define RADIO_MISO_PIN 11 #define RADIO_MOSI_PIN 10 @@ -22,9 +10,16 @@ #define RADIO_RST_PIN 12 #define RADIO_DIO1_PIN 14 #define RADIO_BUSY_PIN 13 - + + // Display + #define HAS_DISPLAY + #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + + // Aditional Config + #define INTERNAL_LED_PIN 35 + #define BATTERY_PIN 1 #define VEXT_CTRL 36 - #define ADC_CTRL 37 + #define ADC_CTRL 37 #define BOARD_I2C_SDA 41 #define BOARD_I2C_SCL 42 diff --git a/variants/heltec_wireless_tracker/board_pinout.h b/variants/heltec_wireless_tracker/board_pinout.h index d558b40..b30fd1c 100644 --- a/variants/heltec_wireless_tracker/board_pinout.h +++ b/variants/heltec_wireless_tracker/board_pinout.h @@ -1,23 +1,8 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 - #define HAS_DISPLAY - #define HAS_TFT - #define HAS_GPS - #define GPS_BAUDRATE 115200 - - /*#undef OLED_SDA - #undef OLED_SCL - #undef OLED_RST - - #define OLED_SDA 18 - #define OLED_SCL 17 - #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin)*/ - - #define INTERNAL_LED_PIN 18 - #define BATTERY_PIN 1 - #define RADIO_SCLK_PIN 9 // SX1262 SCK #define RADIO_MISO_PIN 11 // SX1262 MISO #define RADIO_MOSI_PIN 10 // SX1262 MOSI @@ -26,12 +11,22 @@ #define RADIO_DIO1_PIN 14 // SX1262 DIO1 #define RADIO_BUSY_PIN 13 // SX1262 BUSY + // Display + #define HAS_DISPLAY + #define HAS_TFT + + // 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 VEXT_CTRL 3 // To turn on GPS and TFT #define BOARD_I2C_SDA 7 #define BOARD_I2C_SCL 6 - + + // GPS + #define HAS_GPS + #define GPS_BAUDRATE 115200 #define GPS_RX 34 #define GPS_TX 33 - -#endif + +#endif \ No newline at end of file diff --git a/variants/ttgo-lora32-v21/board_pinout.h b/variants/ttgo-lora32-v21/board_pinout.h index 78481af..5450287 100644 --- a/variants/ttgo-lora32-v21/board_pinout.h +++ b/variants/ttgo-lora32-v21/board_pinout.h @@ -1,9 +1,17 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1278 + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_RST_PIN 14 + #define RADIO_BUSY_PIN 26 + + // Display #define HAS_DISPLAY - #define HAS_ADC_CALIBRATION #undef OLED_SDA #undef OLED_SCL @@ -13,14 +21,9 @@ #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 25 // Green Led - #define BATTERY_PIN 35 - - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_RST_PIN 14 - #define RADIO_BUSY_PIN 26 + #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 9cb5bf8..1231e9b 100644 --- a/variants/ttgo-lora32-v21_915/board_pinout.h +++ b/variants/ttgo-lora32-v21_915/board_pinout.h @@ -1,9 +1,17 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1276 + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_RST_PIN 14 + #define RADIO_BUSY_PIN 26 + + // Display #define HAS_DISPLAY - #define HAS_ADC_CALIBRATION #undef OLED_SDA #undef OLED_SCL @@ -13,14 +21,9 @@ #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 25 // Green Led #define BATTERY_PIN 35 - - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_RST_PIN 14 - #define RADIO_BUSY_PIN 26 + #define HAS_ADC_CALIBRATION #endif \ No newline at end of file diff --git a/variants/ttgo-t-beam-v1/board_pinout.h b/variants/ttgo-t-beam-v1/board_pinout.h index cc8a193..089d433 100644 --- a/variants/ttgo-t-beam-v1/board_pinout.h +++ b/variants/ttgo-t-beam-v1/board_pinout.h @@ -1,10 +1,17 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1278 + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_RST_PIN 14 + #define RADIO_BUSY_PIN 26 + + // Display #define HAS_DISPLAY - #define HAS_AXP192 - #define HAS_GPS #undef OLED_SDA #undef OLED_SCL @@ -14,13 +21,11 @@ #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_RST_PIN 14 - #define RADIO_BUSY_PIN 26 + // Aditional Config + #define HAS_AXP192 + // GPS + #define HAS_GPS #define GPS_RX 12 #define GPS_TX 34 diff --git a/variants/ttgo-t-beam-v1_2/board_pinout.h b/variants/ttgo-t-beam-v1_2/board_pinout.h index 038cda0..25d7763 100644 --- a/variants/ttgo-t-beam-v1_2/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2/board_pinout.h @@ -1,10 +1,17 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1278 + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_RST_PIN 14 + #define RADIO_BUSY_PIN 26 + + // Display #define HAS_DISPLAY - #define HAS_AXP2101 - #define HAS_GPS #undef OLED_SDA #undef OLED_SCL @@ -14,13 +21,11 @@ #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_RST_PIN 14 - #define RADIO_BUSY_PIN 26 + // Aditional Config + #define HAS_AXP2101 + // GPS + #define HAS_GPS #define GPS_RX 12 #define GPS_TX 34 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 a28110c..f8564fc 100644 --- a/variants/ttgo-t-beam-v1_2_915/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2_915/board_pinout.h @@ -1,10 +1,17 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1276 + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_RST_PIN 14 + #define RADIO_BUSY_PIN 26 + + // Display #define HAS_DISPLAY - #define HAS_AXP2101 - #define HAS_GPS #undef OLED_SDA #undef OLED_SCL @@ -14,13 +21,11 @@ #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_RST_PIN 14 - #define RADIO_BUSY_PIN 26 + // Aditional Config + #define HAS_AXP2101 + // GPS + #define HAS_GPS #define GPS_RX 12 #define GPS_TX 34 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 1e50473..17f3c8a 100644 --- a/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h @@ -1,10 +1,19 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_DIO0_PIN 26 + #define RADIO_RST_PIN 23 + #define RADIO_DIO1_PIN 33 + #define RADIO_BUSY_PIN 32 + + // Display #define HAS_DISPLAY - #define HAS_AXP2101 - #define HAS_GPS #undef OLED_SDA #undef OLED_SCL @@ -14,17 +23,12 @@ #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_DIO0_PIN 26 - #define RADIO_RST_PIN 23 - #define RADIO_DIO1_PIN 33 - #define RADIO_BUSY_PIN 32 + // Aditional Config + #define HAS_AXP2101 + // GPS + #define HAS_GPS #define GPS_RX 12 #define GPS_TX 34 -#endif - +#endif \ No newline at end of file diff --git a/variants/ttgo-t-beam-v1_915/board_pinout.h b/variants/ttgo-t-beam-v1_915/board_pinout.h index 5189394..3bd2838 100644 --- a/variants/ttgo-t-beam-v1_915/board_pinout.h +++ b/variants/ttgo-t-beam-v1_915/board_pinout.h @@ -1,11 +1,17 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1276 - #define HAS_DISPLAY - #define HAS_AXP192 - #define HAS_GPS + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_RST_PIN 14 + #define RADIO_BUSY_PIN 26 + // Display + #define HAS_DISPLAY #undef OLED_SDA #undef OLED_SCL #undef OLED_RST @@ -14,13 +20,11 @@ #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_RST_PIN 14 - #define RADIO_BUSY_PIN 26 + // Aditional Config + #define HAS_AXP192 + // GPS + #define HAS_GPS #define GPS_RX 12 #define GPS_TX 34 diff --git a/variants/ttgo-t-beam-v1_SX1268/board_pinout.h b/variants/ttgo-t-beam-v1_SX1268/board_pinout.h index 8490a1a..b801c3a 100644 --- a/variants/ttgo-t-beam-v1_SX1268/board_pinout.h +++ b/variants/ttgo-t-beam-v1_SX1268/board_pinout.h @@ -1,10 +1,19 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1268 - #define HAS_DISPLAY - #define HAS_AXP192 - #define HAS_GPS + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 + #define RADIO_DIO0_PIN 26 + #define RADIO_RST_PIN 23 + #define RADIO_DIO1_PIN 33 + #define RADIO_BUSY_PIN 32 + + // Display + #define HAS_DISPLAY #undef OLED_SDA #undef OLED_SCL @@ -14,15 +23,11 @@ #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 19 - #define RADIO_MOSI_PIN 27 - #define RADIO_CS_PIN 18 - #define RADIO_DIO0_PIN 26 - #define RADIO_RST_PIN 23 - #define RADIO_DIO1_PIN 33 - #define RADIO_BUSY_PIN 32 + // Aditional Config + #define HAS_AXP192 + // GPS + #define HAS_GPS #define GPS_RX 12 #define GPS_TX 34 diff --git a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h index 3f6b11f..7becdd0 100644 --- a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h +++ b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h @@ -1,7 +1,17 @@ #ifndef BOARD_PINOUT_H_ #define BOARD_PINOUT_H_ + // LoRa Radio #define HAS_SX1262 + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 3 + #define RADIO_MOSI_PIN 6 + #define RADIO_CS_PIN 7 + #define RADIO_RST_PIN 8 + #define RADIO_DIO1_PIN 33 + #define RADIO_BUSY_PIN 34 + + // Display #define HAS_DISPLAY #undef OLED_SDA @@ -12,15 +22,8 @@ #define OLED_SCL 17 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) + // Aditional Config #define INTERNAL_LED_PIN 37 // Green Led #define BATTERY_PIN 1 - #define RADIO_SCLK_PIN 5 - #define RADIO_MISO_PIN 3 - #define RADIO_MOSI_PIN 6 - #define RADIO_CS_PIN 7 - #define RADIO_RST_PIN 8 - #define RADIO_DIO1_PIN 33 - #define RADIO_BUSY_PIN 34 - #endif \ No newline at end of file