Skip to content

Commit de184bd

Browse files
lewisxhepre-commit-ci-lite[bot]
lewisxhe
and
pre-commit-ci-lite[bot]
authored
Update LilyGo variants and add new variants (espressif#11192)
* Update LilyGo T-Watch-S3 definition and expansion options * Update LilyGo T-Watch-Ultra definition and expand options * Added variant LilyGo-T-LoRa-Pager * Update partition table order * Update LilyGo board partition table order * ci(pre-commit): Apply automatic fixes --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent 1014937 commit de184bd

File tree

4 files changed

+310
-23
lines changed

4 files changed

+310
-23
lines changed

‎boards.txt‎

Lines changed: 170 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6070,10 +6070,12 @@ twatchs3.menu.EraseFlash.none.upload.erase_cmd=
60706070
twatchs3.menu.EraseFlash.all=Enabled
60716071
twatchs3.menu.EraseFlash.all.upload.erase_cmd=-e
60726072

6073-
twatchs3.menu.Revision.Radio_SX1280=Radio-SX1280
6074-
twatchs3.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
60756073
twatchs3.menu.Revision.Radio_SX1262=Radio-SX1262
60766074
twatchs3.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
6075+
twatchs3.menu.Revision.Radio_SX1280=Radio-SX1280
6076+
twatchs3.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
6077+
twatchs3.menu.Revision.Radio_CC1101=Radio-CC1101
6078+
twatchs3.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
60776079

60786080
##############################################################
60796081

@@ -6166,12 +6168,12 @@ twatch_ultra.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
61666168
twatch_ultra.menu.UploadMode.cdc.upload.use_1200bps_touch=true
61676169
twatch_ultra.menu.UploadMode.cdc.upload.wait_for_upload_port=true
61686170

6169-
twatch_ultra.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
6170-
twatch_ultra.menu.PartitionScheme.fatflash.build.partitions=ffat
6171-
twatch_ultra.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
61726171
twatch_ultra.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
61736172
twatch_ultra.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
61746173
twatch_ultra.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
6174+
twatch_ultra.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
6175+
twatch_ultra.menu.PartitionScheme.fatflash.build.partitions=ffat
6176+
twatch_ultra.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
61756177
twatch_ultra.menu.PartitionScheme.rainmaker=RainMaker
61766178
twatch_ultra.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
61776179
twatch_ultra.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
@@ -6233,7 +6235,170 @@ twatch_ultra.menu.Revision.Radio_SX1280=Radio-SX1280
62336235
twatch_ultra.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
62346236
twatch_ultra.menu.Revision.Radio_SX1262=Radio-SX1262
62356237
twatch_ultra.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
6238+
twatch_ultra.menu.Revision.Radio_CC1101=Radio-CC1101
6239+
twatch_ultra.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
6240+
6241+
6242+
##############################################################
6243+
6244+
tlora_pager.name=LilyGo-T-LoRa-Pager
6245+
6246+
tlora_pager.bootloader.tool=esptool_py
6247+
tlora_pager.bootloader.tool.default=esptool_py
6248+
6249+
tlora_pager.upload.tool=esptool_py
6250+
tlora_pager.upload.tool.default=esptool_py
6251+
tlora_pager.upload.tool.network=esp_ota
6252+
6253+
tlora_pager.upload.maximum_size=1310720
6254+
tlora_pager.upload.maximum_data_size=327680
6255+
tlora_pager.upload.flags=
6256+
tlora_pager.upload.extra_flags=
6257+
tlora_pager.upload.use_1200bps_touch=false
6258+
tlora_pager.upload.wait_for_upload_port=false
6259+
6260+
tlora_pager.serial.disableDTR=false
6261+
tlora_pager.serial.disableRTS=false
6262+
6263+
tlora_pager.build.tarch=xtensa
6264+
tlora_pager.build.bootloader_addr=0x0
6265+
tlora_pager.build.target=esp32s3
6266+
tlora_pager.build.mcu=esp32s3
6267+
tlora_pager.build.core=esp32
6268+
tlora_pager.build.variant=lilygo_tlora_pager
6269+
tlora_pager.build.board=T_LORA_PAGER
6270+
6271+
tlora_pager.build.usb_mode=1
6272+
tlora_pager.build.cdc_on_boot=1
6273+
tlora_pager.build.msc_on_boot=0
6274+
tlora_pager.build.dfu_on_boot=0
6275+
tlora_pager.build.f_cpu=240000000L
6276+
tlora_pager.build.flash_size=16MB
6277+
tlora_pager.build.flash_freq=80m
6278+
tlora_pager.build.flash_mode=dio
6279+
tlora_pager.build.boot=qio
6280+
tlora_pager.build.boot_freq=80m
6281+
tlora_pager.build.partitions=app3M_fat9M_16MB
6282+
tlora_pager.build.defines=-DBOARD_HAS_PSRAM -DARDUINO_T_LORA_PAGER
6283+
tlora_pager.build.loop_core=
6284+
tlora_pager.build.event_core=
6285+
tlora_pager.build.psram_type=qspi
6286+
tlora_pager.build.memory_type={build.boot}_{build.psram_type}
62366287

6288+
## IDE 2.0 Seems to not update the value
6289+
tlora_pager.menu.JTAGAdapter.default=Disabled
6290+
tlora_pager.menu.JTAGAdapter.default.build.copy_jtag_files=0
6291+
tlora_pager.menu.JTAGAdapter.builtin=Integrated USB JTAG
6292+
tlora_pager.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
6293+
tlora_pager.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
6294+
6295+
tlora_pager.menu.LoopCore.1=Core 1
6296+
tlora_pager.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
6297+
tlora_pager.menu.LoopCore.0=Core 0
6298+
tlora_pager.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
6299+
6300+
tlora_pager.menu.EventsCore.1=Core 1
6301+
tlora_pager.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
6302+
tlora_pager.menu.EventsCore.0=Core 0
6303+
tlora_pager.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
6304+
6305+
tlora_pager.menu.USBMode.hwcdc=Hardware CDC and JTAG
6306+
tlora_pager.menu.USBMode.hwcdc.build.usb_mode=1
6307+
tlora_pager.menu.USBMode.default=USB-OTG (TinyUSB)
6308+
tlora_pager.menu.USBMode.default.build.usb_mode=0
6309+
6310+
tlora_pager.menu.CDCOnBoot.default=Enabled
6311+
tlora_pager.menu.CDCOnBoot.default.build.cdc_on_boot=1
6312+
tlora_pager.menu.CDCOnBoot.cdc=Disabled
6313+
tlora_pager.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
6314+
6315+
tlora_pager.menu.MSCOnBoot.default=Disabled
6316+
tlora_pager.menu.MSCOnBoot.default.build.msc_on_boot=0
6317+
tlora_pager.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
6318+
tlora_pager.menu.MSCOnBoot.msc.build.msc_on_boot=1
6319+
6320+
tlora_pager.menu.DFUOnBoot.default=Disabled
6321+
tlora_pager.menu.DFUOnBoot.default.build.dfu_on_boot=0
6322+
tlora_pager.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
6323+
tlora_pager.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
6324+
6325+
tlora_pager.menu.UploadMode.default=UART0 / Hardware CDC
6326+
tlora_pager.menu.UploadMode.default.upload.use_1200bps_touch=false
6327+
tlora_pager.menu.UploadMode.default.upload.wait_for_upload_port=false
6328+
tlora_pager.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
6329+
tlora_pager.menu.UploadMode.cdc.upload.use_1200bps_touch=true
6330+
tlora_pager.menu.UploadMode.cdc.upload.wait_for_upload_port=true
6331+
6332+
tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
6333+
tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
6334+
tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
6335+
tlora_pager.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
6336+
tlora_pager.menu.PartitionScheme.fatflash.build.partitions=ffat
6337+
tlora_pager.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
6338+
tlora_pager.menu.PartitionScheme.rainmaker=RainMaker
6339+
tlora_pager.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
6340+
tlora_pager.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
6341+
tlora_pager.menu.PartitionScheme.esp_sr_16=ESP SR 16M (3MB APP/7MB SPIFFS/2.9MB MODEL)
6342+
tlora_pager.menu.PartitionScheme.esp_sr_16.upload.maximum_size=3145728
6343+
tlora_pager.menu.PartitionScheme.esp_sr_16.upload.extra_flags=0xD10000 {build.path}/srmodels.bin
6344+
tlora_pager.menu.PartitionScheme.esp_sr_16.build.partitions=esp_sr_16
6345+
tlora_pager.menu.PartitionScheme.custom=Custom
6346+
tlora_pager.menu.PartitionScheme.custom.build.partitions=
6347+
tlora_pager.menu.PartitionScheme.custom.upload.maximum_size=16777216
6348+
6349+
tlora_pager.menu.CPUFreq.240=240MHz (WiFi)
6350+
tlora_pager.menu.CPUFreq.240.build.f_cpu=240000000L
6351+
tlora_pager.menu.CPUFreq.160=160MHz (WiFi)
6352+
tlora_pager.menu.CPUFreq.160.build.f_cpu=160000000L
6353+
tlora_pager.menu.CPUFreq.80=80MHz (WiFi)
6354+
tlora_pager.menu.CPUFreq.80.build.f_cpu=80000000L
6355+
tlora_pager.menu.CPUFreq.40=40MHz
6356+
tlora_pager.menu.CPUFreq.40.build.f_cpu=40000000L
6357+
tlora_pager.menu.CPUFreq.20=20MHz
6358+
tlora_pager.menu.CPUFreq.20.build.f_cpu=20000000L
6359+
tlora_pager.menu.CPUFreq.10=10MHz
6360+
tlora_pager.menu.CPUFreq.10.build.f_cpu=10000000L
6361+
6362+
tlora_pager.menu.UploadSpeed.921600=921600
6363+
tlora_pager.menu.UploadSpeed.921600.upload.speed=921600
6364+
tlora_pager.menu.UploadSpeed.115200=115200
6365+
tlora_pager.menu.UploadSpeed.115200.upload.speed=115200
6366+
tlora_pager.menu.UploadSpeed.256000.windows=256000
6367+
tlora_pager.menu.UploadSpeed.256000.upload.speed=256000
6368+
tlora_pager.menu.UploadSpeed.230400.windows.upload.speed=256000
6369+
tlora_pager.menu.UploadSpeed.230400=230400
6370+
tlora_pager.menu.UploadSpeed.230400.upload.speed=230400
6371+
tlora_pager.menu.UploadSpeed.460800.linux=460800
6372+
tlora_pager.menu.UploadSpeed.460800.macosx=460800
6373+
tlora_pager.menu.UploadSpeed.460800.upload.speed=460800
6374+
tlora_pager.menu.UploadSpeed.512000.windows=512000
6375+
tlora_pager.menu.UploadSpeed.512000.upload.speed=512000
6376+
6377+
tlora_pager.menu.DebugLevel.none=None
6378+
tlora_pager.menu.DebugLevel.none.build.code_debug=0
6379+
tlora_pager.menu.DebugLevel.error=Error
6380+
tlora_pager.menu.DebugLevel.error.build.code_debug=1
6381+
tlora_pager.menu.DebugLevel.warn=Warn
6382+
tlora_pager.menu.DebugLevel.warn.build.code_debug=2
6383+
tlora_pager.menu.DebugLevel.info=Info
6384+
tlora_pager.menu.DebugLevel.info.build.code_debug=3
6385+
tlora_pager.menu.DebugLevel.debug=Debug
6386+
tlora_pager.menu.DebugLevel.debug.build.code_debug=4
6387+
tlora_pager.menu.DebugLevel.verbose=Verbose
6388+
tlora_pager.menu.DebugLevel.verbose.build.code_debug=5
6389+
6390+
tlora_pager.menu.EraseFlash.none=Disabled
6391+
tlora_pager.menu.EraseFlash.none.upload.erase_cmd=
6392+
tlora_pager.menu.EraseFlash.all=Enabled
6393+
tlora_pager.menu.EraseFlash.all.upload.erase_cmd=-e
6394+
6395+
6396+
tlora_pager.menu.Revision.Radio_SX1280=Radio-SX1280
6397+
tlora_pager.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
6398+
tlora_pager.menu.Revision.Radio_SX1262=Radio-SX1262
6399+
tlora_pager.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
6400+
tlora_pager.menu.Revision.Radio_CC1101=Radio-CC1101
6401+
tlora_pager.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
62376402

62386403
##############################################################
62396404

‎variants/lilygo_tlora_pager/pins_arduino.h‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#ifndef digitalPinToInterrupt
7+
#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
8+
#endif
9+
10+
#define USB_VID 0x303a
11+
#define USB_PID 0x82D1
12+
#define USB_MANUFACTURER "LILYGO"
13+
#define USB_PRODUCT "T-LoRa-Pager"
14+
15+
// ST7796
16+
#define DISP_WIDTH (222)
17+
#define DISP_HEIGHT (480)
18+
#define SD_CS (21)
19+
20+
static const uint8_t TX = 43;
21+
static const uint8_t RX = 44;
22+
23+
//BHI260,PCF85063,BQ25896,DRV2605L,ES8311 share I2C Bus
24+
static const uint8_t SDA = 2;
25+
static const uint8_t SCL = 3;
26+
27+
// Default sd cs pin
28+
static const uint8_t SS = SD_CS;
29+
static const uint8_t MOSI = 34;
30+
static const uint8_t MISO = 33;
31+
static const uint8_t SCK = 35;
32+
33+
#define KB_INT (6)
34+
#define KB_BACKLIGHT (46)
35+
36+
// Rotary
37+
#define ROTARY_A (40)
38+
#define ROTARY_B (41)
39+
#define ROTARY_C (7)
40+
41+
// Interrupt IO port
42+
#define RTC_INT (1)
43+
#define NFC_INT (5)
44+
#define SENSOR_INT (8)
45+
#define NFC_CS (39)
46+
47+
// ES8311
48+
#define I2S_WS (18)
49+
#define I2S_SCK (11)
50+
#define I2S_MCLK (10)
51+
#define I2S_SDOUT (45)
52+
#define I2S_SDIN (17)
53+
54+
// GPS
55+
#define GPS_TX (12)
56+
#define GPS_RX (4)
57+
#define GPS_PPS (13)
58+
59+
// LoRa, SD, ST25R3916 card share SPI bus
60+
#define LORA_SCK (SCK) // share spi bus
61+
#define LORA_MISO (MISO) // share spi bus
62+
#define LORA_MOSI (MOSI) // share spi bus
63+
#define LORA_CS (36)
64+
#define LORA_RST (47)
65+
#define LORA_BUSY (48)
66+
#define LORA_IRQ (14)
67+
68+
// SPI interface display
69+
#define DISP_MOSI (MOSI)
70+
#define DISP_MISO (MISO)
71+
#define DISP_SCK (SCK)
72+
#define DISP_RST (-1)
73+
#define DISP_CS (38)
74+
#define DISP_DC (37)
75+
#define DISP_BL (42)
76+
77+
// External expansion chip IO definition
78+
#define EXPANDS_DRV_EN (0)
79+
#define EXPANDS_AMP_EN (1)
80+
#define EXPANDS_KB_RST (2)
81+
#define EXPANDS_LORA_EN (3)
82+
#define EXPANDS_GPS_EN (4)
83+
#define EXPANDS_NFC_EN (5)
84+
#define EXPANDS_DISP_RST (6)
85+
#define EXPANDS_GPS_RST (7)
86+
#define EXPANDS_KB_EN (8)
87+
#define EXPANDS_GPIO_EN (9)
88+
89+
// Peripheral definition exists
90+
#define USING_AUDIO_CODEC
91+
#define USING_XL9555_EXPANDS
92+
#define USING_PPM_MANAGE
93+
#define USING_BQ_GAUGE
94+
#define USING_INPUT_DEV_ROTARY
95+
#define USING_INPUT_DEV_KEYBOARD
96+
#define USING_ST25R3916
97+
#define USING_BHI260_SENSOR
98+
#define HAS_SD_CARD_SOCKET
99+
100+
#endif /* Pins_Arduino_h */

‎variants/lilygo_twatch_s3/pins_arduino.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,11 @@ static const uint8_t SCK = 3;
6666
#define GPS_TX (TX)
6767
#define GPS_RX (RX)
6868

69+
// Peripheral definition exists
70+
#define USING_PCM_AMPLIFIER
71+
#define USING_PDM_MICROPHONE
72+
#define USING_PMU_MANAGE
73+
#define USING_INPUT_DEV_TOUCHPAD
74+
#define USING_IR_REMOTE
75+
6976
#endif /* Pins_Arduino_h */

‎variants/lilygo_twatch_ultra/pins_arduino.h‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,25 @@
1212
#define USB_MANUFACTURER "LILYGO"
1313
#define USB_PRODUCT "T-Watch-Ultra"
1414

15-
#define DISP_WIDTH (240)
16-
#define DISP_HEIGHT (296)
17-
18-
#define DISP_D0 (39)
19-
#define DISP_D1 (40)
20-
#define DISP_D2 (45)
21-
#define DISP_D3 (42)
22-
#define DISP_SCK (41)
23-
#define DISP_RST (6)
24-
#define DISP_CS (38)
25-
#define DISP_TE (37)
26-
27-
// touch screen
28-
#define TP_INT (12)
29-
#define TP_RST (46)
15+
#define DISP_WIDTH 502
16+
#define DISP_HEIGHT 410
17+
18+
// QSPI interface display
19+
#define DISP_D0 (38)
20+
#define DISP_D1 (39)
21+
#define DISP_D2 (42)
22+
#define DISP_D3 (45)
23+
#define DISP_SCK (40)
24+
#define DISP_CS (41)
25+
#define DISP_TE (6)
26+
3027
// Interrupt IO port
28+
#define TP_INT (12)
3129
#define RTC_INT (1)
3230
#define PMU_INT (7)
3331
#define NFC_INT (5)
3432
#define SENSOR_INT (8)
35-
#define NFC_RST (4)
33+
#define NFC_CS (4)
3634

3735
// PDM microphone
3836
#define MIC_SCK (17)
@@ -59,8 +57,9 @@ static const uint8_t MOSI = 34;
5957
static const uint8_t MISO = 33;
6058
static const uint8_t SCK = 35;
6159

62-
#define GPS_TX (TX)
63-
#define GPS_RX (RX)
60+
#define GPS_TX (TX)
61+
#define GPS_RX (RX)
62+
#define GPS_PPS (13)
6463

6564
#define TP_SDA (SDA)
6665
#define TP_SCL (SCL)
@@ -74,4 +73,20 @@ static const uint8_t SCK = 35;
7473
#define LORA_BUSY (48)
7574
#define LORA_IRQ (14)
7675

76+
// External expansion chip IO definition
77+
#define EXPANDS_DRV_EN (6)
78+
#define EXPANDS_DISP_EN (7)
79+
#define EXPANDS_TOUCH_RST (10)
80+
#define EXPANDS_DISP_RST (11)
81+
82+
// Peripheral definition exists
83+
#define USING_XL9555_EXPANDS
84+
#define USING_PCM_AMPLIFIER
85+
#define USING_PDM_MICROPHONE
86+
#define USING_PMU_MANAGE
87+
#define USING_INPUT_DEV_TOUCHPAD
88+
#define USING_ST25R3916
89+
#define USING_BHI260_SENSOR
90+
#define HAS_SD_CARD_SOCKET
91+
7792
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)