Merge pull request #82 from tobozo/1.5.0

1.5.0
tobozo · Oct 1, 2023 · c826ba6 · c826ba6
2 parents f80d1f3 + 2f95acc
commit c826ba6
Show file tree

Hide file tree

Showing 31 changed files with 1,563 additions and 68 deletions.
diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml
@@ -38,18 +38,23 @@ jobs:
           #- 2.0.2
           #- 2.0.3
           #- 2.0.4
-          - 2.0.5
-          - 2.0.6
-          - 2.0.7
-          - 2.0.8
-          - 2.0.9
+          #- 2.0.5
+          #- 2.0.6
+          # - 2.0.7
+          # - 2.0.8
+          # - 2.0.9
+          - 2.0.11
+          - 2.0.12
+          - 2.0.13
+          - latest
 
         board:
           # Supported boards fancy names
           - esp32
           - esp32wroverkit
           - m5stack-core2
           - m5stack-core-esp32
+          - m5stack-cores3
           - m5stick-c
           - m5stack-fire
           - twatch
@@ -59,6 +64,7 @@ jobs:
           - odroid_esp32
 
         exclude:
+          - { board: m5stack-cores3 }
           - { board: esp32wroverkit, platform-version: 1.0.6 } # No ESP32-Wrover-Kit board profile before 2.0.0
           - { board: esp32s3box, platform-version: 1.0.6 } # No esp32s3box support before 2.0.3
           #- { board: esp32s3box, platform-version: 2.0.0 } # No esp32s3box support before 2.0.3
@@ -68,6 +74,7 @@ jobs:
 
         include:
           # testable boards
+          - { board: m5stack-cores3, platform-version: latest }
           - board: esp32
           - board: esp32wroverkit
           - board: m5stack-core2
@@ -87,11 +94,15 @@ jobs:
           #- platform-version: 2.0.2
           #- platform-version: 2.0.3
           #- platform-version: 2.0.4
-          - platform-version: 2.0.5
-          - platform-version: 2.0.6
-          - platform-version: 2.0.7
-          - platform-version: 2.0.8
-          - platform-version: 2.0.9
+          #- platform-version: 2.0.5
+          #- platform-version: 2.0.6
+          # - platform-version: 2.0.7
+          # - platform-version: 2.0.8
+          # - platform-version: 2.0.9
+          - platform-version: 2.0.11
+          - platform-version: 2.0.12
+          - platform-version: 2.0.13
+          - platform-version: latest
 
       fail-fast: false
 
@@ -109,9 +120,10 @@ jobs:
           path: CustomLGFX # must contain string "Custom"
 
       - name: ${{ matrix.board }}
-        uses: ArminJo/arduino-test-compile@v3
+        uses: ArminJo/arduino-test-compile@master
         with:
-          platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
+          # platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
+          platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
           arduino-board-fqbn: esp32:esp32:${{ matrix.board }}
           arduino-platform: esp32:esp32@${{ matrix.platform-version }}
           #required-libraries: LovyanGFX

diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml
@@ -44,11 +44,15 @@ jobs:
           #- 2.0.2
           #- 2.0.3
           #- 2.0.4
-          - 2.0.5
-          - 2.0.6
-          - 2.0.7
-          - 2.0.8
+          # - 2.0.5
+          # - 2.0.6
+          # - 2.0.7
+          # - 2.0.8
           - 2.0.9
+          - 2.0.10
+          - 2.0.11
+          - 2.0.12
+          - 2.0.13
 
         board:
           - esp32
@@ -64,15 +68,16 @@ jobs:
           - ttgo-t1
           - CoreS3
           #- ttgo-lora32-v2
+          - TDeck
 
         exclude:
           - { board: esp32s3box, platform-version: 1.0.6 }
           #- { board: esp32s3box, platform-version: 2.0.0 }
           #- { board: esp32s3box, platform-version: 2.0.1 }
           #- { board: esp32s3box, platform-version: 2.0.2 }
           #- { board: esp32s3box, platform-version: 2.0.4 }
-#          - board: esp-wrover-kit
-#            platform-version: 1.0.6
+          - { board: TDeck, platform-version: 1.0.6 }
+          #- { board: esp-wrover-kit, platform-version: 1.0.6}
           - { board: m5stack-core2, platform-version: 1.0.6 } # M5Core2.h broken I2S support with 1.0.6
           - { board: CoreS3, platform-version: 1.0.6 } # M5Core2.h broken I2S support with 1.0.6
           #- { board: m5stack-core2, platform-version: 2.0.0 } # M5Core2.h broken I2S support with 2.0.0
@@ -85,11 +90,15 @@ jobs:
           #- platform-version: 2.0.2
           #- platform-version: 2.0.3
           #- platform-version: 2.0.4
-          - platform-version: 2.0.5
-          - platform-version: 2.0.6
-          - platform-version: 2.0.7
-          - platform-version: 2.0.8
-          - platform-version: 2.0.9
+          # - platform-version: 2.0.5
+          # - platform-version: 2.0.6
+          # - platform-version: 2.0.7
+          # - platform-version: 2.0.8
+          # - platform-version: 2.0.9
+          - platform-version: 2.0.10
+          - platform-version: 2.0.11
+          - platform-version: 2.0.12
+          - platform-version: 2.0.13
           - board: esp32
           - board: m5stick-c
           - board: m5stack-core-esp32
@@ -102,6 +111,7 @@ jobs:
           - board: ttgo-t-watch
           - board: ttgo-t1
           - board: CoreS3
+          - board: TDeck
 
       fail-fast: false
     steps:

diff --git a/README.md b/README.md
@@ -13,15 +13,17 @@ This library is a *substitute* of the original [M5Stack](https://github.com/m5st
   - [M5Stack Classic](https://m5stack.com/products/basic-core-iot-development-kit)
   - [M5Stack Fire](https://m5stack.com/collections/m5-core/products/fire-iot-development-kit)
   - [M5Stack Core2](https://m5stack.com/products/m5stack-core2-esp32-iot-development-kit)
+  - [M5Stack CoreS3](https://m5stack.com/products/m5stack-cores3-esp32s3-lotdevelopment-kit)
   - [M5StickC](https://m5stack.com/collections/m5-core/products/stick-c)
+  - [LilyGo T-Deck](https://www.lilygo.cc/products/t-deck)
   - [Odroid-Go](https://www.hardkernel.com/shop/odroid-go/)
   - [ESP32-S3-Box](https://github.com/espressif/esp-box)
   - [D-Duino-32-XS](https://www.tindie.com/products/lspoplove/dstike-d-duino-32-xs/)
   - [LoLin D32-Pro](https://www.aliexpress.com/item/32883116057.html)
   - [ESP32-Wrover-Kit (v4.1, v4.2, v4.3)](https://www.sparkfun.com/products/14917)
   - [Lilygo TTGO-TS](https://www.banggood.com/LILYGO-TTGO-TS-ESP32-1_44-Inch-TFT-MicroSD-Card-Slot-Speakers-bluetooth-Wifi-Module-p-1273383.html)
   - [Lilygo TTGO-Twatch](http://www.lilygo.cn/prod_view.aspx?TypeId=50053&Id=1290)
-  - [Soon] Lilygo TTGO-LoRa32 (v1, v2, v2.1)
+  - [Lilygo TTGO-LoRa32 v2](https://www.lilygo.cc/products/lora3)
 
 
 
@@ -114,3 +116,4 @@ Sketch compilation can eventually be tuned-up to a specific device by using macr
   - [Nochi](https://github.com/shikarunochi)
   - [こばさん](https://github.com/wakwak-koba)
   - [Illustration By Jacopo Ligozzi](https://commons.wikimedia.org/w/index.php?curid=53514521)
+  - [M5Widgets By @Kongduino](https://github.com/Kongduino)
diff --git a/assets/sonic-durian.jpg b/assets/sonic-durian.jpg
diff --git a/boards/boards.local.txt b/boards/boards.local.txt
@@ -1,3 +1,152 @@
+### Lilygo T-Deck (ESP32-S3 based)
+
+lilygo_t_deck.name=LilyGo T-Deck
+lilygo_t_deck.vid.0=0x303a
+lilygo_t_deck.pid.0=0x1001
+
+lilygo_t_deck.bootloader.tool=esptool_py
+lilygo_t_deck.bootloader.tool.default=esptool_py
+
+lilygo_t_deck.upload.tool=esptool_py
+lilygo_t_deck.upload.tool.default=esptool_py
+lilygo_t_deck.upload.tool.network=esp_ota
+
+lilygo_t_deck.upload.maximum_size=3145728
+lilygo_t_deck.upload.maximum_data_size=327680
+lilygo_t_deck.upload.speed=921600
+lilygo_t_deck.upload.flags=
+lilygo_t_deck.upload.extra_flags=
+lilygo_t_deck.upload.use_1200bps_touch=false
+lilygo_t_deck.upload.wait_for_upload_port=false
+
+lilygo_t_deck.serial.disableDTR=false
+lilygo_t_deck.serial.disableRTS=false
+
+lilygo_t_deck.build.tarch=xtensa
+lilygo_t_deck.build.bootloader_addr=0x0
+lilygo_t_deck.build.target=esp32s3
+lilygo_t_deck.build.mcu=esp32s3
+lilygo_t_deck.build.core=esp32
+lilygo_t_deck.build.variant=lilygo_t_deck
+lilygo_t_deck.build.board=LILYGO_T_DECK
+
+lilygo_t_deck.build.usb_mode=1
+lilygo_t_deck.build.cdc_on_boot=1
+lilygo_t_deck.build.msc_on_boot=0
+lilygo_t_deck.build.dfu_on_boot=0
+lilygo_t_deck.build.f_cpu=240000000L
+lilygo_t_deck.build.flash_size=16MB
+lilygo_t_deck.build.flash_freq=80m
+lilygo_t_deck.build.flash_mode=dio
+lilygo_t_deck.build.boot=qio
+lilygo_t_deck.build.boot_freq=80m
+lilygo_t_deck.build.partitions=default_16MB
+lilygo_t_deck.build.defines=-DBOARD_HAS_PSRAM
+lilygo_t_deck.build.loop_core=
+lilygo_t_deck.build.event_core=
+lilygo_t_deck.build.psram_type=opi
+lilygo_t_deck.build.memory_type={build.boot}_{build.psram_type}
+
+## IDE 2.0 Seems to not update the value
+lilygo_t_deck.menu.JTAGAdapter.default=Disabled
+lilygo_t_deck.menu.JTAGAdapter.default.build.copy_jtag_files=0
+lilygo_t_deck.menu.JTAGAdapter.builtin=Integrated USB JTAG
+lilygo_t_deck.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
+lilygo_t_deck.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+
+lilygo_t_deck.menu.LoopCore.1=Core 1
+lilygo_t_deck.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+lilygo_t_deck.menu.LoopCore.0=Core 0
+lilygo_t_deck.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+lilygo_t_deck.menu.EventsCore.1=Core 1
+lilygo_t_deck.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+lilygo_t_deck.menu.EventsCore.0=Core 0
+lilygo_t_deck.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+# lilygo_t_deck.menu.USBMode.hwcdc=Hardware CDC and JTAG
+# lilygo_t_deck.menu.USBMode.hwcdc.build.usb_mode=1
+# lilygo_t_deck.menu.USBMode.default=USB-OTG (TinyUSB)
+# lilygo_t_deck.menu.USBMode.default.build.usb_mode=0
+
+lilygo_t_deck.menu.USBMode.hwcdc=Hardware CDC and JTAG
+lilygo_t_deck.menu.USBMode.hwcdc.build.usb_mode=1
+lilygo_t_deck.menu.USBMode.hwcdc.upload.use_1200bps_touch=false
+lilygo_t_deck.menu.USBMode.hwcdc.upload.wait_for_upload_port=false
+lilygo_t_deck.menu.USBMode.default=USB-OTG
+lilygo_t_deck.menu.USBMode.default.build.usb_mode=0
+lilygo_t_deck.menu.USBMode.default.upload.use_1200bps_touch=true
+lilygo_t_deck.menu.USBMode.default.upload.wait_for_upload_port=true
+
+lilygo_t_deck.menu.CDCOnBoot.cdc=Enabled
+lilygo_t_deck.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+lilygo_t_deck.menu.CDCOnBoot.default=Disabled
+lilygo_t_deck.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+lilygo_t_deck.menu.MSCOnBoot.default=Disabled
+lilygo_t_deck.menu.MSCOnBoot.default.build.msc_on_boot=0
+lilygo_t_deck.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+lilygo_t_deck.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+lilygo_t_deck.menu.DFUOnBoot.default=Disabled
+lilygo_t_deck.menu.DFUOnBoot.default.build.dfu_on_boot=0
+lilygo_t_deck.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+lilygo_t_deck.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+lilygo_t_deck.menu.UploadMode.default=UART0 / Hardware CDC
+lilygo_t_deck.menu.UploadMode.default.upload.use_1200bps_touch=false
+lilygo_t_deck.menu.UploadMode.default.upload.wait_for_upload_port=false
+lilygo_t_deck.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+lilygo_t_deck.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+lilygo_t_deck.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+
+lilygo_t_deck.menu.PartitionScheme.default_16MB=Default 16MB with spiffs (2x 6.5 MB APP/3.6MB SPIFFS)
+lilygo_t_deck.menu.PartitionScheme.default_16MB.build.partitions=default_16MB
+lilygo_t_deck.menu.PartitionScheme.default_16MB.upload.maximum_size=6553600
+lilygo_t_deck.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+lilygo_t_deck.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+lilygo_t_deck.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+lilygo_t_deck.menu.PartitionScheme.rainmaker=RainMaker
+lilygo_t_deck.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+lilygo_t_deck.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+lilygo_t_deck.menu.PartitionScheme.default=4MB with spiffs (2x 1.2MB APP/1.5MB SPIFFS)
+lilygo_t_deck.menu.PartitionScheme.default.build.partitions=default
+lilygo_t_deck.menu.PartitionScheme.defaultffat=4MB with ffat (2x 1.2MB APP/1.5MB FATFS)
+lilygo_t_deck.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+lilygo_t_deck.menu.PartitionScheme.default_8MB=8M with spiffs (2x 3MB APP/1.5MB SPIFFS)
+lilygo_t_deck.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+lilygo_t_deck.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+lilygo_t_deck.menu.PartitionScheme.large_spiffs=16MB with Large SPIFFS (2x 4MB APP/7MB SPIFFS)
+lilygo_t_deck.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
+lilygo_t_deck.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824
+lilygo_t_deck.menu.PartitionScheme.factory_4apps=16MB+Factory (4x 3MB APP/2MB SPIFFS)
+lilygo_t_deck.menu.PartitionScheme.factory_4apps.build.custom_partitions=partitions_16MB_factory_4_apps
+# lilygo_t_deck.menu.PartitionScheme.factory_4apps.upload.extra_flags=0xc10000 "{runtime.platform.path}/variants/{build.variant}/firmware.bin"
+lilygo_t_deck.menu.PartitionScheme.factory_4apps.upload.maximum_size=3145728
+lilygo_t_deck.menu.PartitionScheme.factory_6apps=16MB+Factory (6x 2MB APP/2MB SPIFFS)
+lilygo_t_deck.menu.PartitionScheme.factory_6apps.build.custom_partitions=partitions_16MB_factory_6_apps
+# lilygo_t_deck.menu.PartitionScheme.factory_6apps.upload.extra_flags=0xc10000 "{runtime.platform.path}/variants/{build.variant}/firmware.bin"
+lilygo_t_deck.menu.PartitionScheme.factory_6apps.upload.maximum_size=2097152
+
+lilygo_t_deck.menu.DebugLevel.none=None
+lilygo_t_deck.menu.DebugLevel.none.build.code_debug=0
+lilygo_t_deck.menu.DebugLevel.error=Error
+lilygo_t_deck.menu.DebugLevel.error.build.code_debug=1
+lilygo_t_deck.menu.DebugLevel.warn=Warn
+lilygo_t_deck.menu.DebugLevel.warn.build.code_debug=2
+lilygo_t_deck.menu.DebugLevel.info=Info
+lilygo_t_deck.menu.DebugLevel.info.build.code_debug=3
+lilygo_t_deck.menu.DebugLevel.debug=Debug
+lilygo_t_deck.menu.DebugLevel.debug.build.code_debug=4
+lilygo_t_deck.menu.DebugLevel.verbose=Verbose
+lilygo_t_deck.menu.DebugLevel.verbose.build.code_debug=5
+
+lilygo_t_deck.menu.EraseFlash.none=Disabled
+lilygo_t_deck.menu.EraseFlash.none.upload.erase_cmd=
+lilygo_t_deck.menu.EraseFlash.all=Enabled
+lilygo_t_deck.menu.EraseFlash.all.upload.erase_cmd=-e
+
+
 ########## Odroid-Go fix for wroom/wrover mismatch with upload and partition size) ###########
 
 odroid_esp32.upload.maximum_size=6553600

diff --git a/boards/variants/lilygo_t_deck/partitions_16MB_factory_4_apps.csv b/boards/variants/lilygo_t_deck/partitions_16MB_factory_4_apps.csv
@@ -0,0 +1,11 @@
+## 4 Apps + Factory
+## Name,   Type, SubType,    Offset,     Size
+nvs,      data, nvs,        0x9000,   0x5000
+otadata,  data, ota,        0xe000,   0x2000
+ota_0,    0,    ota_0,     0x10000, 0x300000
+ota_1,    0,    ota_1,    0x310000, 0x300000
+ota_2,    0,    ota_2,    0x610000, 0x300000
+ota_3,    0,    ota_3,    0x910000, 0x300000
+firmware, app,  factory,  0xC10000, 0x0F0000
+spiffs,   data, spiffs,   0xD00000, 0x2F0000
+coredump, data, coredump, 0xFF0000,  0x10000
diff --git a/boards/variants/lilygo_t_deck/partitions_16MB_factory_6_apps.csv b/boards/variants/lilygo_t_deck/partitions_16MB_factory_6_apps.csv
@@ -0,0 +1,14 @@
+# 6 Apps + Factory
+# Name,   Type, SubType,    Offset,     Size
+nvs,      data, nvs,        0x9000,   0x5000
+otadata,  data, ota,        0xe000,   0x2000
+ota_0,    0,    ota_0,     0x10000, 0x200000
+ota_1,    0,    ota_1,    0x210000, 0x200000
+ota_2,    0,    ota_2,    0x410000, 0x200000
+ota_3,    0,    ota_3,    0x610000, 0x200000
+ota_4,    0,    ota_4,    0x810000, 0x200000
+ota_5,    0,    ota_5,    0xA10000, 0x200000
+firmware, app,  factory,  0xC10000, 0x0F0000
+spiffs,   data, spiffs,   0xD00000, 0x2F0000
+coredump, data, coredump, 0xFF0000,  0x10000
+