From 8c5d18dd857f66b20e79da4b2609e0439357ccb1 Mon Sep 17 00:00:00 2001 From: tobozo Date: Tue, 14 Dec 2021 13:55:55 +0100 Subject: [PATCH] Merged all TTGO-LoRa32 Board profiles (see #5933) (#5961) * Merged all TTGO-LoRa32 Board profiles (see #5933) * Fix for LORA_RST (see #5966) --- boards.txt | 244 ++++++--------------- variants/ttgo-lora32-v21new/pins_arduino.h | 4 +- 2 files changed, 73 insertions(+), 175 deletions(-) diff --git a/boards.txt b/boards.txt index 868fae8a0f1..89393908667 100644 --- a/boards.txt +++ b/boards.txt @@ -1636,63 +1636,76 @@ turta_iot_node.menu.DebugLevel.verbose.build.code_debug=5 ############################################################## -ttgo-lora32-v1.name=TTGO LoRa32-OLED V1 - -ttgo-lora32-v1.upload.tool=esptool_py -ttgo-lora32-v1.upload.maximum_size=1310720 -ttgo-lora32-v1.upload.maximum_data_size=294912 -ttgo-lora32-v1.upload.flags= -ttgo-lora32-v1.upload.extra_flags= - -ttgo-lora32-v1.serial.disableDTR=true -ttgo-lora32-v1.serial.disableRTS=true - -ttgo-lora32-v1.build.tarch=xtensa -ttgo-lora32-v1.build.bootloader_addr=0x1000 -ttgo-lora32-v1.build.target=esp32 -ttgo-lora32-v1.build.mcu=esp32 -ttgo-lora32-v1.build.core=esp32 -ttgo-lora32-v1.build.variant=ttgo-lora32-v1 -ttgo-lora32-v1.build.board=TTGO_LoRa32_V1 - -ttgo-lora32-v1.build.f_cpu=240000000L -ttgo-lora32-v1.build.flash_mode=dio -ttgo-lora32-v1.build.flash_size=4MB -ttgo-lora32-v1.build.boot=dio -ttgo-lora32-v1.build.partitions=default - -ttgo-lora32-v1.menu.FlashFreq.80=80MHz -ttgo-lora32-v1.menu.FlashFreq.80.build.flash_freq=80m -ttgo-lora32-v1.menu.FlashFreq.40=40MHz -ttgo-lora32-v1.menu.FlashFreq.40.build.flash_freq=40m - -ttgo-lora32-v1.menu.UploadSpeed.921600=921600 -ttgo-lora32-v1.menu.UploadSpeed.921600.upload.speed=921600 -ttgo-lora32-v1.menu.UploadSpeed.115200=115200 -ttgo-lora32-v1.menu.UploadSpeed.115200.upload.speed=115200 -ttgo-lora32-v1.menu.UploadSpeed.256000.windows=256000 -ttgo-lora32-v1.menu.UploadSpeed.256000.upload.speed=256000 -ttgo-lora32-v1.menu.UploadSpeed.230400.windows.upload.speed=256000 -ttgo-lora32-v1.menu.UploadSpeed.230400=230400 -ttgo-lora32-v1.menu.UploadSpeed.230400.upload.speed=230400 -ttgo-lora32-v1.menu.UploadSpeed.460800.linux=460800 -ttgo-lora32-v1.menu.UploadSpeed.460800.macosx=460800 -ttgo-lora32-v1.menu.UploadSpeed.460800.upload.speed=460800 -ttgo-lora32-v1.menu.UploadSpeed.512000.windows=512000 -ttgo-lora32-v1.menu.UploadSpeed.512000.upload.speed=512000 - -ttgo-lora32-v1.menu.DebugLevel.none=None -ttgo-lora32-v1.menu.DebugLevel.none.build.code_debug=0 -ttgo-lora32-v1.menu.DebugLevel.error=Error -ttgo-lora32-v1.menu.DebugLevel.error.build.code_debug=1 -ttgo-lora32-v1.menu.DebugLevel.warn=Warn -ttgo-lora32-v1.menu.DebugLevel.warn.build.code_debug=2 -ttgo-lora32-v1.menu.DebugLevel.info=Info -ttgo-lora32-v1.menu.DebugLevel.info.build.code_debug=3 -ttgo-lora32-v1.menu.DebugLevel.debug=Debug -ttgo-lora32-v1.menu.DebugLevel.debug.build.code_debug=4 -ttgo-lora32-v1.menu.DebugLevel.verbose=Verbose -ttgo-lora32-v1.menu.DebugLevel.verbose.build.code_debug=5 + +ttgo-lora32.name=TTGO LoRa32-OLED + +ttgo-lora32.upload.tool=esptool_py +ttgo-lora32.upload.maximum_size=1310720 +ttgo-lora32.upload.maximum_data_size=294912 +ttgo-lora32.upload.flags= +ttgo-lora32.upload.extra_flags= + +ttgo-lora32.serial.disableDTR=true +ttgo-lora32.serial.disableRTS=true + +ttgo-lora32.build.tarch=xtensa +ttgo-lora32.build.bootloader_addr=0x1000 +ttgo-lora32.build.target=esp32 +ttgo-lora32.build.mcu=esp32 +ttgo-lora32.build.core=esp32 +ttgo-lora32.build.board=TTGO_LoRa32 + +ttgo-lora32.menu.Revision.TTGO_LoRa32_V1=TTGO LoRa32 V1 (No TFCard) +ttgo-lora32.menu.Revision.TTGO_LoRa32_V1.build.board=TTGO_LoRa32_V1 +ttgo-lora32.menu.Revision.TTGO_LoRa32_V1.build.variant=ttgo-lora32-v1 + +ttgo-lora32.menu.Revision.TTGO_LoRa32_V2=TTGO LoRa32 V2 +ttgo-lora32.menu.Revision.TTGO_LoRa32_V2.build.board=TTGO_LoRa32_V2 +ttgo-lora32.menu.Revision.TTGO_LoRa32_V2.build.variant=ttgo-lora32-v2 + +ttgo-lora32.menu.Revision.TTGO_LoRa32_v21new=TTGO LoRa32 V2.1 (1.6.1) +ttgo-lora32.menu.Revision.TTGO_LoRa32_v21new.build.board=TTGO_LoRa32_v21new +ttgo-lora32.menu.Revision.TTGO_LoRa32_v21new.build.variant=ttgo-lora32-v21new + +ttgo-lora32.build.f_cpu=240000000L +ttgo-lora32.build.flash_mode=dio +ttgo-lora32.build.flash_size=4MB +ttgo-lora32.build.boot=dio +ttgo-lora32.build.partitions=default + +ttgo-lora32.menu.FlashFreq.80=80MHz +ttgo-lora32.menu.FlashFreq.80.build.flash_freq=80m +ttgo-lora32.menu.FlashFreq.40=40MHz +ttgo-lora32.menu.FlashFreq.40.build.flash_freq=40m + +ttgo-lora32.menu.UploadSpeed.921600=921600 +ttgo-lora32.menu.UploadSpeed.921600.upload.speed=921600 +ttgo-lora32.menu.UploadSpeed.115200=115200 +ttgo-lora32.menu.UploadSpeed.115200.upload.speed=115200 +ttgo-lora32.menu.UploadSpeed.256000.windows=256000 +ttgo-lora32.menu.UploadSpeed.256000.upload.speed=256000 +ttgo-lora32.menu.UploadSpeed.230400.windows.upload.speed=256000 +ttgo-lora32.menu.UploadSpeed.230400=230400 +ttgo-lora32.menu.UploadSpeed.230400.upload.speed=230400 +ttgo-lora32.menu.UploadSpeed.460800.linux=460800 +ttgo-lora32.menu.UploadSpeed.460800.macosx=460800 +ttgo-lora32.menu.UploadSpeed.460800.upload.speed=460800 +ttgo-lora32.menu.UploadSpeed.512000.windows=512000 +ttgo-lora32.menu.UploadSpeed.512000.upload.speed=512000 + +ttgo-lora32.menu.DebugLevel.none=None +ttgo-lora32.menu.DebugLevel.none.build.code_debug=0 +ttgo-lora32.menu.DebugLevel.error=Error +ttgo-lora32.menu.DebugLevel.error.build.code_debug=1 +ttgo-lora32.menu.DebugLevel.warn=Warn +ttgo-lora32.menu.DebugLevel.warn.build.code_debug=2 +ttgo-lora32.menu.DebugLevel.info=Info +ttgo-lora32.menu.DebugLevel.info.build.code_debug=3 +ttgo-lora32.menu.DebugLevel.debug=Debug +ttgo-lora32.menu.DebugLevel.debug.build.code_debug=4 +ttgo-lora32.menu.DebugLevel.verbose=Verbose +ttgo-lora32.menu.DebugLevel.verbose.build.code_debug=5 + ############################################################## @@ -8508,121 +8521,6 @@ wifiduino32.menu.DebugLevel.debug.build.code_debug=4 wifiduino32.menu.DebugLevel.verbose=Verbose wifiduino32.menu.DebugLevel.verbose.build.code_debug=5 -############################################################## - -ttgo-lora32-v21new.name=TTGO LoRa32-OLED v2.1.6 - -ttgo-lora32-v21new.upload.tool=esptool_py -ttgo-lora32-v21new.upload.maximum_size=1310720 -ttgo-lora32-v21new.upload.maximum_data_size=294912 -ttgo-lora32-v21new.upload.wait_for_upload_port=true -ttgo-lora32-v21new.upload.flags= -ttgo-lora32-v21new.upload.extra_flags= - -ttgo-lora32-v21new.serial.disableDTR=true -ttgo-lora32-v21new.serial.disableRTS=true - -ttgo-lora32-v21new.build.tarch=xtensa -ttgo-lora32-v21new.build.bootloader_addr=0x1000 -ttgo-lora32-v21new.build.target=esp32 -ttgo-lora32-v21new.build.mcu=esp32 -ttgo-lora32-v21new.build.core=esp32 -ttgo-lora32-v21new.build.variant=ttgo-lora32-v21new -ttgo-lora32-v21new.build.board=TTGO_LoRa32_v21new - -ttgo-lora32-v21new.build.f_cpu=240000000L -ttgo-lora32-v21new.build.flash_mode=dio -ttgo-lora32-v21new.build.flash_size=4MB -ttgo-lora32-v21new.build.boot=dio -ttgo-lora32-v21new.build.partitions=default - -ttgo-lora32-v21new.menu.FlashFreq.80=80MHz -ttgo-lora32-v21new.menu.FlashFreq.80.build.flash_freq=80m -ttgo-lora32-v21new.menu.FlashFreq.40=40MHz -ttgo-lora32-v21new.menu.FlashFreq.40.build.flash_freq=40m - -ttgo-lora32-v21new.menu.UploadSpeed.921600=921600 -ttgo-lora32-v21new.menu.UploadSpeed.921600.upload.speed=921600 -ttgo-lora32-v21new.menu.UploadSpeed.115200=115200 -ttgo-lora32-v21new.name=TTGO LoRa32-OLED v2.1.6 - -ttgo-lora32-v21new.upload.tool=esptool_py -ttgo-lora32-v21new.upload.maximum_size=1310720 -ttgo-lora32-v21new.upload.maximum_data_size=294912 -ttgo-lora32-v21new.upload.wait_for_upload_port=true - -ttgo-lora32-v21new.serial.disableDTR=true -ttgo-lora32-v21new.serial.disableRTS=true - -ttgo-lora32-v21new.build.tarch=xtensa -ttgo-lora32-v21new.build.bootloader_addr=0x1000 -ttgo-lora32-v21new.build.target=esp32 -ttgo-lora32-v21new.build.mcu=esp32 -ttgo-lora32-v21new.build.core=esp32 -ttgo-lora32-v21new.build.variant=ttgo-lora32-v21new -ttgo-lora32-v21new.build.board=TTGO_LoRa32_v21new - -ttgo-lora32-v21new.build.f_cpu=240000000L -ttgo-lora32-v21new.build.flash_mode=dio -ttgo-lora32-v21new.build.flash_size=4MB -ttgo-lora32-v21new.build.boot=dio -ttgo-lora32-v21new.build.partitions=default - -ttgo-lora32-v21new.menu.FlashFreq.80=80MHz -ttgo-lora32-v21new.menu.FlashFreq.80.build.flash_freq=80m -ttgo-lora32-v21new.menu.FlashFreq.40=40MHz -ttgo-lora32-v21new.menu.FlashFreq.40.build.flash_freq=40m - -ttgo-lora32-v21new.menu.UploadSpeed.921600=921600 -ttgo-lora32-v21new.menu.UploadSpeed.921600.upload.speed=921600 -ttgo-lora32-v21new.menu.UploadSpeed.115200=115200 -ttgo-lora32-v21new.menu.UploadSpeed.115200.upload.speed=115200 -ttgo-lora32-v21new.menu.UploadSpeed.256000.windows=256000 -ttgo-lora32-v21new.menu.UploadSpeed.256000.upload.speed=256000 -ttgo-lora32-v21new.menu.UploadSpeed.230400.windows.upload.speed=256000 -ttgo-lora32-v21new.menu.UploadSpeed.230400=230400 -ttgo-lora32-v21new.menu.UploadSpeed.230400.upload.speed=230400 -ttgo-lora32-v21new.menu.UploadSpeed.460800.linux=460800 -ttgo-lora32-v21new.menu.UploadSpeed.460800.macosx=460800 -ttgo-lora32-v21new.menu.UploadSpeed.460800.upload.speed=460800 -ttgo-lora32-v21new.menu.UploadSpeed.512000.windows=512000 -ttgo-lora32-v21new.menu.UploadSpeed.512000.upload.speed=512000 - -ttgo-lora32-v21new.menu.DebugLevel.none=None -ttgo-lora32-v21new.menu.DebugLevel.none.build.code_debug=0 -ttgo-lora32-v21new.menu.DebugLevel.error=Error -ttgo-lora32-v21new.menu.DebugLevel.error.build.code_debug=1 -ttgo-lora32-v21new.menu.DebugLevel.warn=Warn -ttgo-lora32-v21new.menu.DebugLevel.warn.build.code_debug=2 -ttgo-lora32-v21new.menu.DebugLevel.info=Info -ttgo-lora32-v21new.menu.DebugLevel.info.build.code_debug=3 -ttgo-lora32-v21new.menu.DebugLevel.debug=Debug -ttgo-lora32-v21new.menu.DebugLevel.debug.build.code_debug=4 -ttgo-lora32-v21new.menu.DebugLevel.verbose=Verbose -ttgo-lora32-v21new.menu.DebugLevel.verbose.build.code_debug=5w.menu.UploadSpeed.115200.upload.speed=115200 -ttgo-lora32-v21new.menu.UploadSpeed.256000.windows=256000 -ttgo-lora32-v21new.menu.UploadSpeed.256000.upload.speed=256000 -ttgo-lora32-v21new.menu.UploadSpeed.230400.windows.upload.speed=256000 -ttgo-lora32-v21new.menu.UploadSpeed.230400=230400 -ttgo-lora32-v21new.menu.UploadSpeed.230400.upload.speed=230400 -ttgo-lora32-v21new.menu.UploadSpeed.460800.linux=460800 -ttgo-lora32-v21new.menu.UploadSpeed.460800.macosx=460800 -ttgo-lora32-v21new.menu.UploadSpeed.460800.upload.speed=460800 -ttgo-lora32-v21new.menu.UploadSpeed.512000.windows=512000 -ttgo-lora32-v21new.menu.UploadSpeed.512000.upload.speed=512000 - -ttgo-lora32-v21new.menu.DebugLevel.none=None -ttgo-lora32-v21new.menu.DebugLevel.none.build.code_debug=0 -ttgo-lora32-v21new.menu.DebugLevel.error=Error -ttgo-lora32-v21new.menu.DebugLevel.error.build.code_debug=1 -ttgo-lora32-v21new.menu.DebugLevel.warn=Warn -ttgo-lora32-v21new.menu.DebugLevel.warn.build.code_debug=2 -ttgo-lora32-v21new.menu.DebugLevel.info=Info -ttgo-lora32-v21new.menu.DebugLevel.info.build.code_debug=3 -ttgo-lora32-v21new.menu.DebugLevel.debug=Debug -ttgo-lora32-v21new.menu.DebugLevel.debug.build.code_debug=4 -ttgo-lora32-v21new.menu.DebugLevel.verbose=Verbose -ttgo-lora32-v21new.menu.DebugLevel.verbose.build.code_debug=5 ############################################################## @@ -9353,7 +9251,7 @@ deneyapkart.menu.CPUFreq.80=80MHz (WiFi/BT) deneyapkart.menu.CPUFreq.80.build.f_cpu=80000000L deneyapkart.menu.CPUFreq.40=40MHz deneyapkart.menu.CPUFreq.40.build.f_cpu=40000000L -deneyapkart.menu.CPUFreq.20=20MHz +deneyapkart.menu.CPUFreq.20=20MHz deneyapkart.menu.CPUFreq.20.build.f_cpu=20000000L deneyapkart.menu.CPUFreq.10=10MHz deneyapkart.menu.CPUFreq.10.build.f_cpu=10000000L diff --git a/variants/ttgo-lora32-v21new/pins_arduino.h b/variants/ttgo-lora32-v21new/pins_arduino.h index 931ff29839a..c8870a7cd06 100644 --- a/variants/ttgo-lora32-v21new/pins_arduino.h +++ b/variants/ttgo-lora32-v21new/pins_arduino.h @@ -27,7 +27,7 @@ #define LORA_MISO 19 // GPIO19 - SX1276 MISO #define LORA_MOSI 27 // GPIO27 - SX1276 MOSI #define LORA_CS 18 // GPIO18 - SX1276 CS -#define LORA_RST 12 // GPIO14 - SX1276 RST +#define LORA_RST 23 // GPIO23 - SX1276 RST #define LORA_IRQ 26 // GPIO26 - SX1276 IRQ (interrupt request) #define LORA_D1 33 // GPIO33 - SX1276 IO1 (for LMIC Arduino library) #define LORA_D2 32 // GPIO32 - SX1276 IO2 @@ -63,7 +63,7 @@ static const uint8_t A4 = 32; static const uint8_t A5 = 33; static const uint8_t A6 = 34; static const uint8_t A7 = 35; -static const uint8_t A10 = 4; +static const uint8_t A10 = 4; static const uint8_t A11 = 0; static const uint8_t A12 = 2; static const uint8_t A13 = 15;