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>

Author: lewisxhe

boards.txt

@@ -6007,12 +6007,12 @@ twatchs3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
 twatchs3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
 twatchs3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
 
-twatchs3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
-twatchs3.menu.PartitionScheme.fatflash.build.partitions=ffat
-twatchs3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
 twatchs3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
 twatchs3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
 twatchs3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+twatchs3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+twatchs3.menu.PartitionScheme.fatflash.build.partitions=ffat
+twatchs3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
 twatchs3.menu.PartitionScheme.rainmaker=RainMaker
 twatchs3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
 twatchs3.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
@@ -6076,6 +6076,10 @@ twatchs3.menu.Revision.Radio_SX1280=Radio-SX1280
 twatchs3.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
 twatchs3.menu.Revision.Radio_CC1101=Radio-CC1101
 twatchs3.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
+twatchs3.menu.Revision.Radio_LR1121=Radio-LR1121
+twatchs3.menu.Revision.Radio_LR1121.build.board=LILYGO_LORA_LR1121
+twatchs3.menu.Revision.Radio_SI4432=Radio-SI4432
+twatchs3.menu.Revision.Radio_SI4432.build.board=LILYGO_LORA_SI4432
 
 ##############################################################
 
@@ -6231,13 +6235,16 @@ twatch_ultra.menu.EraseFlash.none.upload.erase_cmd=
 twatch_ultra.menu.EraseFlash.all=Enabled
 twatch_ultra.menu.EraseFlash.all.upload.erase_cmd=-e
 
-twatch_ultra.menu.Revision.Radio_SX1280=Radio-SX1280
-twatch_ultra.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
 twatch_ultra.menu.Revision.Radio_SX1262=Radio-SX1262
 twatch_ultra.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
+twatch_ultra.menu.Revision.Radio_SX1280=Radio-SX1280
+twatch_ultra.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
 twatch_ultra.menu.Revision.Radio_CC1101=Radio-CC1101
 twatch_ultra.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
-
+twatch_ultra.menu.Revision.Radio_LR1121=Radio-LR1121
+twatch_ultra.menu.Revision.Radio_LR1121.build.board=LILYGO_LORA_LR1121
+twatch_ultra.menu.Revision.Radio_SI4432=Radio-SI4432
+twatch_ultra.menu.Revision.Radio_SI4432.build.board=LILYGO_LORA_SI4432
 
 ##############################################################
 
@@ -6393,12 +6400,16 @@ tlora_pager.menu.EraseFlash.all=Enabled
 tlora_pager.menu.EraseFlash.all.upload.erase_cmd=-e
 
 
-tlora_pager.menu.Revision.Radio_SX1280=Radio-SX1280
-tlora_pager.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
 tlora_pager.menu.Revision.Radio_SX1262=Radio-SX1262
 tlora_pager.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
+tlora_pager.menu.Revision.Radio_SX1280=Radio-SX1280
+tlora_pager.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
 tlora_pager.menu.Revision.Radio_CC1101=Radio-CC1101
 tlora_pager.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
+tlora_pager.menu.Revision.Radio_LR1121=Radio-LR1121
+tlora_pager.menu.Revision.Radio_LR1121.build.board=LILYGO_LORA_LR1121
+tlora_pager.menu.Revision.Radio_SI4432=Radio-SI4432
+tlora_pager.menu.Revision.Radio_SI4432.build.board=LILYGO_LORA_SI4432
 
 ##############################################################
 

variants/lilygo_tlora_pager/pins_arduino.h

@@ -20,9 +20,9 @@
 staticconstuint8_tTX=43;
 staticconstuint8_tRX=44;
 
-//BHI260,PCF85063,BQ25896,DRV2605L,ES8311 share I2C Bus
-staticconstuint8_tSDA=2;
-staticconstuint8_tSCL=3;
+//BHI260,PCF85063,BQ25896,DRV2605L,ES8311 share I2C Bus
+staticconstuint8_tSDA=3;
+staticconstuint8_tSCL=2;
 
 // Default sd cs pin
 staticconstuint8_tSS=SD_CS;
@@ -75,16 +75,18 @@ static const uint8_t SCK = 35;
 #defineDISP_BL (42)
 
 // External expansion chip IO definition
-#defineEXPANDS_DRV_EN (0)
-#defineEXPANDS_AMP_EN (1)
-#defineEXPANDS_KB_RST (2)
-#defineEXPANDS_LORA_EN (3)
-#defineEXPANDS_GPS_EN (4)
-#defineEXPANDS_NFC_EN (5)
-#defineEXPANDS_DISP_RST (6)
-#defineEXPANDS_GPS_RST (7)
-#defineEXPANDS_KB_EN (8)
-#defineEXPANDS_GPIO_EN (9)
+#defineEXPANDS_DRV_EN (0)
+#defineEXPANDS_AMP_EN (1)
+#defineEXPANDS_KB_RST (2)
+#defineEXPANDS_LORA_EN (3)
+#defineEXPANDS_GPS_EN (4)
+#defineEXPANDS_NFC_EN (5)
+#defineEXPANDS_GPS_RST (7)
+#defineEXPANDS_KB_EN (8)
+#defineEXPANDS_GPIO_EN (9)
+#defineEXPANDS_SD_DET (10)
+#defineEXPANDS_SD_PULLEN (11)
+#defineEXPANDS_SD_EN (12)
 
 // Peripheral definition exists
 #defineUSING_AUDIO_CODEC

variants/lilygo_twatch_s3/pins_arduino.h

@@ -44,7 +44,7 @@
 staticconstuint8_tTX=42;
 staticconstuint8_tRX=41;
 
-//BHI260,PCF85063,AXP2101,DRV2605L,PN532 share I2C Bus
+// BMA423,PCF8563,AXP2101,DRV2605L share I2C Bus
 staticconstuint8_tSDA=10;
 staticconstuint8_tSCL=11;
 

variants/lilygo_twatch_ultra/pins_arduino.h

@@ -22,6 +22,7 @@
 #defineDISP_D3 (45)
 #defineDISP_SCK (40)
 #defineDISP_CS (41)
+#defineDISP_RST (37)
 #defineDISP_TE (6)
 
 // Interrupt IO port
@@ -47,9 +48,9 @@
 staticconstuint8_tTX=43;
 staticconstuint8_tRX=44;
 
-//BHI260,PCF85063,AXP2101,DRV2605L,PN532 share I2C Bus
-staticconstuint8_tSDA=2;
-staticconstuint8_tSCL=3;
+//BHI260,PCF85063,AXP2101,DRV2605L share I2C Bus
+staticconstuint8_tSDA=3;
+staticconstuint8_tSCL=2;
 
 // Default sd cs pin
 staticconstuint8_tSS=SD_CS;
@@ -76,8 +77,8 @@ static const uint8_t SCK = 35;
 // External expansion chip IO definition
 #defineEXPANDS_DRV_EN (6)
 #defineEXPANDS_DISP_EN (7)
-#defineEXPANDS_TOUCH_RST (10)
-#defineEXPANDS_DISP_RST (11)
+#defineEXPANDS_TOUCH_RST (8)
+#defineEXPANDS_SD_DET (10)
 
 // Peripheral definition exists
 #defineUSING_XL9555_EXPANDS