Skip to content

Commit 5df9b64

Browse files
lewisxhepre-commit-ci-lite[bot]
lewisxhe
and
pre-commit-ci-lite[bot]
authored
Update LilyGo T-Watch-S3-Ultra and T-LoRa-Pager variants (#11299)
* Update LilyGo variants * Update T-Watch-S3-Ultra variants * 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 8ed97f6 commit 5df9b64

File tree

4 files changed

+41
-27
lines changed

4 files changed

+41
-27
lines changed

‎boards.txt‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6007,12 +6007,12 @@ twatchs3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
60076007
twatchs3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
60086008
twatchs3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
60096009

6010-
twatchs3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
6011-
twatchs3.menu.PartitionScheme.fatflash.build.partitions=ffat
6012-
twatchs3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
60136010
twatchs3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
60146011
twatchs3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
60156012
twatchs3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
6013+
twatchs3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
6014+
twatchs3.menu.PartitionScheme.fatflash.build.partitions=ffat
6015+
twatchs3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
60166016
twatchs3.menu.PartitionScheme.rainmaker=RainMaker
60176017
twatchs3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
60186018
twatchs3.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
@@ -6076,6 +6076,10 @@ twatchs3.menu.Revision.Radio_SX1280=Radio-SX1280
60766076
twatchs3.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
60776077
twatchs3.menu.Revision.Radio_CC1101=Radio-CC1101
60786078
twatchs3.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
6079+
twatchs3.menu.Revision.Radio_LR1121=Radio-LR1121
6080+
twatchs3.menu.Revision.Radio_LR1121.build.board=LILYGO_LORA_LR1121
6081+
twatchs3.menu.Revision.Radio_SI4432=Radio-SI4432
6082+
twatchs3.menu.Revision.Radio_SI4432.build.board=LILYGO_LORA_SI4432
60796083

60806084
##############################################################
60816085

@@ -6231,13 +6235,16 @@ twatch_ultra.menu.EraseFlash.none.upload.erase_cmd=
62316235
twatch_ultra.menu.EraseFlash.all=Enabled
62326236
twatch_ultra.menu.EraseFlash.all.upload.erase_cmd=-e
62336237

6234-
twatch_ultra.menu.Revision.Radio_SX1280=Radio-SX1280
6235-
twatch_ultra.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
62366238
twatch_ultra.menu.Revision.Radio_SX1262=Radio-SX1262
62376239
twatch_ultra.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
6240+
twatch_ultra.menu.Revision.Radio_SX1280=Radio-SX1280
6241+
twatch_ultra.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
62386242
twatch_ultra.menu.Revision.Radio_CC1101=Radio-CC1101
62396243
twatch_ultra.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
6240-
6244+
twatch_ultra.menu.Revision.Radio_LR1121=Radio-LR1121
6245+
twatch_ultra.menu.Revision.Radio_LR1121.build.board=LILYGO_LORA_LR1121
6246+
twatch_ultra.menu.Revision.Radio_SI4432=Radio-SI4432
6247+
twatch_ultra.menu.Revision.Radio_SI4432.build.board=LILYGO_LORA_SI4432
62416248

62426249
##############################################################
62436250

@@ -6393,12 +6400,16 @@ tlora_pager.menu.EraseFlash.all=Enabled
63936400
tlora_pager.menu.EraseFlash.all.upload.erase_cmd=-e
63946401

63956402

6396-
tlora_pager.menu.Revision.Radio_SX1280=Radio-SX1280
6397-
tlora_pager.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
63986403
tlora_pager.menu.Revision.Radio_SX1262=Radio-SX1262
63996404
tlora_pager.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
6405+
tlora_pager.menu.Revision.Radio_SX1280=Radio-SX1280
6406+
tlora_pager.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
64006407
tlora_pager.menu.Revision.Radio_CC1101=Radio-CC1101
64016408
tlora_pager.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
6409+
tlora_pager.menu.Revision.Radio_LR1121=Radio-LR1121
6410+
tlora_pager.menu.Revision.Radio_LR1121.build.board=LILYGO_LORA_LR1121
6411+
tlora_pager.menu.Revision.Radio_SI4432=Radio-SI4432
6412+
tlora_pager.menu.Revision.Radio_SI4432.build.board=LILYGO_LORA_SI4432
64026413

64036414
##############################################################
64046415

‎variants/lilygo_tlora_pager/pins_arduino.h‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
static const uint8_t TX = 43;
2121
static const uint8_t RX = 44;
2222

23-
//BHI260,PCF85063,BQ25896,DRV2605L,ES8311 share I2C Bus
24-
static const uint8_t SDA = 2;
25-
static const uint8_t SCL = 3;
23+
// BHI260,PCF85063,BQ25896,DRV2605L,ES8311 share I2C Bus
24+
static const uint8_t SDA = 3;
25+
static const uint8_t SCL = 2;
2626

2727
// Default sd cs pin
2828
static const uint8_t SS = SD_CS;
@@ -75,16 +75,18 @@ static const uint8_t SCK = 35;
7575
#define DISP_BL (42)
7676

7777
// 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)
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_GPS_RST (7)
85+
#define EXPANDS_KB_EN (8)
86+
#define EXPANDS_GPIO_EN (9)
87+
#define EXPANDS_SD_DET (10)
88+
#define EXPANDS_SD_PULLEN (11)
89+
#define EXPANDS_SD_EN (12)
8890

8991
// Peripheral definition exists
9092
#define USING_AUDIO_CODEC

‎variants/lilygo_twatch_s3/pins_arduino.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
static const uint8_t TX = 42;
4545
static const uint8_t RX = 41;
4646

47-
//BHI260,PCF85063,AXP2101,DRV2605L,PN532 share I2C Bus
47+
// BMA423,PCF8563,AXP2101,DRV2605L share I2C Bus
4848
static const uint8_t SDA = 10;
4949
static const uint8_t SCL = 11;
5050

‎variants/lilygo_twatch_ultra/pins_arduino.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#define DISP_D3 (45)
2323
#define DISP_SCK (40)
2424
#define DISP_CS (41)
25+
#define DISP_RST (37)
2526
#define DISP_TE (6)
2627

2728
// Interrupt IO port
@@ -47,9 +48,9 @@
4748
static const uint8_t TX = 43;
4849
static const uint8_t RX = 44;
4950

50-
//BHI260,PCF85063,AXP2101,DRV2605L,PN532 share I2C Bus
51-
static const uint8_t SDA = 2;
52-
static const uint8_t SCL = 3;
51+
// BHI260,PCF85063,AXP2101,DRV2605L share I2C Bus
52+
static const uint8_t SDA = 3;
53+
static const uint8_t SCL = 2;
5354

5455
// Default sd cs pin
5556
static const uint8_t SS = SD_CS;
@@ -76,8 +77,8 @@ static const uint8_t SCK = 35;
7677
// External expansion chip IO definition
7778
#define EXPANDS_DRV_EN (6)
7879
#define EXPANDS_DISP_EN (7)
79-
#define EXPANDS_TOUCH_RST (10)
80-
#define EXPANDS_DISP_RST (11)
80+
#define EXPANDS_TOUCH_RST (8)
81+
#define EXPANDS_SD_DET (10)
8182

8283
// Peripheral definition exists
8384
#define USING_XL9555_EXPANDS

0 commit comments

Comments
 (0)