From 229510bb3e878cbfb77d24a7794f12e1c945537f Mon Sep 17 00:00:00 2001
From: lewisxhe <lewishe@outlook.com>
Date: Fri, 28 Mar 2025 13:47:35 +0800
Subject: [PATCH 1/6] Update LilyGo T-Watch-S3 definition and expansion options

---
 boards.txt                               | 6 ++++--
 variants/lilygo_twatch_s3/pins_arduino.h | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/boards.txt b/boards.txt
index 9190ee03a63..835e441c3b3 100644
--- a/boards.txt
+++ b/boards.txt
@@ -6070,10 +6070,12 @@ twatchs3.menu.EraseFlash.none.upload.erase_cmd=
 twatchs3.menu.EraseFlash.all=Enabled
 twatchs3.menu.EraseFlash.all.upload.erase_cmd=-e
 
-twatchs3.menu.Revision.Radio_SX1280=Radio-SX1280
-twatchs3.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
 twatchs3.menu.Revision.Radio_SX1262=Radio-SX1262
 twatchs3.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
+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
 
 ##############################################################
 
diff --git a/variants/lilygo_twatch_s3/pins_arduino.h b/variants/lilygo_twatch_s3/pins_arduino.h
index 59434161d98..b184dc9ba17 100644
--- a/variants/lilygo_twatch_s3/pins_arduino.h
+++ b/variants/lilygo_twatch_s3/pins_arduino.h
@@ -66,4 +66,11 @@ static const uint8_t SCK = 3;
 #define GPS_TX (TX)
 #define GPS_RX (RX)
 
+// Peripheral definition exists
+#define USING_PCM_AMPLIFIER
+#define USING_PDM_MICROPHONE
+#define USING_PMU_MANAGE
+#define USING_INPUT_DEV_TOUCHPAD
+#define USING_IR_REMOTE
+
 #endif /* Pins_Arduino_h */

From 5027101b0616a372306c9581dffa5f53e19e3ba2 Mon Sep 17 00:00:00 2001
From: lewisxhe <lewishe@outlook.com>
Date: Fri, 28 Mar 2025 13:49:20 +0800
Subject: [PATCH 2/6] Update LilyGo T-Watch-Ultra definition and expand options

---
 boards.txt                                  |  2 +
 variants/lilygo_twatch_ultra/pins_arduino.h | 47 ++++++++++++++-------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/boards.txt b/boards.txt
index 835e441c3b3..a458e0c5fed 100644
--- a/boards.txt
+++ b/boards.txt
@@ -6235,6 +6235,8 @@ 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_CC1101=Radio-CC1101
+twatch_ultra.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
 
 
 ##############################################################
diff --git a/variants/lilygo_twatch_ultra/pins_arduino.h b/variants/lilygo_twatch_ultra/pins_arduino.h
index 57f6c2c3fea..fed848509d0 100644
--- a/variants/lilygo_twatch_ultra/pins_arduino.h
+++ b/variants/lilygo_twatch_ultra/pins_arduino.h
@@ -12,27 +12,25 @@
 #define USB_MANUFACTURER "LILYGO"
 #define USB_PRODUCT      "T-Watch-Ultra"
 
-#define DISP_WIDTH  (240)
-#define DISP_HEIGHT (296)
-
-#define DISP_D0  (39)
-#define DISP_D1  (40)
-#define DISP_D2  (45)
-#define DISP_D3  (42)
-#define DISP_SCK (41)
-#define DISP_RST (6)
-#define DISP_CS  (38)
-#define DISP_TE  (37)
-
-// touch screen
-#define TP_INT (12)
-#define TP_RST (46)
+#define DISP_WIDTH  502
+#define DISP_HEIGHT 410
+
+// QSPI interface display
+#define DISP_D0  (38)
+#define DISP_D1  (39)
+#define DISP_D2  (42)
+#define DISP_D3  (45)
+#define DISP_SCK (40)
+#define DISP_CS  (41)
+#define DISP_TE  (6)
+
 // Interrupt IO port
+#define TP_INT (12)
 #define RTC_INT    (1)
 #define PMU_INT    (7)
 #define NFC_INT    (5)
 #define SENSOR_INT (8)
-#define NFC_RST    (4)
+#define NFC_CS     (4)
 
 // PDM microphone
 #define MIC_SCK (17)
@@ -61,6 +59,7 @@ static const uint8_t SCK = 35;
 
 #define GPS_TX (TX)
 #define GPS_RX (RX)
+#define GPS_PPS (13)
 
 #define TP_SDA (SDA)
 #define TP_SCL (SCL)
@@ -74,4 +73,20 @@ static const uint8_t SCK = 35;
 #define LORA_BUSY (48)
 #define LORA_IRQ  (14)
 
+// External expansion chip IO definition
+#define EXPANDS_DRV_EN      (6)
+#define EXPANDS_DISP_EN     (7)
+#define EXPANDS_TOUCH_RST   (10)
+#define EXPANDS_DISP_RST    (11)
+
+// Peripheral definition exists
+#define USING_XL9555_EXPANDS
+#define USING_PCM_AMPLIFIER
+#define USING_PDM_MICROPHONE
+#define USING_PMU_MANAGE
+#define USING_INPUT_DEV_TOUCHPAD
+#define USING_ST25R3916
+#define USING_BHI260_SENSOR
+#define HAS_SD_CARD_SOCKET
+
 #endif /* Pins_Arduino_h */

From 67195cfd84cf6a4c863f3c877fd29adf47fcf5f5 Mon Sep 17 00:00:00 2001
From: lewisxhe <lewishe@outlook.com>
Date: Fri, 28 Mar 2025 13:51:10 +0800
Subject: [PATCH 3/6] Added variant LilyGo-T-LoRa-Pager

---
 boards.txt                                 | 161 +++++++++++++++++++++
 variants/lilygo_tlora_pager/pins_arduino.h | 100 +++++++++++++
 2 files changed, 261 insertions(+)
 create mode 100644 variants/lilygo_tlora_pager/pins_arduino.h

diff --git a/boards.txt b/boards.txt
index a458e0c5fed..312808fd10e 100644
--- a/boards.txt
+++ b/boards.txt
@@ -6239,6 +6239,167 @@ twatch_ultra.menu.Revision.Radio_CC1101=Radio-CC1101
 twatch_ultra.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
 
 
+##############################################################
+
+tlora_pager.name=LilyGo-T-LoRa-Pager
+
+tlora_pager.bootloader.tool=esptool_py
+tlora_pager.bootloader.tool.default=esptool_py
+
+tlora_pager.upload.tool=esptool_py
+tlora_pager.upload.tool.default=esptool_py
+tlora_pager.upload.tool.network=esp_ota
+
+tlora_pager.upload.maximum_size=1310720
+tlora_pager.upload.maximum_data_size=327680
+tlora_pager.upload.flags=
+tlora_pager.upload.extra_flags=
+tlora_pager.upload.use_1200bps_touch=false
+tlora_pager.upload.wait_for_upload_port=false
+
+tlora_pager.serial.disableDTR=false
+tlora_pager.serial.disableRTS=false
+
+tlora_pager.build.tarch=xtensa
+tlora_pager.build.bootloader_addr=0x0
+tlora_pager.build.target=esp32s3
+tlora_pager.build.mcu=esp32s3
+tlora_pager.build.core=esp32
+tlora_pager.build.variant=lilygo_tlora_pager
+tlora_pager.build.board=T_LORA_PAGER
+
+tlora_pager.build.usb_mode=1
+tlora_pager.build.cdc_on_boot=1
+tlora_pager.build.msc_on_boot=0
+tlora_pager.build.dfu_on_boot=0
+tlora_pager.build.f_cpu=240000000L
+tlora_pager.build.flash_size=16MB
+tlora_pager.build.flash_freq=80m
+tlora_pager.build.flash_mode=dio
+tlora_pager.build.boot=qio
+tlora_pager.build.boot_freq=80m
+tlora_pager.build.partitions=app3M_fat9M_16MB
+tlora_pager.build.defines=-DBOARD_HAS_PSRAM -DARDUINO_T_LORA_PAGER
+tlora_pager.build.loop_core=
+tlora_pager.build.event_core=
+tlora_pager.build.psram_type=qspi
+tlora_pager.build.memory_type={build.boot}_{build.psram_type}
+
+## IDE 2.0 Seems to not update the value
+tlora_pager.menu.JTAGAdapter.default=Disabled
+tlora_pager.menu.JTAGAdapter.default.build.copy_jtag_files=0
+tlora_pager.menu.JTAGAdapter.builtin=Integrated USB JTAG
+tlora_pager.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
+tlora_pager.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+
+tlora_pager.menu.LoopCore.1=Core 1
+tlora_pager.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+tlora_pager.menu.LoopCore.0=Core 0
+tlora_pager.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+tlora_pager.menu.EventsCore.1=Core 1
+tlora_pager.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+tlora_pager.menu.EventsCore.0=Core 0
+tlora_pager.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+tlora_pager.menu.USBMode.hwcdc=Hardware CDC and JTAG
+tlora_pager.menu.USBMode.hwcdc.build.usb_mode=1
+tlora_pager.menu.USBMode.default=USB-OTG (TinyUSB)
+tlora_pager.menu.USBMode.default.build.usb_mode=0
+
+tlora_pager.menu.CDCOnBoot.default=Enabled
+tlora_pager.menu.CDCOnBoot.default.build.cdc_on_boot=1
+tlora_pager.menu.CDCOnBoot.cdc=Disabled
+tlora_pager.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
+
+tlora_pager.menu.MSCOnBoot.default=Disabled
+tlora_pager.menu.MSCOnBoot.default.build.msc_on_boot=0
+tlora_pager.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+tlora_pager.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+tlora_pager.menu.DFUOnBoot.default=Disabled
+tlora_pager.menu.DFUOnBoot.default.build.dfu_on_boot=0
+tlora_pager.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+tlora_pager.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+tlora_pager.menu.UploadMode.default=UART0 / Hardware CDC
+tlora_pager.menu.UploadMode.default.upload.use_1200bps_touch=false
+tlora_pager.menu.UploadMode.default.upload.wait_for_upload_port=false
+tlora_pager.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+tlora_pager.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+tlora_pager.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+
+tlora_pager.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+tlora_pager.menu.PartitionScheme.fatflash.build.partitions=ffat
+tlora_pager.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+tlora_pager.menu.PartitionScheme.rainmaker=RainMaker
+tlora_pager.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+tlora_pager.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+tlora_pager.menu.PartitionScheme.esp_sr_16=ESP SR 16M (3MB APP/7MB SPIFFS/2.9MB MODEL)
+tlora_pager.menu.PartitionScheme.esp_sr_16.upload.maximum_size=3145728
+tlora_pager.menu.PartitionScheme.esp_sr_16.upload.extra_flags=0xD10000 {build.path}/srmodels.bin
+tlora_pager.menu.PartitionScheme.esp_sr_16.build.partitions=esp_sr_16
+tlora_pager.menu.PartitionScheme.custom=Custom
+tlora_pager.menu.PartitionScheme.custom.build.partitions=
+tlora_pager.menu.PartitionScheme.custom.upload.maximum_size=16777216
+
+tlora_pager.menu.CPUFreq.240=240MHz (WiFi)
+tlora_pager.menu.CPUFreq.240.build.f_cpu=240000000L
+tlora_pager.menu.CPUFreq.160=160MHz (WiFi)
+tlora_pager.menu.CPUFreq.160.build.f_cpu=160000000L
+tlora_pager.menu.CPUFreq.80=80MHz (WiFi)
+tlora_pager.menu.CPUFreq.80.build.f_cpu=80000000L
+tlora_pager.menu.CPUFreq.40=40MHz
+tlora_pager.menu.CPUFreq.40.build.f_cpu=40000000L
+tlora_pager.menu.CPUFreq.20=20MHz
+tlora_pager.menu.CPUFreq.20.build.f_cpu=20000000L
+tlora_pager.menu.CPUFreq.10=10MHz
+tlora_pager.menu.CPUFreq.10.build.f_cpu=10000000L
+
+tlora_pager.menu.UploadSpeed.921600=921600
+tlora_pager.menu.UploadSpeed.921600.upload.speed=921600
+tlora_pager.menu.UploadSpeed.115200=115200
+tlora_pager.menu.UploadSpeed.115200.upload.speed=115200
+tlora_pager.menu.UploadSpeed.256000.windows=256000
+tlora_pager.menu.UploadSpeed.256000.upload.speed=256000
+tlora_pager.menu.UploadSpeed.230400.windows.upload.speed=256000
+tlora_pager.menu.UploadSpeed.230400=230400
+tlora_pager.menu.UploadSpeed.230400.upload.speed=230400
+tlora_pager.menu.UploadSpeed.460800.linux=460800
+tlora_pager.menu.UploadSpeed.460800.macosx=460800
+tlora_pager.menu.UploadSpeed.460800.upload.speed=460800
+tlora_pager.menu.UploadSpeed.512000.windows=512000
+tlora_pager.menu.UploadSpeed.512000.upload.speed=512000
+
+tlora_pager.menu.DebugLevel.none=None
+tlora_pager.menu.DebugLevel.none.build.code_debug=0
+tlora_pager.menu.DebugLevel.error=Error
+tlora_pager.menu.DebugLevel.error.build.code_debug=1
+tlora_pager.menu.DebugLevel.warn=Warn
+tlora_pager.menu.DebugLevel.warn.build.code_debug=2
+tlora_pager.menu.DebugLevel.info=Info
+tlora_pager.menu.DebugLevel.info.build.code_debug=3
+tlora_pager.menu.DebugLevel.debug=Debug
+tlora_pager.menu.DebugLevel.debug.build.code_debug=4
+tlora_pager.menu.DebugLevel.verbose=Verbose
+tlora_pager.menu.DebugLevel.verbose.build.code_debug=5
+
+tlora_pager.menu.EraseFlash.none=Disabled
+tlora_pager.menu.EraseFlash.none.upload.erase_cmd=
+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_CC1101=Radio-CC1101
+tlora_pager.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
+
 ##############################################################
 
 micros2.name=microS2
diff --git a/variants/lilygo_tlora_pager/pins_arduino.h b/variants/lilygo_tlora_pager/pins_arduino.h
new file mode 100644
index 00000000000..f27ae10e4f6
--- /dev/null
+++ b/variants/lilygo_tlora_pager/pins_arduino.h
@@ -0,0 +1,100 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#ifndef digitalPinToInterrupt
+#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
+#endif
+
+#define USB_VID          0x303a
+#define USB_PID          0x82D1
+#define USB_MANUFACTURER "LILYGO"
+#define USB_PRODUCT      "T-LoRa-Pager"
+
+// ST7796
+#define DISP_WIDTH      (222)
+#define DISP_HEIGHT     (480)
+#define SD_CS           (21)
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+//BHI260,PCF85063,BQ25896,DRV2605L,ES8311 share I2C Bus
+static const uint8_t SDA = 2;
+static const uint8_t SCL = 3;
+
+// Default sd cs pin
+static const uint8_t SS = SD_CS;
+static const uint8_t MOSI = 34;
+static const uint8_t MISO = 33;
+static const uint8_t SCK = 35;
+
+#define KB_INT          (6)
+#define KB_BACKLIGHT    (46)
+
+// Rotary
+#define ROTARY_A        (40)
+#define ROTARY_B        (41)
+#define ROTARY_C        (7)
+
+// Interrupt IO port
+#define RTC_INT         (1)
+#define NFC_INT         (5)
+#define SENSOR_INT      (8)
+#define NFC_CS          (39)
+
+// ES8311 
+#define I2S_WS          (18)
+#define I2S_SCK         (11)
+#define I2S_MCLK        (10)
+#define I2S_SDOUT       (45)
+#define I2S_SDIN        (17)
+
+// GPS
+#define GPS_TX          (12)
+#define GPS_RX          (4)
+#define GPS_PPS         (13)
+
+// LoRa, SD, ST25R3916 card share SPI bus
+#define LORA_SCK        (SCK)   // share spi bus
+#define LORA_MISO       (MISO)  // share spi bus
+#define LORA_MOSI       (MOSI)  // share spi bus
+#define LORA_CS         (36)
+#define LORA_RST        (47)
+#define LORA_BUSY       (48)
+#define LORA_IRQ        (14)
+
+// SPI interface display
+#define DISP_MOSI       (MOSI)
+#define DISP_MISO       (MISO)
+#define DISP_SCK        (SCK)
+#define DISP_RST        (-1)
+#define DISP_CS         (38)
+#define DISP_DC         (37)
+#define DISP_BL         (42)
+
+// External expansion chip IO definition
+#define EXPANDS_DRV_EN       (0)
+#define EXPANDS_AMP_EN       (1)
+#define EXPANDS_KB_RST       (2)
+#define EXPANDS_LORA_EN      (3)
+#define EXPANDS_GPS_EN       (4)
+#define EXPANDS_NFC_EN       (5)
+#define EXPANDS_DISP_RST     (6)
+#define EXPANDS_GPS_RST      (7)
+#define EXPANDS_KB_EN        (8)
+#define EXPANDS_GPIO_EN      (9)
+
+// Peripheral definition exists
+#define USING_AUDIO_CODEC
+#define USING_XL9555_EXPANDS
+#define USING_PPM_MANAGE
+#define USING_BQ_GAUGE
+#define USING_INPUT_DEV_ROTARY
+#define USING_INPUT_DEV_KEYBOARD
+#define USING_ST25R3916
+#define USING_BHI260_SENSOR
+#define HAS_SD_CARD_SOCKET
+
+#endif /* Pins_Arduino_h */

From 7c89347c088ccb4d9681dd736bf25fbec1ad81da Mon Sep 17 00:00:00 2001
From: lewisxhe <lewishe@outlook.com>
Date: Fri, 28 Mar 2025 15:43:35 +0800
Subject: [PATCH 4/6] Update partition table order

---
 boards.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boards.txt b/boards.txt
index 312808fd10e..87093e39ff1 100644
--- a/boards.txt
+++ b/boards.txt
@@ -6329,12 +6329,12 @@ tlora_pager.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
 tlora_pager.menu.UploadMode.cdc.upload.use_1200bps_touch=true
 tlora_pager.menu.UploadMode.cdc.upload.wait_for_upload_port=true
 
-tlora_pager.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
-tlora_pager.menu.PartitionScheme.fatflash.build.partitions=ffat
-tlora_pager.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
 tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
 tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
 tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+tlora_pager.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+tlora_pager.menu.PartitionScheme.fatflash.build.partitions=ffat
+tlora_pager.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
 tlora_pager.menu.PartitionScheme.rainmaker=RainMaker
 tlora_pager.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
 tlora_pager.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728

From 2c718465b9cc25f20e05da916ae5a2d3d92458c7 Mon Sep 17 00:00:00 2001
From: lewisxhe <lewishe@outlook.com>
Date: Fri, 28 Mar 2025 15:45:00 +0800
Subject: [PATCH 5/6] Update LilyGo board partition table order

---
 boards.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boards.txt b/boards.txt
index 87093e39ff1..f0df27762c2 100644
--- a/boards.txt
+++ b/boards.txt
@@ -6168,12 +6168,12 @@ twatch_ultra.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
 twatch_ultra.menu.UploadMode.cdc.upload.use_1200bps_touch=true
 twatch_ultra.menu.UploadMode.cdc.upload.wait_for_upload_port=true
 
-twatch_ultra.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
-twatch_ultra.menu.PartitionScheme.fatflash.build.partitions=ffat
-twatch_ultra.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
 twatch_ultra.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
 twatch_ultra.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
 twatch_ultra.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+twatch_ultra.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+twatch_ultra.menu.PartitionScheme.fatflash.build.partitions=ffat
+twatch_ultra.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
 twatch_ultra.menu.PartitionScheme.rainmaker=RainMaker
 twatch_ultra.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
 twatch_ultra.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080

From 1292b0715344c47690f0e30fbe78a702da4c7b05 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Fri, 28 Mar 2025 07:55:48 +0000
Subject: [PATCH 6/6] ci(pre-commit): Apply automatic fixes

---
 variants/lilygo_tlora_pager/pins_arduino.h  | 92 ++++++++++-----------
 variants/lilygo_twatch_ultra/pins_arduino.h | 14 ++--
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/variants/lilygo_tlora_pager/pins_arduino.h b/variants/lilygo_tlora_pager/pins_arduino.h
index f27ae10e4f6..1a1d8e5da3f 100644
--- a/variants/lilygo_tlora_pager/pins_arduino.h
+++ b/variants/lilygo_tlora_pager/pins_arduino.h
@@ -13,9 +13,9 @@
 #define USB_PRODUCT      "T-LoRa-Pager"
 
 // ST7796
-#define DISP_WIDTH      (222)
-#define DISP_HEIGHT     (480)
-#define SD_CS           (21)
+#define DISP_WIDTH  (222)
+#define DISP_HEIGHT (480)
+#define SD_CS       (21)
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
@@ -30,61 +30,61 @@ static const uint8_t MOSI = 34;
 static const uint8_t MISO = 33;
 static const uint8_t SCK = 35;
 
-#define KB_INT          (6)
-#define KB_BACKLIGHT    (46)
+#define KB_INT       (6)
+#define KB_BACKLIGHT (46)
 
 // Rotary
-#define ROTARY_A        (40)
-#define ROTARY_B        (41)
-#define ROTARY_C        (7)
+#define ROTARY_A (40)
+#define ROTARY_B (41)
+#define ROTARY_C (7)
 
 // Interrupt IO port
-#define RTC_INT         (1)
-#define NFC_INT         (5)
-#define SENSOR_INT      (8)
-#define NFC_CS          (39)
-
-// ES8311 
-#define I2S_WS          (18)
-#define I2S_SCK         (11)
-#define I2S_MCLK        (10)
-#define I2S_SDOUT       (45)
-#define I2S_SDIN        (17)
+#define RTC_INT    (1)
+#define NFC_INT    (5)
+#define SENSOR_INT (8)
+#define NFC_CS     (39)
+
+// ES8311
+#define I2S_WS    (18)
+#define I2S_SCK   (11)
+#define I2S_MCLK  (10)
+#define I2S_SDOUT (45)
+#define I2S_SDIN  (17)
 
 // GPS
-#define GPS_TX          (12)
-#define GPS_RX          (4)
-#define GPS_PPS         (13)
+#define GPS_TX  (12)
+#define GPS_RX  (4)
+#define GPS_PPS (13)
 
 // LoRa, SD, ST25R3916 card share SPI bus
-#define LORA_SCK        (SCK)   // share spi bus
-#define LORA_MISO       (MISO)  // share spi bus
-#define LORA_MOSI       (MOSI)  // share spi bus
-#define LORA_CS         (36)
-#define LORA_RST        (47)
-#define LORA_BUSY       (48)
-#define LORA_IRQ        (14)
+#define LORA_SCK  (SCK)   // share spi bus
+#define LORA_MISO (MISO)  // share spi bus
+#define LORA_MOSI (MOSI)  // share spi bus
+#define LORA_CS   (36)
+#define LORA_RST  (47)
+#define LORA_BUSY (48)
+#define LORA_IRQ  (14)
 
 // SPI interface display
-#define DISP_MOSI       (MOSI)
-#define DISP_MISO       (MISO)
-#define DISP_SCK        (SCK)
-#define DISP_RST        (-1)
-#define DISP_CS         (38)
-#define DISP_DC         (37)
-#define DISP_BL         (42)
+#define DISP_MOSI (MOSI)
+#define DISP_MISO (MISO)
+#define DISP_SCK  (SCK)
+#define DISP_RST  (-1)
+#define DISP_CS   (38)
+#define DISP_DC   (37)
+#define DISP_BL   (42)
 
 // External expansion chip IO definition
-#define EXPANDS_DRV_EN       (0)
-#define EXPANDS_AMP_EN       (1)
-#define EXPANDS_KB_RST       (2)
-#define EXPANDS_LORA_EN      (3)
-#define EXPANDS_GPS_EN       (4)
-#define EXPANDS_NFC_EN       (5)
-#define EXPANDS_DISP_RST     (6)
-#define EXPANDS_GPS_RST      (7)
-#define EXPANDS_KB_EN        (8)
-#define EXPANDS_GPIO_EN      (9)
+#define EXPANDS_DRV_EN   (0)
+#define EXPANDS_AMP_EN   (1)
+#define EXPANDS_KB_RST   (2)
+#define EXPANDS_LORA_EN  (3)
+#define EXPANDS_GPS_EN   (4)
+#define EXPANDS_NFC_EN   (5)
+#define EXPANDS_DISP_RST (6)
+#define EXPANDS_GPS_RST  (7)
+#define EXPANDS_KB_EN    (8)
+#define EXPANDS_GPIO_EN  (9)
 
 // Peripheral definition exists
 #define USING_AUDIO_CODEC
diff --git a/variants/lilygo_twatch_ultra/pins_arduino.h b/variants/lilygo_twatch_ultra/pins_arduino.h
index fed848509d0..c90c1ba584e 100644
--- a/variants/lilygo_twatch_ultra/pins_arduino.h
+++ b/variants/lilygo_twatch_ultra/pins_arduino.h
@@ -25,7 +25,7 @@
 #define DISP_TE  (6)
 
 // Interrupt IO port
-#define TP_INT (12)
+#define TP_INT     (12)
 #define RTC_INT    (1)
 #define PMU_INT    (7)
 #define NFC_INT    (5)
@@ -57,8 +57,8 @@ static const uint8_t MOSI = 34;
 static const uint8_t MISO = 33;
 static const uint8_t SCK = 35;
 
-#define GPS_TX (TX)
-#define GPS_RX (RX)
+#define GPS_TX  (TX)
+#define GPS_RX  (RX)
 #define GPS_PPS (13)
 
 #define TP_SDA (SDA)
@@ -74,10 +74,10 @@ static const uint8_t SCK = 35;
 #define LORA_IRQ  (14)
 
 // External expansion chip IO definition
-#define EXPANDS_DRV_EN      (6)
-#define EXPANDS_DISP_EN     (7)
-#define EXPANDS_TOUCH_RST   (10)
-#define EXPANDS_DISP_RST    (11)
+#define EXPANDS_DRV_EN    (6)
+#define EXPANDS_DISP_EN   (7)
+#define EXPANDS_TOUCH_RST (10)
+#define EXPANDS_DISP_RST  (11)
 
 // Peripheral definition exists
 #define USING_XL9555_EXPANDS