Skip to content

Commit 8c5d18d

Browse files
tobozotobozo
authored
Merged all TTGO-LoRa32 Board profiles (see espressif#5933) (espressif#5961)
* Merged all TTGO-LoRa32 Board profiles (see espressif#5933) * Fix for LORA_RST (see espressif#5966)
1 parent fa03966 commit 8c5d18d

File tree

2 files changed

+73
-175
lines changed

2 files changed

+73
-175
lines changed

‎boards.txt

+71-173
Original file line numberDiff line numberDiff line change
@@ -1636,63 +1636,76 @@ turta_iot_node.menu.DebugLevel.verbose.build.code_debug=5
16361636

16371637
##############################################################
16381638

1639-
ttgo-lora32-v1.name=TTGO LoRa32-OLED V1
1640-
1641-
ttgo-lora32-v1.upload.tool=esptool_py
1642-
ttgo-lora32-v1.upload.maximum_size=1310720
1643-
ttgo-lora32-v1.upload.maximum_data_size=294912
1644-
ttgo-lora32-v1.upload.flags=
1645-
ttgo-lora32-v1.upload.extra_flags=
1646-
1647-
ttgo-lora32-v1.serial.disableDTR=true
1648-
ttgo-lora32-v1.serial.disableRTS=true
1649-
1650-
ttgo-lora32-v1.build.tarch=xtensa
1651-
ttgo-lora32-v1.build.bootloader_addr=0x1000
1652-
ttgo-lora32-v1.build.target=esp32
1653-
ttgo-lora32-v1.build.mcu=esp32
1654-
ttgo-lora32-v1.build.core=esp32
1655-
ttgo-lora32-v1.build.variant=ttgo-lora32-v1
1656-
ttgo-lora32-v1.build.board=TTGO_LoRa32_V1
1657-
1658-
ttgo-lora32-v1.build.f_cpu=240000000L
1659-
ttgo-lora32-v1.build.flash_mode=dio
1660-
ttgo-lora32-v1.build.flash_size=4MB
1661-
ttgo-lora32-v1.build.boot=dio
1662-
ttgo-lora32-v1.build.partitions=default
1663-
1664-
ttgo-lora32-v1.menu.FlashFreq.80=80MHz
1665-
ttgo-lora32-v1.menu.FlashFreq.80.build.flash_freq=80m
1666-
ttgo-lora32-v1.menu.FlashFreq.40=40MHz
1667-
ttgo-lora32-v1.menu.FlashFreq.40.build.flash_freq=40m
1668-
1669-
ttgo-lora32-v1.menu.UploadSpeed.921600=921600
1670-
ttgo-lora32-v1.menu.UploadSpeed.921600.upload.speed=921600
1671-
ttgo-lora32-v1.menu.UploadSpeed.115200=115200
1672-
ttgo-lora32-v1.menu.UploadSpeed.115200.upload.speed=115200
1673-
ttgo-lora32-v1.menu.UploadSpeed.256000.windows=256000
1674-
ttgo-lora32-v1.menu.UploadSpeed.256000.upload.speed=256000
1675-
ttgo-lora32-v1.menu.UploadSpeed.230400.windows.upload.speed=256000
1676-
ttgo-lora32-v1.menu.UploadSpeed.230400=230400
1677-
ttgo-lora32-v1.menu.UploadSpeed.230400.upload.speed=230400
1678-
ttgo-lora32-v1.menu.UploadSpeed.460800.linux=460800
1679-
ttgo-lora32-v1.menu.UploadSpeed.460800.macosx=460800
1680-
ttgo-lora32-v1.menu.UploadSpeed.460800.upload.speed=460800
1681-
ttgo-lora32-v1.menu.UploadSpeed.512000.windows=512000
1682-
ttgo-lora32-v1.menu.UploadSpeed.512000.upload.speed=512000
1683-
1684-
ttgo-lora32-v1.menu.DebugLevel.none=None
1685-
ttgo-lora32-v1.menu.DebugLevel.none.build.code_debug=0
1686-
ttgo-lora32-v1.menu.DebugLevel.error=Error
1687-
ttgo-lora32-v1.menu.DebugLevel.error.build.code_debug=1
1688-
ttgo-lora32-v1.menu.DebugLevel.warn=Warn
1689-
ttgo-lora32-v1.menu.DebugLevel.warn.build.code_debug=2
1690-
ttgo-lora32-v1.menu.DebugLevel.info=Info
1691-
ttgo-lora32-v1.menu.DebugLevel.info.build.code_debug=3
1692-
ttgo-lora32-v1.menu.DebugLevel.debug=Debug
1693-
ttgo-lora32-v1.menu.DebugLevel.debug.build.code_debug=4
1694-
ttgo-lora32-v1.menu.DebugLevel.verbose=Verbose
1695-
ttgo-lora32-v1.menu.DebugLevel.verbose.build.code_debug=5
1639+
1640+
ttgo-lora32.name=TTGO LoRa32-OLED
1641+
1642+
ttgo-lora32.upload.tool=esptool_py
1643+
ttgo-lora32.upload.maximum_size=1310720
1644+
ttgo-lora32.upload.maximum_data_size=294912
1645+
ttgo-lora32.upload.flags=
1646+
ttgo-lora32.upload.extra_flags=
1647+
1648+
ttgo-lora32.serial.disableDTR=true
1649+
ttgo-lora32.serial.disableRTS=true
1650+
1651+
ttgo-lora32.build.tarch=xtensa
1652+
ttgo-lora32.build.bootloader_addr=0x1000
1653+
ttgo-lora32.build.target=esp32
1654+
ttgo-lora32.build.mcu=esp32
1655+
ttgo-lora32.build.core=esp32
1656+
ttgo-lora32.build.board=TTGO_LoRa32
1657+
1658+
ttgo-lora32.menu.Revision.TTGO_LoRa32_V1=TTGO LoRa32 V1 (No TFCard)
1659+
ttgo-lora32.menu.Revision.TTGO_LoRa32_V1.build.board=TTGO_LoRa32_V1
1660+
ttgo-lora32.menu.Revision.TTGO_LoRa32_V1.build.variant=ttgo-lora32-v1
1661+
1662+
ttgo-lora32.menu.Revision.TTGO_LoRa32_V2=TTGO LoRa32 V2
1663+
ttgo-lora32.menu.Revision.TTGO_LoRa32_V2.build.board=TTGO_LoRa32_V2
1664+
ttgo-lora32.menu.Revision.TTGO_LoRa32_V2.build.variant=ttgo-lora32-v2
1665+
1666+
ttgo-lora32.menu.Revision.TTGO_LoRa32_v21new=TTGO LoRa32 V2.1 (1.6.1)
1667+
ttgo-lora32.menu.Revision.TTGO_LoRa32_v21new.build.board=TTGO_LoRa32_v21new
1668+
ttgo-lora32.menu.Revision.TTGO_LoRa32_v21new.build.variant=ttgo-lora32-v21new
1669+
1670+
ttgo-lora32.build.f_cpu=240000000L
1671+
ttgo-lora32.build.flash_mode=dio
1672+
ttgo-lora32.build.flash_size=4MB
1673+
ttgo-lora32.build.boot=dio
1674+
ttgo-lora32.build.partitions=default
1675+
1676+
ttgo-lora32.menu.FlashFreq.80=80MHz
1677+
ttgo-lora32.menu.FlashFreq.80.build.flash_freq=80m
1678+
ttgo-lora32.menu.FlashFreq.40=40MHz
1679+
ttgo-lora32.menu.FlashFreq.40.build.flash_freq=40m
1680+
1681+
ttgo-lora32.menu.UploadSpeed.921600=921600
1682+
ttgo-lora32.menu.UploadSpeed.921600.upload.speed=921600
1683+
ttgo-lora32.menu.UploadSpeed.115200=115200
1684+
ttgo-lora32.menu.UploadSpeed.115200.upload.speed=115200
1685+
ttgo-lora32.menu.UploadSpeed.256000.windows=256000
1686+
ttgo-lora32.menu.UploadSpeed.256000.upload.speed=256000
1687+
ttgo-lora32.menu.UploadSpeed.230400.windows.upload.speed=256000
1688+
ttgo-lora32.menu.UploadSpeed.230400=230400
1689+
ttgo-lora32.menu.UploadSpeed.230400.upload.speed=230400
1690+
ttgo-lora32.menu.UploadSpeed.460800.linux=460800
1691+
ttgo-lora32.menu.UploadSpeed.460800.macosx=460800
1692+
ttgo-lora32.menu.UploadSpeed.460800.upload.speed=460800
1693+
ttgo-lora32.menu.UploadSpeed.512000.windows=512000
1694+
ttgo-lora32.menu.UploadSpeed.512000.upload.speed=512000
1695+
1696+
ttgo-lora32.menu.DebugLevel.none=None
1697+
ttgo-lora32.menu.DebugLevel.none.build.code_debug=0
1698+
ttgo-lora32.menu.DebugLevel.error=Error
1699+
ttgo-lora32.menu.DebugLevel.error.build.code_debug=1
1700+
ttgo-lora32.menu.DebugLevel.warn=Warn
1701+
ttgo-lora32.menu.DebugLevel.warn.build.code_debug=2
1702+
ttgo-lora32.menu.DebugLevel.info=Info
1703+
ttgo-lora32.menu.DebugLevel.info.build.code_debug=3
1704+
ttgo-lora32.menu.DebugLevel.debug=Debug
1705+
ttgo-lora32.menu.DebugLevel.debug.build.code_debug=4
1706+
ttgo-lora32.menu.DebugLevel.verbose=Verbose
1707+
ttgo-lora32.menu.DebugLevel.verbose.build.code_debug=5
1708+
16961709

16971710
##############################################################
16981711

@@ -8508,121 +8521,6 @@ wifiduino32.menu.DebugLevel.debug.build.code_debug=4
85088521
wifiduino32.menu.DebugLevel.verbose=Verbose
85098522
wifiduino32.menu.DebugLevel.verbose.build.code_debug=5
85108523

8511-
##############################################################
8512-
8513-
ttgo-lora32-v21new.name=TTGO LoRa32-OLED v2.1.6
8514-
8515-
ttgo-lora32-v21new.upload.tool=esptool_py
8516-
ttgo-lora32-v21new.upload.maximum_size=1310720
8517-
ttgo-lora32-v21new.upload.maximum_data_size=294912
8518-
ttgo-lora32-v21new.upload.wait_for_upload_port=true
8519-
ttgo-lora32-v21new.upload.flags=
8520-
ttgo-lora32-v21new.upload.extra_flags=
8521-
8522-
ttgo-lora32-v21new.serial.disableDTR=true
8523-
ttgo-lora32-v21new.serial.disableRTS=true
8524-
8525-
ttgo-lora32-v21new.build.tarch=xtensa
8526-
ttgo-lora32-v21new.build.bootloader_addr=0x1000
8527-
ttgo-lora32-v21new.build.target=esp32
8528-
ttgo-lora32-v21new.build.mcu=esp32
8529-
ttgo-lora32-v21new.build.core=esp32
8530-
ttgo-lora32-v21new.build.variant=ttgo-lora32-v21new
8531-
ttgo-lora32-v21new.build.board=TTGO_LoRa32_v21new
8532-
8533-
ttgo-lora32-v21new.build.f_cpu=240000000L
8534-
ttgo-lora32-v21new.build.flash_mode=dio
8535-
ttgo-lora32-v21new.build.flash_size=4MB
8536-
ttgo-lora32-v21new.build.boot=dio
8537-
ttgo-lora32-v21new.build.partitions=default
8538-
8539-
ttgo-lora32-v21new.menu.FlashFreq.80=80MHz
8540-
ttgo-lora32-v21new.menu.FlashFreq.80.build.flash_freq=80m
8541-
ttgo-lora32-v21new.menu.FlashFreq.40=40MHz
8542-
ttgo-lora32-v21new.menu.FlashFreq.40.build.flash_freq=40m
8543-
8544-
ttgo-lora32-v21new.menu.UploadSpeed.921600=921600
8545-
ttgo-lora32-v21new.menu.UploadSpeed.921600.upload.speed=921600
8546-
ttgo-lora32-v21new.menu.UploadSpeed.115200=115200
8547-
ttgo-lora32-v21new.name=TTGO LoRa32-OLED v2.1.6
8548-
8549-
ttgo-lora32-v21new.upload.tool=esptool_py
8550-
ttgo-lora32-v21new.upload.maximum_size=1310720
8551-
ttgo-lora32-v21new.upload.maximum_data_size=294912
8552-
ttgo-lora32-v21new.upload.wait_for_upload_port=true
8553-
8554-
ttgo-lora32-v21new.serial.disableDTR=true
8555-
ttgo-lora32-v21new.serial.disableRTS=true
8556-
8557-
ttgo-lora32-v21new.build.tarch=xtensa
8558-
ttgo-lora32-v21new.build.bootloader_addr=0x1000
8559-
ttgo-lora32-v21new.build.target=esp32
8560-
ttgo-lora32-v21new.build.mcu=esp32
8561-
ttgo-lora32-v21new.build.core=esp32
8562-
ttgo-lora32-v21new.build.variant=ttgo-lora32-v21new
8563-
ttgo-lora32-v21new.build.board=TTGO_LoRa32_v21new
8564-
8565-
ttgo-lora32-v21new.build.f_cpu=240000000L
8566-
ttgo-lora32-v21new.build.flash_mode=dio
8567-
ttgo-lora32-v21new.build.flash_size=4MB
8568-
ttgo-lora32-v21new.build.boot=dio
8569-
ttgo-lora32-v21new.build.partitions=default
8570-
8571-
ttgo-lora32-v21new.menu.FlashFreq.80=80MHz
8572-
ttgo-lora32-v21new.menu.FlashFreq.80.build.flash_freq=80m
8573-
ttgo-lora32-v21new.menu.FlashFreq.40=40MHz
8574-
ttgo-lora32-v21new.menu.FlashFreq.40.build.flash_freq=40m
8575-
8576-
ttgo-lora32-v21new.menu.UploadSpeed.921600=921600
8577-
ttgo-lora32-v21new.menu.UploadSpeed.921600.upload.speed=921600
8578-
ttgo-lora32-v21new.menu.UploadSpeed.115200=115200
8579-
ttgo-lora32-v21new.menu.UploadSpeed.115200.upload.speed=115200
8580-
ttgo-lora32-v21new.menu.UploadSpeed.256000.windows=256000
8581-
ttgo-lora32-v21new.menu.UploadSpeed.256000.upload.speed=256000
8582-
ttgo-lora32-v21new.menu.UploadSpeed.230400.windows.upload.speed=256000
8583-
ttgo-lora32-v21new.menu.UploadSpeed.230400=230400
8584-
ttgo-lora32-v21new.menu.UploadSpeed.230400.upload.speed=230400
8585-
ttgo-lora32-v21new.menu.UploadSpeed.460800.linux=460800
8586-
ttgo-lora32-v21new.menu.UploadSpeed.460800.macosx=460800
8587-
ttgo-lora32-v21new.menu.UploadSpeed.460800.upload.speed=460800
8588-
ttgo-lora32-v21new.menu.UploadSpeed.512000.windows=512000
8589-
ttgo-lora32-v21new.menu.UploadSpeed.512000.upload.speed=512000
8590-
8591-
ttgo-lora32-v21new.menu.DebugLevel.none=None
8592-
ttgo-lora32-v21new.menu.DebugLevel.none.build.code_debug=0
8593-
ttgo-lora32-v21new.menu.DebugLevel.error=Error
8594-
ttgo-lora32-v21new.menu.DebugLevel.error.build.code_debug=1
8595-
ttgo-lora32-v21new.menu.DebugLevel.warn=Warn
8596-
ttgo-lora32-v21new.menu.DebugLevel.warn.build.code_debug=2
8597-
ttgo-lora32-v21new.menu.DebugLevel.info=Info
8598-
ttgo-lora32-v21new.menu.DebugLevel.info.build.code_debug=3
8599-
ttgo-lora32-v21new.menu.DebugLevel.debug=Debug
8600-
ttgo-lora32-v21new.menu.DebugLevel.debug.build.code_debug=4
8601-
ttgo-lora32-v21new.menu.DebugLevel.verbose=Verbose
8602-
ttgo-lora32-v21new.menu.DebugLevel.verbose.build.code_debug=5w.menu.UploadSpeed.115200.upload.speed=115200
8603-
ttgo-lora32-v21new.menu.UploadSpeed.256000.windows=256000
8604-
ttgo-lora32-v21new.menu.UploadSpeed.256000.upload.speed=256000
8605-
ttgo-lora32-v21new.menu.UploadSpeed.230400.windows.upload.speed=256000
8606-
ttgo-lora32-v21new.menu.UploadSpeed.230400=230400
8607-
ttgo-lora32-v21new.menu.UploadSpeed.230400.upload.speed=230400
8608-
ttgo-lora32-v21new.menu.UploadSpeed.460800.linux=460800
8609-
ttgo-lora32-v21new.menu.UploadSpeed.460800.macosx=460800
8610-
ttgo-lora32-v21new.menu.UploadSpeed.460800.upload.speed=460800
8611-
ttgo-lora32-v21new.menu.UploadSpeed.512000.windows=512000
8612-
ttgo-lora32-v21new.menu.UploadSpeed.512000.upload.speed=512000
8613-
8614-
ttgo-lora32-v21new.menu.DebugLevel.none=None
8615-
ttgo-lora32-v21new.menu.DebugLevel.none.build.code_debug=0
8616-
ttgo-lora32-v21new.menu.DebugLevel.error=Error
8617-
ttgo-lora32-v21new.menu.DebugLevel.error.build.code_debug=1
8618-
ttgo-lora32-v21new.menu.DebugLevel.warn=Warn
8619-
ttgo-lora32-v21new.menu.DebugLevel.warn.build.code_debug=2
8620-
ttgo-lora32-v21new.menu.DebugLevel.info=Info
8621-
ttgo-lora32-v21new.menu.DebugLevel.info.build.code_debug=3
8622-
ttgo-lora32-v21new.menu.DebugLevel.debug=Debug
8623-
ttgo-lora32-v21new.menu.DebugLevel.debug.build.code_debug=4
8624-
ttgo-lora32-v21new.menu.DebugLevel.verbose=Verbose
8625-
ttgo-lora32-v21new.menu.DebugLevel.verbose.build.code_debug=5
86268524

86278525
##############################################################
86288526

@@ -9353,7 +9251,7 @@ deneyapkart.menu.CPUFreq.80=80MHz (WiFi/BT)
93539251
deneyapkart.menu.CPUFreq.80.build.f_cpu=80000000L
93549252
deneyapkart.menu.CPUFreq.40=40MHz
93559253
deneyapkart.menu.CPUFreq.40.build.f_cpu=40000000L
9356-
deneyapkart.menu.CPUFreq.20=20MHz
9254+
deneyapkart.menu.CPUFreq.20=20MHz
93579255
deneyapkart.menu.CPUFreq.20.build.f_cpu=20000000L
93589256
deneyapkart.menu.CPUFreq.10=10MHz
93599257
deneyapkart.menu.CPUFreq.10.build.f_cpu=10000000L

‎variants/ttgo-lora32-v21new/pins_arduino.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define LORA_MISO 19 // GPIO19 - SX1276 MISO
2828
#define LORA_MOSI 27 // GPIO27 - SX1276 MOSI
2929
#define LORA_CS 18 // GPIO18 - SX1276 CS
30-
#define LORA_RST 12 // GPIO14 - SX1276 RST
30+
#define LORA_RST 23 // GPIO23 - SX1276 RST
3131
#define LORA_IRQ 26 // GPIO26 - SX1276 IRQ (interrupt request)
3232
#define LORA_D1 33 // GPIO33 - SX1276 IO1 (for LMIC Arduino library)
3333
#define LORA_D2 32 // GPIO32 - SX1276 IO2
@@ -63,7 +63,7 @@ static const uint8_t A4 = 32;
6363
static const uint8_t A5 = 33;
6464
static const uint8_t A6 = 34;
6565
static const uint8_t A7 = 35;
66-
static const uint8_t A10 = 4;
66+
static const uint8_t A10 = 4;
6767
static const uint8_t A11 = 0;
6868
static const uint8_t A12 = 2;
6969
static const uint8_t A13 = 15;

0 commit comments

Comments
 (0)