diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e32838a..e4a730a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,8 @@ jobs: chip: esp32 - name: ttgo-lora32-v21_915 chip: esp32 + - name: ttgo_lora32_t3s3_v1_2 + chip: esp32s3 - name: heltec-lora32-v2 chip: esp32 - name: heltec_wifi_lora_32_V3 diff --git a/platformio.ini b/platformio.ini index b3bddbf..4962b42 100644 --- a/platformio.ini +++ b/platformio.ini @@ -73,7 +73,7 @@ display_libs = board = ttgo-lora32-v21 build_flags = ${common.build_flags} - -DTTGO_T_LORA32_V2_1 + -DTTGO_LORA32_V2_1 -DHAS_SX1278 -DHAS_ADC_CALIBRATION lib_deps = @@ -84,7 +84,7 @@ lib_deps = board = ttgo-lora32-v21 build_flags = ${common.build_flags} - -DTTGO_T_LORA32_V2_1_915 + -DTTGO_LORA32_V2_1_915 -DHAS_SX1276 -DHAS_ADC_CALIBRATION lib_deps = @@ -212,7 +212,7 @@ lib_deps = board = ttgo-t-beam build_flags = ${common.build_flags} - -DTTGO_T_Beam_V1_2 + -DTTGO_T_BEAM_V1_2 -DHAS_SX1278 -DHAS_AXP2101 -DHAS_GPS @@ -225,7 +225,7 @@ lib_deps = board = ttgo-t-beam build_flags = ${common.build_flags} - -DTTGO_T_Beam_V1_2_915 + -DTTGO_T_BEAM_V1_2_915 -DHAS_SX1276 -DHAS_AXP2101 -DHAS_GPS @@ -238,7 +238,7 @@ lib_deps = board = ttgo-t-beam build_flags = ${common.build_flags} - -DTTGO_T_Beam_V1_0 + -DTTGO_T_BEAM_V1_0 -DHAS_SX1278 -DHAS_AXP192 -DHAS_GPS @@ -251,7 +251,7 @@ lib_deps = board = ttgo-t-beam build_flags = ${common.build_flags} - -DTTGO_T_Beam_V1_0_915 + -DTTGO_T_BEAM_V1_0_915 -DHAS_SX1276 -DHAS_AXP192 -DHAS_GPS @@ -264,7 +264,7 @@ lib_deps = board = ttgo-t-beam build_flags = ${common.build_flags} - -DTTGO_T_Beam_V1_0_SX1268 + -DTTGO_T_BEAM_V1_0_SX1268 -DHAS_SX1268 -DHAS_AXP192 -DHAS_GPS @@ -277,7 +277,7 @@ lib_deps = board = ttgo-t-beam build_flags = ${common.build_flags} - -DTTGO_T_Beam_V1_2_SX1262 + -DTTGO_T_BEAM_V1_2_SX1262 -DHAS_SX1262 -DHAS_AXP2101 -DHAS_GPS @@ -470,12 +470,13 @@ lib_deps = ${common.lib_deps} ${common.display_libs} -[env:ttgo_lora32_t3s3_v1_2_915] +[env:ttgo_lora32_t3s3_v1_2] board = esp32-s3-devkitc-1 board_build.mcu = esp32s3 +board_upload.flash_size = 4MB build_flags = ${common.build_flags} - -DTTGO_T_LORA32_T3S3_V1_2_915 + -DTTGO_LORA32_T3S3_V1_2 -DHAS_SX1262 -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index b2ed725..e246a81 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.10.25"; +String versionDate = "2024.10.29"; Configuration Config; WiFiClient espClient; #ifdef HAS_GPS diff --git a/src/battery_utils.cpp b/src/battery_utils.cpp index 3b7a294..c292b78 100644 --- a/src/battery_utils.cpp +++ b/src/battery_utils.cpp @@ -23,7 +23,7 @@ int telemetryCounter = random(1,999); #ifdef HAS_ADC_CALIBRATION #include - #if defined(TTGO_T_LORA32_V2_1) || defined(TTGO_T_LORA32_V2_1_915) + #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915) #define InternalBattery_ADC_Channel ADC1_CHANNEL_7 // t_lora32 pin35 #define ExternalVoltage_ADC_Channel ADC1_CHANNEL_6 // t_lora32 pin34 #endif diff --git a/src/boards_pinout.h b/src/boards_pinout.h index 63fab93..3650738 100644 --- a/src/boards_pinout.h +++ b/src/boards_pinout.h @@ -9,7 +9,7 @@ // LORA MODULES -#if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(ESP32_DIY_LoRa) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_LORA32_V2_1_915) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_Beam_V1_2_915) || defined(TTGO_T_Beam_V1_0_915) +#if defined(TTGO_LORA32_V2_1) || defined(HELTEC_V2) || defined(ESP32_DIY_LoRa) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_LORA32_V2_1_915) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_0_915) #define RADIO_SCLK_PIN 5 // GPIO5 - SX1278 SCK #define RADIO_MISO_PIN 19 // GPIO19 - SX1278 MISO #define RADIO_MOSI_PIN 27 // GPIO27 - SX1278 MOSI @@ -61,7 +61,7 @@ #define RADIO_BUSY_PIN 25 #endif -#if defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) +#if defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2_SX1262) #define RADIO_SCLK_PIN 5 #define RADIO_MISO_PIN 19 #define RADIO_MOSI_PIN 27 @@ -156,7 +156,7 @@ // OLED -#if defined(TTGO_T_LORA32_V2_1) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa_A7670) || defined(TTGO_T_LORA32_V2_1_915) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_Beam_V1_0_915) || defined(TTGO_T_Beam_V1_2_915) || defined(ESP32_DIY_LoRa_A7670_915) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) +#if defined(TTGO_LORA32_V2_1) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2_SX1262) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa_A7670) || defined(TTGO_LORA32_V2_1_915) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_BEAM_V1_0_915) || defined(TTGO_T_BEAM_V1_2_915) || defined(ESP32_DIY_LoRa_A7670_915) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) #define OLED_SDA 21 #define OLED_SCL 22 #define OLED_RST -1 // Reset pin # (or -1 if sharing Arduino reset pin) @@ -199,7 +199,7 @@ #ifdef WEMOS_S2_MINI_DIY_LoRa #define INTERNAL_LED_PIN 15 #endif -#if defined(TTGO_T_LORA32_V2_1) || defined(TTGO_T_LORA32_V2_1_915) +#if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915) #define INTERNAL_LED_PIN 25 // Green Led #define BATTERY_PIN 35 #endif @@ -284,7 +284,7 @@ // GPS -#if defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_2_915) || 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_SX1262) +#if defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_915) || 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_SX1262) #define GPS_RX 12 #define GPS_TX 34 #endif @@ -311,7 +311,7 @@ REST 14 GND - */ -#ifdef TTGO_T_LORA32_T3S3_V1_2_915 +#ifdef TTGO_LORA32_T3S3_V1_2 #define RADIO_SCLK_PIN 5 // SX1262 SCK #define RADIO_MISO_PIN 3 // SX1262 MISO #define RADIO_MOSI_PIN 6 // SX1262 MOSI @@ -320,8 +320,8 @@ GND - */ #define RADIO_DIO1_PIN 33 // SX1262 DIO1 #define RADIO_BUSY_PIN 34 // SX1262 BUSY - #define OLED_SDA 18 //17? - #define OLED_SCL 17 //18? + #define OLED_SDA 18 + #define OLED_SCL 17 #define OLED_RST -1 #define INTERNAL_LED_PIN 37 // Green Led diff --git a/src/power_utils.cpp b/src/power_utils.cpp index 7cfac92..76d543e 100644 --- a/src/power_utils.cpp +++ b/src/power_utils.cpp @@ -205,7 +205,7 @@ namespace POWER_Utils { Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL); #endif - #if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0) || defined(TTGO_T_LORA32_T3S3_V1_2_915) + #if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0) || defined(TTGO_LORA32_T3S3_V1_2) Wire.begin(OLED_SDA, OLED_SCL); #endif