Skip to content

Commit f18d5d9

Browse files
fonix232fonix232
authored
Merge branch 'main' into feat/add_m5stack_papers3_support
2 parents e8907be + 61277e7 commit f18d5d9

File tree

264 files changed

+1045
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+1045
-137
lines changed

‎.github/workflows/build-firmware.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
{ id: cyd-2432s028r, arch: esp32 },
1818
{ id: cyd-2432s028rv3, arch: esp32 },
1919
{ id: cyd-e32r28t, arch: esp32 },
20+
{ id: cyd-e32r32p, arch: esp32 },
2021
{ id: cyd-2432s032c, arch: esp32 },
2122
{ id: cyd-jc2432w328c, arch: esp32 },
2223
{ id: cyd-8048s043c, arch: esp32s3 },
@@ -32,12 +33,13 @@ jobs:
3233
{ id: lilygo-tdongle-s3, arch: esp32s3 },
3334
{ id: lilygo-tlora-pager, arch: esp32s3 },
3435
{ id: m5stack-cardputer, arch: esp32s3 },
36+
{ id: m5stack-cardputer-adv, arch: esp32s3 },
3537
{ id: m5stack-core2, arch: esp32 },
3638
{ id: m5stack-cores3, arch: esp32s3 },
3739
{ id: m5stack-stickc-plus, arch: esp32 },
3840
{ id: m5stack-stickc-plus2, arch: esp32 },
3941
{ id: unphone, arch: esp32s3 },
40-
{ id: waveshare-s3-touch-43, arch: esp32s3 },
42+
{ id: waveshare-s3-touch-lcd-43, arch: esp32s3 },
4143
{ id: waveshare-s3-touch-lcd-147, arch: esp32s3 },
4244
{ id: waveshare-s3-touch-lcd-128, arch: esp32s3 },
4345
{ id: waveshare-s3-lcd-13, arch: esp32s3 }

‎Boards/M5stackCardputer/Source/InitBoot.cpp‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Boards/M5stackCardputer/Source/InitBoot.h‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

Boards/CYD-2432S024C/CMakeLists.txt renamed to Boards/cyd-2432s024c/CMakeLists.txt

File renamed without changes.

Boards/CYD-2432S024C/Source/Configuration.cpp renamed to Boards/cyd-2432s024c/Source/Configuration.cpp

File renamed without changes.

Boards/CYD-2432S024C/Source/devices/Display.cpp renamed to Boards/cyd-2432s024c/Source/devices/Display.cpp

File renamed without changes.

Boards/CYD-2432S024C/Source/devices/Display.h renamed to Boards/cyd-2432s024c/Source/devices/Display.h

File renamed without changes.

Boards/CYD-2432S024C/Source/devices/SdCard.cpp renamed to Boards/cyd-2432s024c/Source/devices/SdCard.cpp

File renamed without changes.

Boards/CYD-2432S024C/Source/devices/SdCard.h renamed to Boards/cyd-2432s024c/Source/devices/SdCard.h

File renamed without changes.

Boards/CYD-2432S028R/CMakeLists.txt renamed to Boards/cyd-2432s028r/CMakeLists.txt

File renamed without changes.

0 commit comments

Comments
 (0)