From 7822e71179615b4d761b773e76fdf07c057e4e1b Mon Sep 17 00:00:00 2001 From: tobozo Date: Sun, 3 Apr 2022 11:15:05 +0200 Subject: [PATCH 01/50] Added arduino package 2.0.3-RC1 --- .github/workflows/LibraryBuild.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/LibraryBuild.yml b/.github/workflows/LibraryBuild.yml index 117b4865..3c16e7e0 100644 --- a/.github/workflows/LibraryBuild.yml +++ b/.github/workflows/LibraryBuild.yml @@ -24,6 +24,7 @@ jobs: - 2.0.0 - 2.0.1 - 2.0.2 + - 2.0.3-RC1 matrix-context: @@ -32,7 +33,7 @@ jobs: - M5StickC-test - LGFX-test - M5Unified-test - + #- S3Box-Test - M5Stack - M5Core2 - M5Fire @@ -44,6 +45,8 @@ jobs: # sdk-version: 1.0.6 include: + + # testable sdk versions - sdk-version: 1.0.6 platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-1.0.6_index.json - sdk-version: 2.0.0 @@ -52,16 +55,24 @@ jobs: platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.1_index.json - sdk-version: 2.0.2 platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.2_index.json + - sdk-version: 2.0.3-RC1 + platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.3-RC1_index.json # library health test sketches - matrix-context: M5Core2-test arduino-board: m5stack-core2 sketch-names: M5Stack-SDLoader-Snippet.ino - required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson" + required-libraries: "ESP32-Chimera-Core,LovyanGFX" - matrix-context: M5Stack-test arduino-board: m5stack-core-esp32 sketch-names: M5Stack-SDLoader-Snippet.ino - required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson" + required-libraries: "ESP32-Chimera-Core,LovyanGFX" + + #- matrix-context: S3Box-Test + #arduino-board: esp32s3box + #sketch-names: M5Stack-SDLoader-Snippet.ino + #required-libraries: "ESP32-Chimera-Core,LovyanGFX" + - matrix-context: M5Unified-test arduino-board: m5stack-core2 sketch-names: M5Unified.ino @@ -126,7 +137,7 @@ jobs: set-build-path: true build-properties: ${{ toJson(matrix.build-properties) }} #debug-install: true - - name: Copy compiled binary + - name: Copy compiled binaries if: startsWith(matrix.sketch-names, 'M5Stack-SD-Menu') run: | cp examples/M5Stack-SD-Menu/build/M5Stack-SD-Menu.ino.bin examples/M5Stack-SD-Menu/build/${{ matrix.launcher-name }}-${{ matrix.sdk-version }}.bin From 3a450f65d8835fdf27f0df85fe9e458117adca6f Mon Sep 17 00:00:00 2001 From: tobozo Date: Sun, 3 Apr 2022 15:31:56 +0200 Subject: [PATCH 02/50] platform version --- .github/workflows/LibraryBuild.yml | 41 ++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/.github/workflows/LibraryBuild.yml b/.github/workflows/LibraryBuild.yml index 3c16e7e0..c572b01e 100644 --- a/.github/workflows/LibraryBuild.yml +++ b/.github/workflows/LibraryBuild.yml @@ -23,7 +23,8 @@ jobs: - 1.0.6 - 2.0.0 - 2.0.1 - - 2.0.2 + # 2.0.2 has broken SD Support + # - 2.0.2 - 2.0.3-RC1 matrix-context: @@ -33,7 +34,7 @@ jobs: - M5StickC-test - LGFX-test - M5Unified-test - #- S3Box-Test + - S3Box-Test - M5Stack - M5Core2 - M5Fire @@ -44,19 +45,31 @@ jobs: # - matrix-context: OdroidGo-SD-Menu # sdk-version: 1.0.6 + exclude: + # There's no esp32s3box support before 2.0.3 + - matrix-context: S3Box-Test + sdk-version: 1.0.6 + - matrix-context: S3Box-Test + sdk-version: 2.0.0 + - matrix-context: S3Box-Test + sdk-version: 2.0.1 + - matrix-context: S3Box-Test + sdk-version: 2.0.2 + + include: # testable sdk versions - sdk-version: 1.0.6 - platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-1.0.6_index.json + #platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-1.0.6_index.json - sdk-version: 2.0.0 - platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.0_index.json + #platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.0_index.json - sdk-version: 2.0.1 - platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.1_index.json + #platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.1_index.json - sdk-version: 2.0.2 - platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.2_index.json + #platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.2_index.json - sdk-version: 2.0.3-RC1 - platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.3-RC1_index.json + #platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.3-RC1_index.json # library health test sketches - matrix-context: M5Core2-test @@ -68,10 +81,10 @@ jobs: sketch-names: M5Stack-SDLoader-Snippet.ino required-libraries: "ESP32-Chimera-Core,LovyanGFX" - #- matrix-context: S3Box-Test - #arduino-board: esp32s3box - #sketch-names: M5Stack-SDLoader-Snippet.ino - #required-libraries: "ESP32-Chimera-Core,LovyanGFX" + - matrix-context: S3Box-Test + arduino-board: esp32s3box + sketch-names: M5Stack-SDLoader-Snippet.ino + required-libraries: "ESP32-Chimera-Core,LovyanGFX" - matrix-context: M5Unified-test arduino-board: m5stack-core2 @@ -128,8 +141,10 @@ jobs: - name: ${{ matrix.matrix-context }} uses: ArminJo/arduino-test-compile@v3 with: - platform-url: ${{ matrix.platform-url }} - arduino-board-fqbn: esp32-${{ matrix.sdk-version }}:esp32:${{ matrix.arduino-board}}${{ matrix.extra-fqbn }} + platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json + #platform-url: ${{ matrix.platform-url }} + arduino-board-fqbn: esp32:esp32:${{ matrix.arduino-board}}${{ matrix.extra-fqbn }} + arduino-platform: esp32:esp32@${{ matrix.sdk-version }} required-libraries: ${{ matrix.required-libraries }} extra-arduino-lib-install-args: --no-deps # extra-arduino-cli-args: ${{ matrix.extra-arduino-cli-args }} From 8e71209b48d7d70fb00ef2be881ff11094b970b8 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sun, 3 Apr 2022 15:43:21 +0200 Subject: [PATCH 03/50] platform version --- .github/workflows/LibraryBuild.yml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/LibraryBuild.yml b/.github/workflows/LibraryBuild.yml index c572b01e..32992e9c 100644 --- a/.github/workflows/LibraryBuild.yml +++ b/.github/workflows/LibraryBuild.yml @@ -21,10 +21,10 @@ jobs: sdk-version: - 1.0.6 - - 2.0.0 + #- 2.0.0 - 2.0.1 - # 2.0.2 has broken SD Support - # - 2.0.2 + #- 2.0.2 # has broken SD Support + - 2.0.2 - 2.0.3-RC1 matrix-context: @@ -49,27 +49,22 @@ jobs: # There's no esp32s3box support before 2.0.3 - matrix-context: S3Box-Test sdk-version: 1.0.6 - - matrix-context: S3Box-Test - sdk-version: 2.0.0 + #- matrix-context: S3Box-Test + #sdk-version: 2.0.0 - matrix-context: S3Box-Test sdk-version: 2.0.1 - - matrix-context: S3Box-Test - sdk-version: 2.0.2 + #- matrix-context: S3Box-Test + # sdk-version: 2.0.2 include: - # testable sdk versions + # buildable sdk versions - sdk-version: 1.0.6 - #platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-1.0.6_index.json - - sdk-version: 2.0.0 - #platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.0_index.json + #- sdk-version: 2.0.0 - sdk-version: 2.0.1 - #platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.1_index.json - - sdk-version: 2.0.2 - #platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.2_index.json + #- sdk-version: 2.0.2 # has broken SD Support - sdk-version: 2.0.3-RC1 - #platform-url: https://phpsecu.re/esp32/packages/package_esp32_esp32-2.0.3-RC1_index.json # library health test sketches - matrix-context: M5Core2-test From a8c1ffc7dbe8479cf2e92b4f28880fbe574ad51c Mon Sep 17 00:00:00 2001 From: tobozo Date: Sun, 3 Apr 2022 15:52:03 +0200 Subject: [PATCH 04/50] Added ESP32-S3-Box support --- src/M5StackUpdater.cpp | 4 ++++ src/M5StackUpdater.h | 4 ++++ src/M5StackUpdaterConfig.h | 5 ++++- src/M5StackUpdaterUI.h | 36 ++++++++++++++++++++++++++++++++---- 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/src/M5StackUpdater.cpp b/src/M5StackUpdater.cpp index 4ca2d846..2c818dfe 100644 --- a/src/M5StackUpdater.cpp +++ b/src/M5StackUpdater.cpp @@ -487,7 +487,11 @@ void SDUpdater::checkSDUpdaterUI( String fileName, unsigned long waitdelay ) } if( cfg->onWaitForAction ) { + [[maybe_unused]] unsigned long startwait = millis(); int ret = cfg->onWaitForAction( isRollBack ? (char*)cfg->labelRollback : (char*)cfg->labelMenu, (char*)cfg->labelSkip, (char*)cfg->labelSave, waitdelay ); + [[maybe_unused]] unsigned long actualwaitdelay = millis()-startwait; + log_v("Action '%d' was triggered after %d ms (waidelay=%d)", ret, actualwaitdelay, waitdelay ); + if ( ret == SDU_BTNA_MENU ) { if( isRollBack == false ) { Serial.printf( SDU_LOAD_TPL, fileName.c_str() ); diff --git a/src/M5StackUpdater.h b/src/M5StackUpdater.h index bcec788c..39b133dd 100644 --- a/src/M5StackUpdater.h +++ b/src/M5StackUpdater.h @@ -295,6 +295,10 @@ __attribute__((unused)) static void checkSDUpdater( fs::FS &fs, String fileName //case 14 : log_d("EXT_CPU_RESET");break; // 14, for APP CPU, reseted by PRO CPU //case 15 : log_d("RTCWDT_BROWN_OUT_RESET");break; // 15, Reset when the vdd voltage is not stable case 16 : log_d("RTCWDT_RTC_RESET"); waitdelay=500; break;// 16, RTC Watch dog reset digital core and rtc module + // case 21: log_d("USB_UART_CHIP_RESET"); waitdelay=2000; break;// Various reset reasons for ESP32-S3 + // case 22: log_d("USB_JTAG_CHIP_RESET"); waitdelay=2000; break;// Various reset reasons for ESP32-S3 + // case 24: log_d("JTAG_RESET"); waitdelay=2000; break; // Various reset reasons for ESP32-S3 + default : log_d("NO_MEAN"); waitdelay=100; } } diff --git a/src/M5StackUpdaterConfig.h b/src/M5StackUpdaterConfig.h index 1cd4183b..7e9f1bac 100644 --- a/src/M5StackUpdaterConfig.h +++ b/src/M5StackUpdaterConfig.h @@ -165,8 +165,11 @@ extern "C" { #include #elif defined CONFIG_IDF_TARGET_ESP32C3 #include + #elif defined CONFIG_IDF_TARGET_ESP32S3 + #include #else - #error Target CONFIG_IDF_TARGET is not supported + #warning "Target CONFIG_IDF_TARGET is unknown" + #include #endif #else #include diff --git a/src/M5StackUpdaterUI.h b/src/M5StackUpdaterUI.h index f079cbb5..e93d1a38 100644 --- a/src/M5StackUpdaterUI.h +++ b/src/M5StackUpdaterUI.h @@ -136,6 +136,23 @@ static void SDMenuProgressHeadless( int state, int size ) #endif #endif + #if defined ARDUINO_ESP32_S3_BOX + // this is temporary and may change later + namespace SDU + { + static int lastbtnstate = digitalRead( GPIO_NUM_1 ); + static bool MuteChanged() + { + if( digitalRead( GPIO_NUM_1 ) != lastbtnstate ) { + lastbtnstate = 1-lastbtnstate; + log_d("btnstate: %d", lastbtnstate ); + return true; + } + return false; + } + } + #endif + // theme selector #ifdef ARDUINO_ODROID_ESP32 // Odroid-GO has 4 buttons under the TFT #define BUTTON_WIDTH 60 @@ -359,9 +376,9 @@ static void SDMenuProgressHeadless( int state, int size ) SDUCfg.onBefore(); SDUCfg.onSplashPage( BTN_HINT_MSG ); BtnStyles btns; - SDUCfg.onButtonDraw( labelLoad, 0, btns.Load.BorderColor, btns.Load.FillColor, btns.Load.TextColor, btns.Load.ShadowColor ); - SDUCfg.onButtonDraw( labelSkip, 1, btns.Skip.BorderColor, btns.Skip.FillColor, btns.Skip.TextColor, btns.Skip.ShadowColor ); - if( SDUCfg.binFileName != nullptr ) { + if( SDUCfg.Buttons[0].cb) SDUCfg.onButtonDraw( labelLoad, 0, btns.Load.BorderColor, btns.Load.FillColor, btns.Load.TextColor, btns.Load.ShadowColor ); + if( SDUCfg.Buttons[1].cb) SDUCfg.onButtonDraw( labelSkip, 1, btns.Skip.BorderColor, btns.Skip.FillColor, btns.Skip.TextColor, btns.Skip.ShadowColor ); + if( SDUCfg.binFileName != nullptr && SDUCfg.Buttons[2].cb ) { SDUCfg.onButtonDraw( labelSave, 2, btns.Save.BorderColor, btns.Save.FillColor, btns.Save.TextColor, btns.Save.ShadowColor ); } } @@ -379,7 +396,10 @@ static void SDMenuProgressHeadless( int state, int size ) do { if( SDUCfg.buttonsUpdate ) SDUCfg.buttonsUpdate(); for( int i=0; i<3; i++ ) { - if( SDUCfg.Buttons[i].cb && SDUCfg.Buttons[i].cb() ) { ret = SDUCfg.Buttons[i].val; goto _endAssert; } + if( SDUCfg.Buttons[i].cb && SDUCfg.Buttons[i].cb() ) { + log_v("SDUCfg.Buttons[%d] was triggered", i); + ret = SDUCfg.Buttons[i].val; goto _endAssert; + } } if( SDUCfg.onProgress ) { float barprogress = float(millis() - msec) / float(waitdelay); @@ -520,6 +540,14 @@ static void SDMenuProgressHeadless( int state, int size ) if( !SDUCfg.onAfter ) { SDUCfg.setAfterCb( thawTextStyle ); log_v("Attached onAfter"); } if( !SDUCfg.onSplashPage ) { SDUCfg.setSplashPageCb( drawSDUSplashPage ); log_v("Attached onSplashPage"); } if( !SDUCfg.onButtonDraw ) { SDUCfg.setButtonDrawCb( drawSDUPushButton ); log_v("Attached onButtonDraw"); } + #if defined ARDUINO_ESP32_S3_BOX + SDUCfg.setSDUBtnA( SDU::MuteChanged ); log_v("Attached Mute Read"); + SDUCfg.setSDUBtnB( nullptr ); log_v("Detached BtnB"); + SDUCfg.setSDUBtnC( nullptr ); log_v("Detached BtnC"); + SDUCfg.setLabelSkip( nullptr ); log_v("Disabled Skip"); + SDUCfg.setLabelRollback( nullptr ); log_v("Disabled Rollback"); + SDUCfg.setLabelSave( nullptr ); log_v("Disabled Save"); + #endif #if defined SDU_HAS_TOUCH // default touch button support if ( !SDUCfg.onWaitForAction) { SDUCfg.setWaitForActionCb( assertStartUpdateFromTouchButton ); log_v("Attached onWaitForAction (touch)"); } #else // default momentary button support From 56bb5b6c3af225da8ab903266b79dd288a0e16b2 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sun, 3 Apr 2022 15:52:51 +0200 Subject: [PATCH 05/50] Better platform version filtering --- .github/workflows/LibraryBuild.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/LibraryBuild.yml b/.github/workflows/LibraryBuild.yml index 32992e9c..01022a13 100644 --- a/.github/workflows/LibraryBuild.yml +++ b/.github/workflows/LibraryBuild.yml @@ -24,7 +24,6 @@ jobs: #- 2.0.0 - 2.0.1 #- 2.0.2 # has broken SD Support - - 2.0.2 - 2.0.3-RC1 matrix-context: From 1ecca95307492d4add76467e76cc69e5045002a1 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sun, 3 Apr 2022 19:13:04 +0200 Subject: [PATCH 06/50] re-enable 2.0.0 --- .github/workflows/LibraryBuild.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/LibraryBuild.yml b/.github/workflows/LibraryBuild.yml index 01022a13..87110783 100644 --- a/.github/workflows/LibraryBuild.yml +++ b/.github/workflows/LibraryBuild.yml @@ -21,7 +21,7 @@ jobs: sdk-version: - 1.0.6 - #- 2.0.0 + - 2.0.0 - 2.0.1 #- 2.0.2 # has broken SD Support - 2.0.3-RC1 @@ -48,8 +48,8 @@ jobs: # There's no esp32s3box support before 2.0.3 - matrix-context: S3Box-Test sdk-version: 1.0.6 - #- matrix-context: S3Box-Test - #sdk-version: 2.0.0 + - matrix-context: S3Box-Test + sdk-version: 2.0.0 - matrix-context: S3Box-Test sdk-version: 2.0.1 #- matrix-context: S3Box-Test @@ -60,7 +60,7 @@ jobs: # buildable sdk versions - sdk-version: 1.0.6 - #- sdk-version: 2.0.0 + - sdk-version: 2.0.0 - sdk-version: 2.0.1 #- sdk-version: 2.0.2 # has broken SD Support - sdk-version: 2.0.3-RC1 From 61fa2c843f45806dc4f03c46aba93b9e8650abee Mon Sep 17 00:00:00 2001 From: tobozo Date: Mon, 4 Apr 2022 10:52:52 +0200 Subject: [PATCH 07/50] bump version --- library.json | 2 +- library.properties | 2 +- src/gitTagVersion.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library.json b/library.json index c2896796..de3a09dc 100644 --- a/library.json +++ b/library.json @@ -10,7 +10,7 @@ "type": "git", "url": "https://github.com/tobozo/M5Stack-SD-Updater.git" }, - "version": "1.2.0", + "version": "1.2.1", "framework": "arduino", "headers": "M5StackUpdater.h", "platforms": "espressif32" diff --git a/library.properties b/library.properties index 29337f46..53bb73a4 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=M5Stack-SD-Updater -version=1.2.0 +version=1.2.1 author=tobozo maintainer=tobozo@noreply.github.com sentence=SD Card Loader for M5 Stack diff --git a/src/gitTagVersion.h b/src/gitTagVersion.h index c181a03f..01010438 100644 --- a/src/gitTagVersion.h +++ b/src/gitTagVersion.h @@ -1,6 +1,6 @@ #define SDU_VERSION_MAJOR 1 #define SDU_VERSION_MINOR 2 -#define SDU_VERSION_PATCH 0 +#define SDU_VERSION_PATCH 1 #define _SDU_STR(x) #x #define SDU_STR(x) _SDU_STR(x) // Macro to convert library version number into an integer From 2124a17a06559ef1868c492ecc39511b55f85df7 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 10:36:29 +0200 Subject: [PATCH 08/50] M5Core2 Example --- .github/workflows/LibraryBuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/LibraryBuild.yml b/.github/workflows/LibraryBuild.yml index 87110783..29df4d3a 100644 --- a/.github/workflows/LibraryBuild.yml +++ b/.github/workflows/LibraryBuild.yml @@ -68,8 +68,8 @@ jobs: # library health test sketches - matrix-context: M5Core2-test arduino-board: m5stack-core2 - sketch-names: M5Stack-SDLoader-Snippet.ino - required-libraries: "ESP32-Chimera-Core,LovyanGFX" + sketch-names: M5Core2-SDLoader-Snippet.ino + required-libraries: "M5Core2" - matrix-context: M5Stack-test arduino-board: m5stack-core-esp32 sketch-names: M5Stack-SDLoader-Snippet.ino From 5ceaefb626d383c9b0d8864e478a4a73b5625eaf Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 11:11:03 +0200 Subject: [PATCH 09/50] Adding pio tests --- .../{LibraryBuild.yml => ArduinoBuild.yml} | 4 +- .github/workflows/PlatformioBuild.yml | 85 +++++++++++++++++++ 2 files changed, 87 insertions(+), 2 deletions(-) rename .github/workflows/{LibraryBuild.yml => ArduinoBuild.yml} (99%) create mode 100644 .github/workflows/PlatformioBuild.yml diff --git a/.github/workflows/LibraryBuild.yml b/.github/workflows/ArduinoBuild.yml similarity index 99% rename from .github/workflows/LibraryBuild.yml rename to .github/workflows/ArduinoBuild.yml index 29df4d3a..aa443ab4 100644 --- a/.github/workflows/LibraryBuild.yml +++ b/.github/workflows/ArduinoBuild.yml @@ -1,11 +1,11 @@ -name: LibraryBuild +name: ArduinoBuild on: push: paths: - '**.ino' - '**.cpp' - '**.h' - - '**LibraryBuild.yml' + - '**ArduinoBuild.yml' pull_request: release: types: [published] diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml new file mode 100644 index 00000000..e062fad5 --- /dev/null +++ b/.github/workflows/PlatformioBuild.yml @@ -0,0 +1,85 @@ +name: PlatformIOBuild + +env: + PROJECT_DIR: examples/Test/build_test + +on: + push: + paths: + - '**.ino' + - '**.cpp' + - '**.hpp' + - '**.h' + - '**.c' + - '**PlatformioBuild.yml' + pull_request: + workflow_dispatch: + +jobs: + build: + name: ${{ matrix.piocontext }}@${{ matrix.platform-version }} + + runs-on: ubuntu-latest + + strategy: + matrix: + + piocontext: + - lgfx + - m5stick-c + - m5stack-core-esp32 + - m5stack-core2 + - m5unified + - s3box + + platform-version: + - 1.0.6 + #- 2.0.0 + - 2.0.1 + - 2.0.2 + - 2.0.3-RC1 + + exclude: + - { piocontext: esp32-s3, platform-version: 1.0.6 } + - { piocontext: esp32-s3, platform-version: 2.0.1 } + - { piocontext: esp32-s3, platform-version: 2.0.2 } + + include: + - piocontext: lgfx + - piocontext: m5stick-c + - piocontext: m5stack-core-esp32 + - piocontext: m5stack-core2 + - piocontext: m5unified + - piocontext: s3box + + fail-fast: false + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.sha }} + + - name: Cache pip + uses: actions/cache@v2 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + - name: Cache PlatformIO + uses: actions/cache@v2 + with: + path: ~/.platformio + key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} + - name: Set up Python + uses: actions/setup-python@v2 + + - name: Install PlatformIO + run: | + python -m pip install --upgrade pip + pip install --upgrade platformio + + - name: Run PlatformIO + run: cd ${{ env.PROJECT_DIR }} && pio run -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" + From 2aab41edc89ebde944abcd91f73e2f1be50f5257 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 11:13:29 +0200 Subject: [PATCH 10/50] Adding pio tests --- examples/Test/build_test/main/main.ino | 28 ++++ examples/Test/build_test/platformio.ini | 163 ++++++++++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 examples/Test/build_test/main/main.ino create mode 100644 examples/Test/build_test/platformio.ini diff --git a/examples/Test/build_test/main/main.ino b/examples/Test/build_test/main/main.ino new file mode 100644 index 00000000..baee5786 --- /dev/null +++ b/examples/Test/build_test/main/main.ino @@ -0,0 +1,28 @@ +#include + +#if defined TEST_LGFX + + #include "../../../LGFX-SDLoader-Snippet/LGFX-SDLoader-Snippet.ino" + +#elif defined TEST_M5Core2 + + #include "../../../M5Core2-SDLoader-Snippet/M5Core2-SDLoader-Snippet.ino" + +#elif defined TEST_M5Stack || defined TEST_S3Box + + #include "../../../M5Stack-SDLoader-Snippet/M5Stack-SDLoader-Snippet.ino" + +#elif defined TEST_M5StickC + + #include "../../../M5StickC-SPIFFS-Loader-Snippet/M5StickC-SPIFFS-Loader-Snippet.ino" + +#elif defined TEST_M5Unified + + #include "../../../M5Unified/M5Unified.ino" + +#else + + #error "No device to test" + +#endif + diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini new file mode 100644 index 00000000..1755a6ff --- /dev/null +++ b/examples/Test/build_test/platformio.ini @@ -0,0 +1,163 @@ +[platformio] +default_envs = esp32 +src_dir = main + + +[esp32_1_0_6] +platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.6 +[esp32_2_0_1] +platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1 +[esp32_2_0_2] +platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.2 +[esp32_2_0_3] +platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3-RC1 + +[platform_default] +platform = espressif32 +platform_packages = framework-arduinoespressif32 + +[platform_tasmota] +platform = https://github.com/tasmota/platform-espressif32 + +[platform_official] +platform = https://github.com/platformio/platform-espressif32.git + + +[env] +framework = arduino +platform = ${platform_tasmota.platform} +platform_packages = ${platform_default.platform_packages} +; /!\ This assumes the CI has copied the library folder under this path +; Otherwise comment lib_extra_dirs out and enable "M5Stack-SD-Updater" in "lib_deps" +lib_extra_dirs = + /tmp/piolib +; M5Stack-SD-Updater +build_type = debug + + +[env:lgfx] +[env:m5stick-c] +[env:m5stack-core-esp32] +[env:m5stack-core2] +[env:m5unified] +[env:s3box] + + +[env:lgfx@1.0.6] +platform = ${platform_official.platform} +platform_packages = ${esp32_1_0_6.platform_packages} +board = m5stack-core-esp32 +build_flags = -DTEST_LGFX +lib_deps = LovyanGFX +[env:lgfx@2.0.1] +platform_packages = ${esp32_2_0_1.platform_packages} +board = m5stack-core-esp32 +build_flags = -DTEST_LGFX +lib_deps = LovyanGFX +[env:lgfx@2.0.2] +platform_packages = ${esp32_2_0_2.platform_packages} +board = m5stack-core-esp32 +build_flags = -DTEST_LGFX +lib_deps = LovyanGFX +[env:lgfx@2.0.3-RC1] +platform_packages = ${esp32_2_0_3.platform_packages} +board = m5stack-core-esp32 +build_flags = -DTEST_LGFX +lib_deps = LovyanGFX + +[env:m5stick-c@1.0.6] +platform = ${platform_official.platform} +platform_packages = ${esp32_1_0_6.platform_packages} +board = m5stick-c +build_flags = -DTEST_M5StickC +lib_deps = M5StickC +[env:m5stick-c@2.0.1] +board = m5stick-c +platform_packages = ${esp32_2_0_1.platform_packages} +build_flags = -DTEST_M5StickC +lib_deps = M5StickC +[env:m5stick-c@2.0.2] +board = m5stick-c +platform_packages = ${esp32_2_0_2.platform_packages} +build_flags = -DTEST_M5StickC +lib_deps = M5StickC +[env:m5stick-c@2.0.3-RC1] +board = m5stick-c +platform_packages = ${esp32_2_0_3.platform_packages} +build_flags = -DTEST_M5StickC +lib_deps = M5StickC + +[env:m5stack-core-esp32@1.0.6] +platform = ${platform_official.platform} +platform_packages = ${esp32_1_0_6.platform_packages} +board = m5stack-core-esp32 +build_flags = -DTEST_M5Stack +lib_deps = ESP32-Chimera-Core +[env:m5stack-core-esp32@2.0.1] +board = m5stack-core-esp32 +platform_packages = ${esp32_2_0_1.platform_packages} +build_flags = -DTEST_M5Stack +lib_deps = ESP32-Chimera-Core +[env:m5stack-core-esp32@2.0.2] +board = m5stack-core-esp32 +platform_packages = ${esp32_2_0_2.platform_packages} +build_flags = -DTEST_M5Stack +lib_deps = ESP32-Chimera-Core +[env:m5stack-core-esp32@2.0.3-RC1] +board = m5stack-core-esp32 +platform_packages = ${esp32_2_0_3.platform_packages} +build_flags = -DTEST_M5Stack +lib_deps = ESP32-Chimera-Core + +[env:m5stack-core2@1.0.6] +platform = ${platform_official.platform} +platform_packages = ${esp32_1_0_6.platform_packages} +board = m5stack-core2 +build_flags = -DTEST_M5Core2 +lib_deps = M5Core2 +[env:m5stack-core2@2.0.1] +board = m5stack-core2 +platform_packages = ${esp32_2_0_1.platform_packages} +build_flags = -DTEST_M5Core2 +lib_deps = M5Core2 +[env:m5stack-core2@2.0.2] +board = m5stack-core2 +platform_packages = ${esp32_2_0_2.platform_packages} +build_flags = -DTEST_M5Core2 +lib_deps = M5Core2 +[env:m5stack-core2@2.0.3-RC1] +board = m5stack-core2 +platform_packages = ${esp32_2_0_3.platform_packages} +build_flags = -DTEST_M5Core2 +lib_deps = M5Core2 + + +[env:m5unified@1.0.6] +platform = ${platform_official.platform} +platform_packages = ${esp32_1_0_6.platform_packages} +board = m5stack-core-esp32 +build_flags = -DTEST_M5Unified +lib_deps = M5Unified +[env:m5unified@2.0.1] +board = m5stack-core-esp32 +platform_packages = ${esp32_2_0_1.platform_packages} +build_flags = -DTEST_M5Unified +lib_deps = M5Unified +[env:m5unified@2.0.2] +board = m5stack-core-esp32 +platform_packages = ${esp32_2_0_2.platform_packages} +build_flags = -DTEST_M5Unified +lib_deps = M5Unified +[env:m5unified@2.0.3-RC1] +board = m5stack-core-esp32 +platform_packages = ${esp32_2_0_3.platform_packages} +build_flags = -DTEST_M5Unified +lib_deps = M5Unified + + +[env:s3box@2.0.3-RC1] +board = esp32dev +platform_packages = ${esp32_2_0_3.platform_packages} +board_build.mcu = esp32s3 +build_flags = -DTEST_S3Box +lib_deps = ESP32-Chimera-Core From f746f9b82d6bd4dac62073cf3ac51e8a6eac2202 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 11:18:59 +0200 Subject: [PATCH 11/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 2 ++ examples/Test/build_test/platformio.ini | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index e062fad5..fb9d6511 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -7,6 +7,7 @@ on: push: paths: - '**.ino' + - '**.ini' - '**.cpp' - '**.hpp' - '**.h' @@ -80,6 +81,7 @@ jobs: python -m pip install --upgrade pip pip install --upgrade platformio + - name: Run PlatformIO run: cd ${{ env.PROJECT_DIR }} && pio run -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 1755a6ff..781c7d21 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -1,5 +1,6 @@ [platformio] -default_envs = esp32 +default_envs = m5stack-core-esp32 +lib_extra_dirs = ../../../../M5Stack-SD-Updater src_dir = main @@ -29,8 +30,8 @@ platform = ${platform_tasmota.platform} platform_packages = ${platform_default.platform_packages} ; /!\ This assumes the CI has copied the library folder under this path ; Otherwise comment lib_extra_dirs out and enable "M5Stack-SD-Updater" in "lib_deps" -lib_extra_dirs = - /tmp/piolib +;lib_extra_dirs = +; /tmp/piolib ; M5Stack-SD-Updater build_type = debug From 394baef6eb1dbb7db98ab97c61e31227e8cccc03 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 11:33:43 +0200 Subject: [PATCH 12/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 6 +++--- examples/Test/build_test/platformio.ini | 15 ++------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index fb9d6511..a81821d5 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -41,9 +41,9 @@ jobs: - 2.0.3-RC1 exclude: - - { piocontext: esp32-s3, platform-version: 1.0.6 } - - { piocontext: esp32-s3, platform-version: 2.0.1 } - - { piocontext: esp32-s3, platform-version: 2.0.2 } + - { piocontext: s3box, platform-version: 1.0.6 } + - { piocontext: s3box, platform-version: 2.0.1 } + - { piocontext: s3box, platform-version: 2.0.2 } include: - piocontext: lgfx diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 781c7d21..8745b99c 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -1,6 +1,5 @@ [platformio] default_envs = m5stack-core-esp32 -lib_extra_dirs = ../../../../M5Stack-SD-Updater src_dir = main @@ -28,8 +27,10 @@ platform = https://github.com/platformio/platform-espressif32.git framework = arduino platform = ${platform_tasmota.platform} platform_packages = ${platform_default.platform_packages} +board = m5stack-core-esp32 ; /!\ This assumes the CI has copied the library folder under this path ; Otherwise comment lib_extra_dirs out and enable "M5Stack-SD-Updater" in "lib_deps" +lib_extra_dirs = ../../../../M5Stack-SD-Updater ;lib_extra_dirs = ; /tmp/piolib ; M5Stack-SD-Updater @@ -47,22 +48,18 @@ build_type = debug [env:lgfx@1.0.6] platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} -board = m5stack-core-esp32 build_flags = -DTEST_LGFX lib_deps = LovyanGFX [env:lgfx@2.0.1] platform_packages = ${esp32_2_0_1.platform_packages} -board = m5stack-core-esp32 build_flags = -DTEST_LGFX lib_deps = LovyanGFX [env:lgfx@2.0.2] platform_packages = ${esp32_2_0_2.platform_packages} -board = m5stack-core-esp32 build_flags = -DTEST_LGFX lib_deps = LovyanGFX [env:lgfx@2.0.3-RC1] platform_packages = ${esp32_2_0_3.platform_packages} -board = m5stack-core-esp32 build_flags = -DTEST_LGFX lib_deps = LovyanGFX @@ -91,21 +88,17 @@ lib_deps = M5StickC [env:m5stack-core-esp32@1.0.6] platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} -board = m5stack-core-esp32 build_flags = -DTEST_M5Stack lib_deps = ESP32-Chimera-Core [env:m5stack-core-esp32@2.0.1] -board = m5stack-core-esp32 platform_packages = ${esp32_2_0_1.platform_packages} build_flags = -DTEST_M5Stack lib_deps = ESP32-Chimera-Core [env:m5stack-core-esp32@2.0.2] -board = m5stack-core-esp32 platform_packages = ${esp32_2_0_2.platform_packages} build_flags = -DTEST_M5Stack lib_deps = ESP32-Chimera-Core [env:m5stack-core-esp32@2.0.3-RC1] -board = m5stack-core-esp32 platform_packages = ${esp32_2_0_3.platform_packages} build_flags = -DTEST_M5Stack lib_deps = ESP32-Chimera-Core @@ -136,21 +129,17 @@ lib_deps = M5Core2 [env:m5unified@1.0.6] platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} -board = m5stack-core-esp32 build_flags = -DTEST_M5Unified lib_deps = M5Unified [env:m5unified@2.0.1] -board = m5stack-core-esp32 platform_packages = ${esp32_2_0_1.platform_packages} build_flags = -DTEST_M5Unified lib_deps = M5Unified [env:m5unified@2.0.2] -board = m5stack-core-esp32 platform_packages = ${esp32_2_0_2.platform_packages} build_flags = -DTEST_M5Unified lib_deps = M5Unified [env:m5unified@2.0.3-RC1] -board = m5stack-core-esp32 platform_packages = ${esp32_2_0_3.platform_packages} build_flags = -DTEST_M5Unified lib_deps = M5Unified From 5583c165b1e313373995c9a0a30afa9413f28b83 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 11:41:04 +0200 Subject: [PATCH 13/50] Adding pio tests --- examples/Test/build_test/platformio.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 8745b99c..f21959a1 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -28,6 +28,7 @@ framework = arduino platform = ${platform_tasmota.platform} platform_packages = ${platform_default.platform_packages} board = m5stack-core-esp32 +src_filter = +<*> -<.git/> -<.svn/> - - - - -<../../../../M5Stack-SD-Updater/examples> ; /!\ This assumes the CI has copied the library folder under this path ; Otherwise comment lib_extra_dirs out and enable "M5Stack-SD-Updater" in "lib_deps" lib_extra_dirs = ../../../../M5Stack-SD-Updater From 9f4fe299067c55a4ba5e49bd5346dcbb2d24263d Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 11:44:01 +0200 Subject: [PATCH 14/50] Adding pio tests --- examples/Test/build_test/platformio.ini | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index f21959a1..82f1f9ae 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -50,19 +50,27 @@ build_type = debug platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} build_flags = -DTEST_LGFX -lib_deps = LovyanGFX +lib_deps = + LovyanGFX + ESP32-Chimera-Core [env:lgfx@2.0.1] platform_packages = ${esp32_2_0_1.platform_packages} build_flags = -DTEST_LGFX -lib_deps = LovyanGFX +lib_deps = + LovyanGFX + ESP32-Chimera-Core [env:lgfx@2.0.2] platform_packages = ${esp32_2_0_2.platform_packages} build_flags = -DTEST_LGFX -lib_deps = LovyanGFX +lib_deps = + LovyanGFX + ESP32-Chimera-Core [env:lgfx@2.0.3-RC1] platform_packages = ${esp32_2_0_3.platform_packages} build_flags = -DTEST_LGFX -lib_deps = LovyanGFX +lib_deps = + LovyanGFX + ESP32-Chimera-Core [env:m5stick-c@1.0.6] platform = ${platform_official.platform} From fc79840378bada7a4cac8373890c296d5e7a6009 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 12:47:45 +0200 Subject: [PATCH 15/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 6 +- .../build_test/main/{main.ino => main.cpp} | 2 +- examples/Test/build_test/platformio.ini | 152 ++++++++++-------- 3 files changed, 88 insertions(+), 72 deletions(-) rename examples/Test/build_test/main/{main.ino => main.cpp} (96%) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index a81821d5..5b5348a8 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -81,7 +81,9 @@ jobs: python -m pip install --upgrade pip pip install --upgrade platformio - - name: Run PlatformIO - run: cd ${{ env.PROJECT_DIR }} && pio run -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" + run: | + mkdir -p /tmp/piolib + cp -R ../M5Stack-SD-Updater /tmp/piolib/ + cd ${{ env.PROJECT_DIR }} && pio run -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" diff --git a/examples/Test/build_test/main/main.ino b/examples/Test/build_test/main/main.cpp similarity index 96% rename from examples/Test/build_test/main/main.ino rename to examples/Test/build_test/main/main.cpp index baee5786..dc5aeb3c 100644 --- a/examples/Test/build_test/main/main.ino +++ b/examples/Test/build_test/main/main.cpp @@ -1,4 +1,4 @@ -#include +//#include #if defined TEST_LGFX diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 82f1f9ae..6be5e533 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -22,22 +22,45 @@ platform = https://github.com/tasmota/platform-espressif32 [platform_official] platform = https://github.com/platformio/platform-espressif32.git +[lgfx] +build_flags = -DTEST_LGFX +lib_deps = LovyanGFX + +[M5StickC] +build_flags = -DTEST_M5StickC +lib_deps = M5StickC + +[M5Stack] +build_flags = -DTEST_M5Stack +lib_deps = ESP32-Chimera-Core + +[M5Core2] +build_flags = -DTEST_M5Core2 +lib_deps = M5Core2 + +[M5Unified] +build_flags = -DTEST_M5Unified +lib_deps = M5Unified + +[S3Box] +build_flags = -DTEST_S3Box +lib_deps = ESP32-Chimera-Core + +[lib_dep_m5unified] + [env] framework = arduino platform = ${platform_tasmota.platform} platform_packages = ${platform_default.platform_packages} board = m5stack-core-esp32 -src_filter = +<*> -<.git/> -<.svn/> - - - - -<../../../../M5Stack-SD-Updater/examples> ; /!\ This assumes the CI has copied the library folder under this path ; Otherwise comment lib_extra_dirs out and enable "M5Stack-SD-Updater" in "lib_deps" lib_extra_dirs = ../../../../M5Stack-SD-Updater -;lib_extra_dirs = -; /tmp/piolib -; M5Stack-SD-Updater build_type = debug + [env:lgfx] [env:m5stick-c] [env:m5stack-core-esp32] @@ -47,116 +70,107 @@ build_type = debug [env:lgfx@1.0.6] -platform = ${platform_official.platform} +platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} -build_flags = -DTEST_LGFX -lib_deps = - LovyanGFX - ESP32-Chimera-Core +build_flags = ${lgfx.build_flags} +lib_deps = ${lgfx.lib_deps} [env:lgfx@2.0.1] platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = -DTEST_LGFX -lib_deps = - LovyanGFX - ESP32-Chimera-Core +build_flags = ${lgfx.build_flags} +lib_deps = ${lgfx.lib_deps} [env:lgfx@2.0.2] platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = -DTEST_LGFX -lib_deps = - LovyanGFX - ESP32-Chimera-Core +build_flags = ${lgfx.build_flags} +lib_deps = ${lgfx.lib_deps} [env:lgfx@2.0.3-RC1] platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = -DTEST_LGFX -lib_deps = - LovyanGFX - ESP32-Chimera-Core +build_flags = ${lgfx.build_flags} +lib_deps = ${lgfx.lib_deps} [env:m5stick-c@1.0.6] -platform = ${platform_official.platform} +platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} -board = m5stick-c -build_flags = -DTEST_M5StickC -lib_deps = M5StickC +board = m5stick-c +build_flags = ${M5StickC.build_flags} +lib_deps = ${M5StickC.lib_deps} [env:m5stick-c@2.0.1] -board = m5stick-c +board = m5stick-c platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = -DTEST_M5StickC -lib_deps = M5StickC +build_flags = ${M5StickC.build_flags} +lib_deps = ${M5StickC.lib_deps} [env:m5stick-c@2.0.2] -board = m5stick-c +board = m5stick-c platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = -DTEST_M5StickC -lib_deps = M5StickC +build_flags = ${M5StickC.build_flags} +lib_deps = ${M5StickC.lib_deps} [env:m5stick-c@2.0.3-RC1] -board = m5stick-c +board = m5stick-c platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = -DTEST_M5StickC -lib_deps = M5StickC +build_flags = ${M5StickC.build_flags} +lib_deps = ${M5StickC.lib_deps} [env:m5stack-core-esp32@1.0.6] -platform = ${platform_official.platform} +platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} -build_flags = -DTEST_M5Stack -lib_deps = ESP32-Chimera-Core +build_flags = ${M5Stack.build_flags} +lib_deps = ${M5Stack.lib_deps} [env:m5stack-core-esp32@2.0.1] platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = -DTEST_M5Stack -lib_deps = ESP32-Chimera-Core +build_flags = ${M5Stack.build_flags} +lib_deps = ${M5Stack.lib_deps} [env:m5stack-core-esp32@2.0.2] platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = -DTEST_M5Stack -lib_deps = ESP32-Chimera-Core +build_flags = ${M5Stack.build_flags} +lib_deps = ${M5Stack.lib_deps} [env:m5stack-core-esp32@2.0.3-RC1] platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = -DTEST_M5Stack -lib_deps = ESP32-Chimera-Core +build_flags = ${M5Stack.build_flags} +lib_deps = ${M5Stack.lib_deps} [env:m5stack-core2@1.0.6] -platform = ${platform_official.platform} +platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} -board = m5stack-core2 -build_flags = -DTEST_M5Core2 -lib_deps = M5Core2 +board = m5stack-core2 +build_flags = ${M5Core2.build_flags} +lib_deps = ${M5Core2.lib_deps} [env:m5stack-core2@2.0.1] -board = m5stack-core2 +board = m5stack-core2 platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = -DTEST_M5Core2 -lib_deps = M5Core2 +build_flags = ${M5Core2.build_flags} +lib_deps = ${M5Core2.lib_deps} [env:m5stack-core2@2.0.2] -board = m5stack-core2 +board = m5stack-core2 platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = -DTEST_M5Core2 -lib_deps = M5Core2 +build_flags = ${M5Core2.build_flags} +lib_deps = ${M5Core2.lib_deps} [env:m5stack-core2@2.0.3-RC1] -board = m5stack-core2 +board = m5stack-core2 platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = -DTEST_M5Core2 -lib_deps = M5Core2 - +build_flags = ${M5Core2.build_flags} +lib_deps = ${M5Core2.lib_deps} [env:m5unified@1.0.6] -platform = ${platform_official.platform} +platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} -build_flags = -DTEST_M5Unified -lib_deps = M5Unified +build_flags = ${M5Unified.build_flags} +lib_deps = ${M5Unified.lib_deps} [env:m5unified@2.0.1] platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = -DTEST_M5Unified -lib_deps = M5Unified +build_flags = ${M5Unified.build_flags} +lib_deps = ${M5Unified.lib_deps} [env:m5unified@2.0.2] platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = -DTEST_M5Unified -lib_deps = M5Unified +build_flags = ${M5Unified.build_flags} +lib_deps = ${M5Unified.lib_deps} [env:m5unified@2.0.3-RC1] platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = -DTEST_M5Unified -lib_deps = M5Unified +build_flags = ${M5Unified.build_flags} +lib_deps = ${M5Unified.lib_deps} [env:s3box@2.0.3-RC1] board = esp32dev platform_packages = ${esp32_2_0_3.platform_packages} -board_build.mcu = esp32s3 -build_flags = -DTEST_S3Box -lib_deps = ESP32-Chimera-Core +board_build.mcu = esp32s3 +build_flags = ${S3Box.build_flags} +lib_deps = ${S3Box.lib_deps} From be65cb366f7e6e94c7796b77b29c4c891ec1f8e2 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 13:00:57 +0200 Subject: [PATCH 16/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 24 +++--- examples/Test/build_test/platformio.ini | 105 +++++++++++++----------- 2 files changed, 70 insertions(+), 59 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 5b5348a8..81bd54ba 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -61,18 +61,18 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - name: Cache pip - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - name: Cache PlatformIO - uses: actions/cache@v2 - with: - path: ~/.platformio - key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} + #- name: Cache pip + #uses: actions/cache@v2 + #with: + #path: ~/.cache/pip + #key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + #restore-keys: | + #${{ runner.os }}-pip- + #- name: Cache PlatformIO + #uses: actions/cache@v2 + #with: + #path: ~/.platformio + #key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python uses: actions/setup-python@v2 diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 6be5e533..d2d41aa3 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -46,13 +46,10 @@ lib_deps = M5Unified build_flags = -DTEST_S3Box lib_deps = ESP32-Chimera-Core -[lib_dep_m5unified] [env] framework = arduino -platform = ${platform_tasmota.platform} -platform_packages = ${platform_default.platform_packages} board = m5stack-core-esp32 ; /!\ This assumes the CI has copied the library folder under this path ; Otherwise comment lib_extra_dirs out and enable "M5Stack-SD-Updater" in "lib_deps" @@ -60,116 +57,130 @@ lib_extra_dirs = ../../../../M5Stack-SD-Updater build_type = debug - -[env:lgfx] -[env:m5stick-c] [env:m5stack-core-esp32] [env:m5stack-core2] +[env:m5stick-c] [env:m5unified] +[env:lgfx] [env:s3box] -[env:lgfx@1.0.6] -platform = ${platform_official.platform} -platform_packages = ${esp32_1_0_6.platform_packages} -build_flags = ${lgfx.build_flags} -lib_deps = ${lgfx.lib_deps} -[env:lgfx@2.0.1] -platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = ${lgfx.build_flags} -lib_deps = ${lgfx.lib_deps} -[env:lgfx@2.0.2] -platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = ${lgfx.build_flags} -lib_deps = ${lgfx.lib_deps} -[env:lgfx@2.0.3-RC1] -platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = ${lgfx.build_flags} -lib_deps = ${lgfx.lib_deps} - -[env:m5stick-c@1.0.6] -platform = ${platform_official.platform} -platform_packages = ${esp32_1_0_6.platform_packages} -board = m5stick-c -build_flags = ${M5StickC.build_flags} -lib_deps = ${M5StickC.lib_deps} -[env:m5stick-c@2.0.1] -board = m5stick-c -platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = ${M5StickC.build_flags} -lib_deps = ${M5StickC.lib_deps} -[env:m5stick-c@2.0.2] -board = m5stick-c -platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = ${M5StickC.build_flags} -lib_deps = ${M5StickC.lib_deps} -[env:m5stick-c@2.0.3-RC1] -board = m5stick-c -platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = ${M5StickC.build_flags} -lib_deps = ${M5StickC.lib_deps} - [env:m5stack-core-esp32@1.0.6] platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} build_flags = ${M5Stack.build_flags} lib_deps = ${M5Stack.lib_deps} [env:m5stack-core-esp32@2.0.1] +platform = ${platform_tasmota.platform} platform_packages = ${esp32_2_0_1.platform_packages} build_flags = ${M5Stack.build_flags} lib_deps = ${M5Stack.lib_deps} [env:m5stack-core-esp32@2.0.2] +platform = ${platform_tasmota.platform} platform_packages = ${esp32_2_0_2.platform_packages} build_flags = ${M5Stack.build_flags} lib_deps = ${M5Stack.lib_deps} [env:m5stack-core-esp32@2.0.3-RC1] +platform = ${platform_tasmota.platform} platform_packages = ${esp32_2_0_3.platform_packages} build_flags = ${M5Stack.build_flags} lib_deps = ${M5Stack.lib_deps} [env:m5stack-core2@1.0.6] +board = m5stack-core2 platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} -board = m5stack-core2 build_flags = ${M5Core2.build_flags} lib_deps = ${M5Core2.lib_deps} [env:m5stack-core2@2.0.1] board = m5stack-core2 +platform = ${platform_tasmota.platform} platform_packages = ${esp32_2_0_1.platform_packages} build_flags = ${M5Core2.build_flags} lib_deps = ${M5Core2.lib_deps} [env:m5stack-core2@2.0.2] board = m5stack-core2 +platform = ${platform_tasmota.platform} platform_packages = ${esp32_2_0_2.platform_packages} build_flags = ${M5Core2.build_flags} lib_deps = ${M5Core2.lib_deps} [env:m5stack-core2@2.0.3-RC1] board = m5stack-core2 +platform = ${platform_tasmota.platform} platform_packages = ${esp32_2_0_3.platform_packages} build_flags = ${M5Core2.build_flags} lib_deps = ${M5Core2.lib_deps} +[env:m5stick-c@1.0.6] +platform = ${platform_official.platform} +platform_packages = ${esp32_1_0_6.platform_packages} +board = m5stick-c +build_flags = ${M5StickC.build_flags} +lib_deps = ${M5StickC.lib_deps} +[env:m5stick-c@2.0.1] +platform = ${platform_tasmota.platform} +board = m5stick-c +platform_packages = ${esp32_2_0_1.platform_packages} +build_flags = ${M5StickC.build_flags} +lib_deps = ${M5StickC.lib_deps} +[env:m5stick-c@2.0.2] +platform = ${platform_tasmota.platform} +board = m5stick-c +platform_packages = ${esp32_2_0_2.platform_packages} +build_flags = ${M5StickC.build_flags} +lib_deps = ${M5StickC.lib_deps} +[env:m5stick-c@2.0.3-RC1] +platform = ${platform_tasmota.platform} +board = m5stick-c +platform_packages = ${esp32_2_0_3.platform_packages} +build_flags = ${M5StickC.build_flags} +lib_deps = ${M5StickC.lib_deps} + [env:m5unified@1.0.6] platform = ${platform_official.platform} platform_packages = ${esp32_1_0_6.platform_packages} build_flags = ${M5Unified.build_flags} lib_deps = ${M5Unified.lib_deps} [env:m5unified@2.0.1] +platform = ${platform_tasmota.platform} platform_packages = ${esp32_2_0_1.platform_packages} build_flags = ${M5Unified.build_flags} lib_deps = ${M5Unified.lib_deps} [env:m5unified@2.0.2] +platform = ${platform_tasmota.platform} platform_packages = ${esp32_2_0_2.platform_packages} build_flags = ${M5Unified.build_flags} lib_deps = ${M5Unified.lib_deps} [env:m5unified@2.0.3-RC1] +platform = ${platform_tasmota.platform} platform_packages = ${esp32_2_0_3.platform_packages} build_flags = ${M5Unified.build_flags} lib_deps = ${M5Unified.lib_deps} +[env:lgfx@1.0.6] +platform = ${platform_official.platform} +platform_packages = ${esp32_1_0_6.platform_packages} +build_flags = ${lgfx.build_flags} +lib_deps = ${lgfx.lib_deps} +[env:lgfx@2.0.1] +platform = ${platform_tasmota.platform} +platform_packages = ${esp32_2_0_1.platform_packages} +build_flags = ${lgfx.build_flags} +lib_deps = ${lgfx.lib_deps} +[env:lgfx@2.0.2] +platform = ${platform_tasmota.platform} +platform_packages = ${esp32_2_0_2.platform_packages} +build_flags = ${lgfx.build_flags} +lib_deps = ${lgfx.lib_deps} +[env:lgfx@2.0.3-RC1] +platform = ${platform_tasmota.platform} +platform_packages = ${esp32_2_0_3.platform_packages} +build_flags = ${lgfx.build_flags} +lib_deps = ${lgfx.lib_deps} [env:s3box@2.0.3-RC1] board = esp32dev +platform = ${platform_tasmota.platform} platform_packages = ${esp32_2_0_3.platform_packages} board_build.mcu = esp32s3 build_flags = ${S3Box.build_flags} From 3780c5db7e43f2061a44e35c4b5b803fbaac9b99 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 13:23:30 +0200 Subject: [PATCH 17/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 32 +++++++++-------- examples/Test/build_test/platformio.ini | 48 +++++++++++++++++-------- 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 81bd54ba..ef854d21 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -61,18 +61,18 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - #- name: Cache pip - #uses: actions/cache@v2 - #with: - #path: ~/.cache/pip - #key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - #restore-keys: | - #${{ runner.os }}-pip- - #- name: Cache PlatformIO - #uses: actions/cache@v2 - #with: - #path: ~/.platformio - #key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} + - name: Cache pip + uses: actions/cache@v2 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + - name: Cache PlatformIO + uses: actions/cache@v2 + with: + path: ~/.platformio + key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python uses: actions/setup-python@v2 @@ -83,7 +83,9 @@ jobs: - name: Run PlatformIO run: | - mkdir -p /tmp/piolib - cp -R ../M5Stack-SD-Updater /tmp/piolib/ - cd ${{ env.PROJECT_DIR }} && pio run -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" +# mkdir -p /tmp/piolib +# cp -R ../M5Stack-SD-Updater /tmp/piolib/ + cd ${{ env.PROJECT_DIR }} + pio lib -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" --no-save file://`realpath ../../../` + pio run -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index d2d41aa3..fd6d5570 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -22,39 +22,57 @@ platform = https://github.com/tasmota/platform-espressif32 [platform_official] platform = https://github.com/platformio/platform-espressif32.git + +[env] +framework = arduino +board = m5stack-core-esp32 +; /!\ This assumes the CI has copied the library folder under this path +; Otherwise comment lib_extra_dirs out and enable "M5Stack-SD-Updater" in "lib_deps" +;lib_extra_dirs = ../../../../M5Stack-SD-Updater/src +build_type = debug +;lib_extra_dirs = /tmp/piolib +;lib_compat_mode = strict +lib_ldf_mode = deep +; chain+ + + + [lgfx] build_flags = -DTEST_LGFX -lib_deps = LovyanGFX +lib_deps = + M5Stack-SD-Updater + LovyanGFX [M5StickC] build_flags = -DTEST_M5StickC -lib_deps = M5StickC +lib_deps = + M5Stack-SD-Updater + M5StickC [M5Stack] build_flags = -DTEST_M5Stack -lib_deps = ESP32-Chimera-Core +lib_deps = + M5Stack-SD-Updater + ESP32-Chimera-Core [M5Core2] build_flags = -DTEST_M5Core2 -lib_deps = M5Core2 +lib_deps = + M5Stack-SD-Updater + M5Core2 [M5Unified] build_flags = -DTEST_M5Unified -lib_deps = M5Unified +lib_deps = + M5Stack-SD-Updater + M5Unified [S3Box] build_flags = -DTEST_S3Box -lib_deps = ESP32-Chimera-Core - - +lib_deps = + M5Stack-SD-Updater + ESP32-Chimera-Core -[env] -framework = arduino -board = m5stack-core-esp32 -; /!\ This assumes the CI has copied the library folder under this path -; Otherwise comment lib_extra_dirs out and enable "M5Stack-SD-Updater" in "lib_deps" -lib_extra_dirs = ../../../../M5Stack-SD-Updater -build_type = debug [env:m5stack-core-esp32] From 552c3a2862ae6f94e262366a70430266b6089682 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 13:24:35 +0200 Subject: [PATCH 18/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index ef854d21..654faebd 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -83,8 +83,6 @@ jobs: - name: Run PlatformIO run: | -# mkdir -p /tmp/piolib -# cp -R ../M5Stack-SD-Updater /tmp/piolib/ cd ${{ env.PROJECT_DIR }} pio lib -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" --no-save file://`realpath ../../../` pio run -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" From d9dfcf6b7d0e678e5ce9b450a50d2a65dfe68bfe Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 13:29:23 +0200 Subject: [PATCH 19/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 654faebd..1074a000 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -75,6 +75,8 @@ jobs: key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python uses: actions/setup-python@v2 + - name: Install realpath + run: sudo apt-get install -y realpath - name: Install PlatformIO run: | @@ -84,6 +86,7 @@ jobs: - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} + export lib_path= pio lib -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" --no-save file://`realpath ../../../` pio run -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" From 7a657a8c992f3c1d60f4c2f6e570e72e314d351a Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 13:32:08 +0200 Subject: [PATCH 20/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 1074a000..c7646d64 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -75,8 +75,6 @@ jobs: key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python uses: actions/setup-python@v2 - - name: Install realpath - run: sudo apt-get install -y realpath - name: Install PlatformIO run: | @@ -86,7 +84,8 @@ jobs: - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} - export lib_path= - pio lib -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" --no-save file://`realpath ../../../` + realpath . + export lib_path=`realpath ../../../` + pio lib -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" --no-save file://$lib_path pio run -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" From efd86d929c05bdff82082006c09b96d6ca3fe497 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 13:34:34 +0200 Subject: [PATCH 21/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index c7646d64..c8ebad98 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -80,6 +80,8 @@ jobs: run: | python -m pip install --upgrade pip pip install --upgrade platformio + pio update + pio upgrade - name: Run PlatformIO run: | From b3b338a1fb885e85d29b74b6b0b59c9e26015090 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 13:49:44 +0200 Subject: [PATCH 22/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index c8ebad98..4c0d2dee 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -86,8 +86,8 @@ jobs: - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} - realpath . - export lib_path=`realpath ../../../` - pio lib -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" --no-save file://$lib_path - pio run -e "${{ matrix.piocontext }}@${{ matrix.platform-version }}" + export libpath=$(realpath ../../../) + echo "libpath=file://$realpath`" >> $GITHUB_ENV + pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} ${{env.libpath}} + pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} From 868aac2cebe2399bdb9c02856a22a8294dc287db Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 13:53:35 +0200 Subject: [PATCH 23/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 4c0d2dee..abccbead 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -86,8 +86,6 @@ jobs: - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} - export libpath=$(realpath ../../../) - echo "libpath=file://$realpath`" >> $GITHUB_ENV - pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} ${{env.libpath}} + pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install file://$(realpath ../../../) pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} From cf0d5a5a3aabc8c5e4b96b2af02366d3edef8926 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 14:51:28 +0200 Subject: [PATCH 24/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 10 +- README.md | 3 +- examples/Test/build_test/main/main.cpp | 1 - examples/Test/build_test/platformio.ini | 141 +++++++++++++++--------- 4 files changed, 98 insertions(+), 57 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index abccbead..45cf0021 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -35,13 +35,15 @@ jobs: platform-version: - 1.0.6 - #- 2.0.0 + # platform-version 2.0.0 has no valid core + - 2.0.0 - 2.0.1 - 2.0.2 - 2.0.3-RC1 exclude: - { piocontext: s3box, platform-version: 1.0.6 } + - { piocontext: s3box, platform-version: 2.0.0 } - { piocontext: s3box, platform-version: 2.0.1 } - { piocontext: s3box, platform-version: 2.0.2 } @@ -83,6 +85,12 @@ jobs: pio update pio upgrade + - name: Copy compiled binaries + if: github.base_ref != 'master' + run | + echo "Base ref is ${{github.base_ref}}" + + - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} diff --git a/README.md b/README.md index 7d5355e2..fb3c65e2 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ [![License: MIT](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/tobozo/M5Stack-SD-Updater/blob/master/LICENSE) -[![Build Status](https://travis-ci.com/tobozo/M5Stack-SD-Updater.svg?branch=master)](https://travis-ci.com/github/tobozo/M5Stack-SD-Updater) [![Gitter](https://badges.gitter.im/M5Stack-SD-Updater/community.svg)](https://gitter.im/M5Stack-SD-Updater/community) [![arduino-library-badge](https://www.ardu-badge.com/badge/M5Stack-SD-Updater.svg?)](https://www.ardu-badge.com/M5Stack-SD-Updater) [![PlatformIO Registry](https://badges.registry.platformio.org/packages/tobozo/library/M5Stack-SD-Updater.svg?)](https://registry.platformio.org/packages/libraries/tobozo/M5Stack-SD-Updater) +![Arduino Build](https://github.com/tobozo/M5Stack-SD-Updater/actions/workflows/ArduinoBuild.yml/badge.svg?branch=master) +![Platformio Build](https://github.com/tobozo/M5Stack-SD-Updater/actions/workflows/PlatformioBuild.yml/badge.svg?branch=master) # M5Stack-SD-Updater diff --git a/examples/Test/build_test/main/main.cpp b/examples/Test/build_test/main/main.cpp index dc5aeb3c..64013f91 100644 --- a/examples/Test/build_test/main/main.cpp +++ b/examples/Test/build_test/main/main.cpp @@ -1,4 +1,3 @@ -//#include #if defined TEST_LGFX diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index fd6d5570..617d52d3 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -1,75 +1,83 @@ [platformio] -default_envs = m5stack-core-esp32 -src_dir = main +default_envs = m5stack-core-esp32 +src_dir = main +[platform_default] +platform = espressif32 +platform_packages = framework-arduinoespressif32 + +[platform_tasmota] +platform = https://github.com/tasmota/platform-espressif32 + +[platform_official] +platform = https://github.com/platformio/platform-espressif32.git + [esp32_1_0_6] +platform = ${platform_official.platform} platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.6 + +[esp32_2_0_0] +platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream +platform_packages = + toolchain-xtensa32 @ ~2.80400.0 + framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git#2.0.0 + [esp32_2_0_1] +platform = ${platform_tasmota.platform} platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1 + [esp32_2_0_2] +platform = ${platform_tasmota.platform} platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.2 + [esp32_2_0_3] +platform = ${platform_tasmota.platform} platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3-RC1 -[platform_default] -platform = espressif32 -platform_packages = framework-arduinoespressif32 -[platform_tasmota] -platform = https://github.com/tasmota/platform-espressif32 - -[platform_official] -platform = https://github.com/platformio/platform-espressif32.git [env] -framework = arduino -board = m5stack-core-esp32 -; /!\ This assumes the CI has copied the library folder under this path -; Otherwise comment lib_extra_dirs out and enable "M5Stack-SD-Updater" in "lib_deps" -;lib_extra_dirs = ../../../../M5Stack-SD-Updater/src -build_type = debug -;lib_extra_dirs = /tmp/piolib -;lib_compat_mode = strict -lib_ldf_mode = deep -; chain+ - +framework = arduino +board = m5stack-core-esp32 +build_type = debug +lib_ldf_mode = deep [lgfx] -build_flags = -DTEST_LGFX -lib_deps = +build_flags = -DTEST_LGFX +lib_deps = M5Stack-SD-Updater LovyanGFX [M5StickC] -build_flags = -DTEST_M5StickC -lib_deps = +build_flags = -DTEST_M5StickC +lib_deps = M5Stack-SD-Updater M5StickC [M5Stack] -build_flags = -DTEST_M5Stack -lib_deps = +build_flags = -DTEST_M5Stack +lib_deps = M5Stack-SD-Updater ESP32-Chimera-Core [M5Core2] -build_flags = -DTEST_M5Core2 -lib_deps = +build_flags = -DTEST_M5Core2 +lib_deps = M5Stack-SD-Updater M5Core2 [M5Unified] -build_flags = -DTEST_M5Unified -lib_deps = +build_flags = -DTEST_M5Unified +lib_deps = M5Stack-SD-Updater M5Unified [S3Box] -build_flags = -DTEST_S3Box -lib_deps = +build_flags = -DTEST_S3Box +lib_deps = M5Stack-SD-Updater ESP32-Chimera-Core @@ -84,121 +92,146 @@ lib_deps = [env:m5stack-core-esp32@1.0.6] -platform = ${platform_official.platform} +platform = ${esp32_1_0_6.platform} platform_packages = ${esp32_1_0_6.platform_packages} build_flags = ${M5Stack.build_flags} lib_deps = ${M5Stack.lib_deps} +[env:m5stack-core-esp32@2.0.0] +platform = ${esp32_2_0_0.platform} +platform_packages = ${esp32_2_0_0.platform_packages} +build_flags = ${M5Stack.build_flags} +lib_deps = ${M5Stack.lib_deps} [env:m5stack-core-esp32@2.0.1] -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_1.platform} platform_packages = ${esp32_2_0_1.platform_packages} build_flags = ${M5Stack.build_flags} lib_deps = ${M5Stack.lib_deps} [env:m5stack-core-esp32@2.0.2] -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_2.platform} platform_packages = ${esp32_2_0_2.platform_packages} build_flags = ${M5Stack.build_flags} lib_deps = ${M5Stack.lib_deps} [env:m5stack-core-esp32@2.0.3-RC1] -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_3.platform} platform_packages = ${esp32_2_0_3.platform_packages} build_flags = ${M5Stack.build_flags} lib_deps = ${M5Stack.lib_deps} [env:m5stack-core2@1.0.6] board = m5stack-core2 -platform = ${platform_official.platform} +platform = ${esp32_1_0_6.platform} platform_packages = ${esp32_1_0_6.platform_packages} build_flags = ${M5Core2.build_flags} lib_deps = ${M5Core2.lib_deps} +[env:m5stack-core2@2.0.0] +platform = ${esp32_2_0_0.platform} +platform_packages = ${esp32_2_0_0.platform_packages} +build_flags = ${M5Core2.build_flags} +lib_deps = ${M5Core2.lib_deps} [env:m5stack-core2@2.0.1] board = m5stack-core2 -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_1.platform} platform_packages = ${esp32_2_0_1.platform_packages} build_flags = ${M5Core2.build_flags} lib_deps = ${M5Core2.lib_deps} [env:m5stack-core2@2.0.2] board = m5stack-core2 -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_2.platform} platform_packages = ${esp32_2_0_2.platform_packages} build_flags = ${M5Core2.build_flags} lib_deps = ${M5Core2.lib_deps} [env:m5stack-core2@2.0.3-RC1] board = m5stack-core2 -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_3.platform} platform_packages = ${esp32_2_0_3.platform_packages} build_flags = ${M5Core2.build_flags} lib_deps = ${M5Core2.lib_deps} [env:m5stick-c@1.0.6] -platform = ${platform_official.platform} +platform = ${esp32_1_0_6.platform} platform_packages = ${esp32_1_0_6.platform_packages} board = m5stick-c build_flags = ${M5StickC.build_flags} lib_deps = ${M5StickC.lib_deps} +[env:m5stick-c@2.0.0] +platform = ${esp32_2_0_0.platform} +platform_packages = ${esp32_2_0_0.platform_packages} +build_flags = ${M5StickC.build_flags} +lib_deps = ${M5StickC.lib_deps} [env:m5stick-c@2.0.1] -platform = ${platform_tasmota.platform} board = m5stick-c +platform = ${esp32_2_0_1.platform} platform_packages = ${esp32_2_0_1.platform_packages} build_flags = ${M5StickC.build_flags} lib_deps = ${M5StickC.lib_deps} [env:m5stick-c@2.0.2] -platform = ${platform_tasmota.platform} board = m5stick-c +platform = ${esp32_2_0_2.platform} platform_packages = ${esp32_2_0_2.platform_packages} build_flags = ${M5StickC.build_flags} lib_deps = ${M5StickC.lib_deps} [env:m5stick-c@2.0.3-RC1] -platform = ${platform_tasmota.platform} board = m5stick-c +platform = ${esp32_2_0_3.platform} platform_packages = ${esp32_2_0_3.platform_packages} build_flags = ${M5StickC.build_flags} lib_deps = ${M5StickC.lib_deps} [env:m5unified@1.0.6] -platform = ${platform_official.platform} +platform = ${esp32_1_0_6.platform} platform_packages = ${esp32_1_0_6.platform_packages} build_flags = ${M5Unified.build_flags} lib_deps = ${M5Unified.lib_deps} +[env:m5unified@2.0.0] +platform = ${esp32_2_0_0.platform} +platform_packages = ${esp32_2_0_0.platform_packages} +build_flags = ${M5Unified.build_flags} +lib_deps = ${M5Unified.lib_deps} [env:m5unified@2.0.1] -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_1.platform} platform_packages = ${esp32_2_0_1.platform_packages} build_flags = ${M5Unified.build_flags} lib_deps = ${M5Unified.lib_deps} [env:m5unified@2.0.2] -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_2.platform} platform_packages = ${esp32_2_0_2.platform_packages} build_flags = ${M5Unified.build_flags} lib_deps = ${M5Unified.lib_deps} [env:m5unified@2.0.3-RC1] -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_3.platform} platform_packages = ${esp32_2_0_3.platform_packages} build_flags = ${M5Unified.build_flags} lib_deps = ${M5Unified.lib_deps} [env:lgfx@1.0.6] -platform = ${platform_official.platform} +platform = ${esp32_1_0_6.platform} platform_packages = ${esp32_1_0_6.platform_packages} build_flags = ${lgfx.build_flags} lib_deps = ${lgfx.lib_deps} +[env:lgfx@2.0.0] +platform = ${esp32_2_0_0.platform} +platform_packages = ${esp32_2_0_0.platform_packages} +build_flags = ${lgfx.build_flags} +lib_deps = ${lgfx.lib_deps} [env:lgfx@2.0.1] -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_1.platform} platform_packages = ${esp32_2_0_1.platform_packages} build_flags = ${lgfx.build_flags} lib_deps = ${lgfx.lib_deps} [env:lgfx@2.0.2] -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_2.platform} platform_packages = ${esp32_2_0_2.platform_packages} build_flags = ${lgfx.build_flags} lib_deps = ${lgfx.lib_deps} [env:lgfx@2.0.3-RC1] -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_3.platform} platform_packages = ${esp32_2_0_3.platform_packages} build_flags = ${lgfx.build_flags} lib_deps = ${lgfx.lib_deps} [env:s3box@2.0.3-RC1] board = esp32dev -platform = ${platform_tasmota.platform} +platform = ${esp32_2_0_3.platform} platform_packages = ${esp32_2_0_3.platform_packages} board_build.mcu = esp32s3 build_flags = ${S3Box.build_flags} From d60db5e0d17fcd666eff89afb7310147672c924b Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 14:57:53 +0200 Subject: [PATCH 25/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 45cf0021..bbd680ea 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -17,6 +17,8 @@ on: workflow_dispatch: jobs: + + build: name: ${{ matrix.piocontext }}@${{ matrix.platform-version }} @@ -85,15 +87,10 @@ jobs: pio update pio upgrade - - name: Copy compiled binaries - if: github.base_ref != 'master' - run | - echo "Base ref is ${{github.base_ref}}" - - - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install file://$(realpath ../../../) + [[ "${{github.base_ref}}" != "master" ]] && echo "base href = ${{github.base_ref}}" || true pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} From 44d2291049a1615286cffe3e3e01e0751a961e60 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 15:03:33 +0200 Subject: [PATCH 26/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index bbd680ea..5a89d8f2 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -91,6 +91,6 @@ jobs: run: | cd ${{ env.PROJECT_DIR }} pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install file://$(realpath ../../../) - [[ "${{github.base_ref}}" != "master" ]] && echo "base href = ${{github.base_ref}}" || true + [[ "${GITHUB_REF##*/}" != "master" ]] && echo "base href = ${GITHUB_REF##*/}" || true pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} From 4783f41b8418c396d54ec4ac2539baafc6d60e7e Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 15:07:44 +0200 Subject: [PATCH 27/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 5a89d8f2..475d4594 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -2,6 +2,7 @@ name: PlatformIOBuild env: PROJECT_DIR: examples/Test/build_test + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} on: push: @@ -91,6 +92,6 @@ jobs: run: | cd ${{ env.PROJECT_DIR }} pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install file://$(realpath ../../../) - [[ "${GITHUB_REF##*/}" != "master" ]] && echo "base href = ${GITHUB_REF##*/}" || true + [[ "${{ env.BRANCH_NAME }}" != "master" ]] && echo "base href = ${{ env.BRANCH_NAME }}" || true pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} From f1e85a085bf2307667bab4850f5c3dc8a218ad0c Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 15:59:18 +0200 Subject: [PATCH 28/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 2 +- examples/Test/build_test/platformio.ini | 186 +++++------------- .../build_test/platformio_lib_deps.dev.ini | 5 + .../platformio_lib_deps.release.ini | 5 + 4 files changed, 64 insertions(+), 134 deletions(-) create mode 100644 examples/Test/build_test/platformio_lib_deps.dev.ini create mode 100644 examples/Test/build_test/platformio_lib_deps.release.ini diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 475d4594..bf213e04 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -92,6 +92,6 @@ jobs: run: | cd ${{ env.PROJECT_DIR }} pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install file://$(realpath ../../../) - [[ "${{ env.BRANCH_NAME }}" != "master" ]] && echo "base href = ${{ env.BRANCH_NAME }}" || true + [[ "${{ env.BRANCH_NAME }}" == "master" ]] && rm platformio_lib_deps.dev.ini || rm platformio_lib_deps.release.ini pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 617d52d3..290aa586 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -1,6 +1,16 @@ [platformio] default_envs = m5stack-core-esp32 src_dir = main +extra_configs = + platformio_lib_deps.dev.ini + platformio_lib_deps.release.ini + + +[env] +framework = arduino +board = m5stack-core-esp32 +build_type = debug +lib_ldf_mode = deep [platform_default] @@ -36,52 +46,51 @@ platform = ${platform_tasmota.platform} platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3-RC1 - - -[env] -framework = arduino -board = m5stack-core-esp32 -build_type = debug -lib_ldf_mode = deep +[lib_sdupdater] +lib_deps = M5Stack-SD-Updater [lgfx] build_flags = -DTEST_LGFX lib_deps = - M5Stack-SD-Updater - LovyanGFX + ${lib_sdupdater.lib_deps} + ${lib_lgfx.lib_deps} + [M5StickC] +board = m5stick-c build_flags = -DTEST_M5StickC lib_deps = - M5Stack-SD-Updater + ${lib_sdupdater.lib_deps} M5StickC [M5Stack] +board = m5stack-core-esp32 build_flags = -DTEST_M5Stack lib_deps = - M5Stack-SD-Updater - ESP32-Chimera-Core + ${lib_sdupdater.lib_deps} + ${lib_chimeracore.lib_deps} [M5Core2] +board = m5stack-core2 build_flags = -DTEST_M5Core2 lib_deps = - M5Stack-SD-Updater + ${lib_sdupdater.lib_deps} M5Core2 [M5Unified] build_flags = -DTEST_M5Unified lib_deps = - M5Stack-SD-Updater + ${lib_sdupdater.lib_deps} M5Unified [S3Box] +board = esp32dev +board_build.mcu = esp32s3 build_flags = -DTEST_S3Box lib_deps = - M5Stack-SD-Updater - ESP32-Chimera-Core - - + ${lib_sdupdater.lib_deps} + ${lib_chimeracore.lib_deps} [env:m5stack-core-esp32] [env:m5stack-core2] @@ -90,149 +99,60 @@ lib_deps = [env:lgfx] [env:s3box] - [env:m5stack-core-esp32@1.0.6] -platform = ${esp32_1_0_6.platform} -platform_packages = ${esp32_1_0_6.platform_packages} -build_flags = ${M5Stack.build_flags} -lib_deps = ${M5Stack.lib_deps} +extends = esp32_1_0_6, M5Stack [env:m5stack-core-esp32@2.0.0] -platform = ${esp32_2_0_0.platform} -platform_packages = ${esp32_2_0_0.platform_packages} -build_flags = ${M5Stack.build_flags} -lib_deps = ${M5Stack.lib_deps} +extends = esp32_2_0_0, M5Stack [env:m5stack-core-esp32@2.0.1] -platform = ${esp32_2_0_1.platform} -platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = ${M5Stack.build_flags} -lib_deps = ${M5Stack.lib_deps} +extends = esp32_2_0_1, M5Stack [env:m5stack-core-esp32@2.0.2] -platform = ${esp32_2_0_2.platform} -platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = ${M5Stack.build_flags} -lib_deps = ${M5Stack.lib_deps} +extends = esp32_2_0_2, M5Stack [env:m5stack-core-esp32@2.0.3-RC1] -platform = ${esp32_2_0_3.platform} -platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = ${M5Stack.build_flags} -lib_deps = ${M5Stack.lib_deps} +extends = esp32_2_0_3, M5Stack [env:m5stack-core2@1.0.6] -board = m5stack-core2 -platform = ${esp32_1_0_6.platform} -platform_packages = ${esp32_1_0_6.platform_packages} -build_flags = ${M5Core2.build_flags} -lib_deps = ${M5Core2.lib_deps} +extends = esp32_1_0_6, M5Core2 [env:m5stack-core2@2.0.0] -platform = ${esp32_2_0_0.platform} -platform_packages = ${esp32_2_0_0.platform_packages} -build_flags = ${M5Core2.build_flags} -lib_deps = ${M5Core2.lib_deps} +extends = esp32_2_0_0, M5Core2 [env:m5stack-core2@2.0.1] -board = m5stack-core2 -platform = ${esp32_2_0_1.platform} -platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = ${M5Core2.build_flags} -lib_deps = ${M5Core2.lib_deps} +extends = esp32_2_0_1, M5Core2 [env:m5stack-core2@2.0.2] -board = m5stack-core2 -platform = ${esp32_2_0_2.platform} -platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = ${M5Core2.build_flags} -lib_deps = ${M5Core2.lib_deps} +extends = esp32_2_0_2, M5Core2 [env:m5stack-core2@2.0.3-RC1] -board = m5stack-core2 -platform = ${esp32_2_0_3.platform} -platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = ${M5Core2.build_flags} -lib_deps = ${M5Core2.lib_deps} +extends = esp32_2_0_3, M5Core2 [env:m5stick-c@1.0.6] -platform = ${esp32_1_0_6.platform} -platform_packages = ${esp32_1_0_6.platform_packages} -board = m5stick-c -build_flags = ${M5StickC.build_flags} -lib_deps = ${M5StickC.lib_deps} +extends = esp32_1_0_6, M5StickC [env:m5stick-c@2.0.0] -platform = ${esp32_2_0_0.platform} -platform_packages = ${esp32_2_0_0.platform_packages} -build_flags = ${M5StickC.build_flags} -lib_deps = ${M5StickC.lib_deps} +extends = esp32_2_0_0, M5StickC [env:m5stick-c@2.0.1] -board = m5stick-c -platform = ${esp32_2_0_1.platform} -platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = ${M5StickC.build_flags} -lib_deps = ${M5StickC.lib_deps} +extends = esp32_2_0_1, M5StickC [env:m5stick-c@2.0.2] -board = m5stick-c -platform = ${esp32_2_0_2.platform} -platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = ${M5StickC.build_flags} -lib_deps = ${M5StickC.lib_deps} +extends = esp32_2_0_2, M5StickC [env:m5stick-c@2.0.3-RC1] -board = m5stick-c -platform = ${esp32_2_0_3.platform} -platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = ${M5StickC.build_flags} -lib_deps = ${M5StickC.lib_deps} +extends = esp32_2_0_3, M5StickC [env:m5unified@1.0.6] -platform = ${esp32_1_0_6.platform} -platform_packages = ${esp32_1_0_6.platform_packages} -build_flags = ${M5Unified.build_flags} -lib_deps = ${M5Unified.lib_deps} +extends = esp32_1_0_6, M5Unified [env:m5unified@2.0.0] -platform = ${esp32_2_0_0.platform} -platform_packages = ${esp32_2_0_0.platform_packages} -build_flags = ${M5Unified.build_flags} -lib_deps = ${M5Unified.lib_deps} +extends = esp32_2_0_0, M5Unified [env:m5unified@2.0.1] -platform = ${esp32_2_0_1.platform} -platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = ${M5Unified.build_flags} -lib_deps = ${M5Unified.lib_deps} +extends = esp32_2_0_1, M5Unified [env:m5unified@2.0.2] -platform = ${esp32_2_0_2.platform} -platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = ${M5Unified.build_flags} -lib_deps = ${M5Unified.lib_deps} +extends = esp32_2_0_2, M5Unified [env:m5unified@2.0.3-RC1] -platform = ${esp32_2_0_3.platform} -platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = ${M5Unified.build_flags} -lib_deps = ${M5Unified.lib_deps} +extends = esp32_2_0_3, M5Unified [env:lgfx@1.0.6] -platform = ${esp32_1_0_6.platform} -platform_packages = ${esp32_1_0_6.platform_packages} -build_flags = ${lgfx.build_flags} -lib_deps = ${lgfx.lib_deps} +extends = esp32_1_0_6, lgfx [env:lgfx@2.0.0] -platform = ${esp32_2_0_0.platform} -platform_packages = ${esp32_2_0_0.platform_packages} -build_flags = ${lgfx.build_flags} -lib_deps = ${lgfx.lib_deps} +extends = esp32_2_0_0, lgfx [env:lgfx@2.0.1] -platform = ${esp32_2_0_1.platform} -platform_packages = ${esp32_2_0_1.platform_packages} -build_flags = ${lgfx.build_flags} -lib_deps = ${lgfx.lib_deps} +extends = esp32_2_0_1, lgfx [env:lgfx@2.0.2] -platform = ${esp32_2_0_2.platform} -platform_packages = ${esp32_2_0_2.platform_packages} -build_flags = ${lgfx.build_flags} -lib_deps = ${lgfx.lib_deps} +extends = esp32_2_0_2, lgfx [env:lgfx@2.0.3-RC1] -platform = ${esp32_2_0_3.platform} -platform_packages = ${esp32_2_0_3.platform_packages} -build_flags = ${lgfx.build_flags} -lib_deps = ${lgfx.lib_deps} +extends = esp32_2_0_3, lgfx [env:s3box@2.0.3-RC1] -board = esp32dev -platform = ${esp32_2_0_3.platform} -platform_packages = ${esp32_2_0_3.platform_packages} -board_build.mcu = esp32s3 -build_flags = ${S3Box.build_flags} -lib_deps = ${S3Box.lib_deps} +extends = esp32_2_0_3, S3Box diff --git a/examples/Test/build_test/platformio_lib_deps.dev.ini b/examples/Test/build_test/platformio_lib_deps.dev.ini new file mode 100644 index 00000000..e0d0f8c6 --- /dev/null +++ b/examples/Test/build_test/platformio_lib_deps.dev.ini @@ -0,0 +1,5 @@ +[lib_lgfx] +lib_deps = git+https://github.com/lovyan03/LovyanGFX#develop + +[lib_chimeracore] +lib_deps = git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 diff --git a/examples/Test/build_test/platformio_lib_deps.release.ini b/examples/Test/build_test/platformio_lib_deps.release.ini new file mode 100644 index 00000000..1bf1dbba --- /dev/null +++ b/examples/Test/build_test/platformio_lib_deps.release.ini @@ -0,0 +1,5 @@ +[lib_lgfx] +lib_deps = LovyanGFX + +[lib_chimeracore] +lib_deps = ESP32-Chimera-Core From d0e6228517e041ea810f142a3d256636058c01a1 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 16:05:37 +0200 Subject: [PATCH 29/50] Adding pio tests --- examples/Test/build_test/platformio.ini | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 290aa586..1f8a3e77 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -1,9 +1,7 @@ [platformio] default_envs = m5stack-core-esp32 src_dir = main -extra_configs = - platformio_lib_deps.dev.ini - platformio_lib_deps.release.ini +extra_configs = *.ini [env] From 9da58b57fe5c60e7f0ef3281ab88e38a4d932780 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 16:19:08 +0200 Subject: [PATCH 30/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 2 +- examples/Test/build_test/platformio.ini | 6 ++++++ examples/Test/build_test/platformio_lib_deps.release.ini | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 examples/Test/build_test/platformio_lib_deps.release.ini diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index bf213e04..2fc535b5 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -91,7 +91,7 @@ jobs: - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} + [[ "${{ env.BRANCH_NAME }}" == "master" ]] && rm platformio_lib_deps.dev.ini || echo "Develop!" pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install file://$(realpath ../../../) - [[ "${{ env.BRANCH_NAME }}" == "master" ]] && rm platformio_lib_deps.dev.ini || rm platformio_lib_deps.release.ini pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 1f8a3e77..850a4f18 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -47,6 +47,12 @@ platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/ [lib_sdupdater] lib_deps = M5Stack-SD-Updater +[lib_lgfx] +lib_deps = LovyanGFX + +[lib_chimeracore] +lib_deps = ESP32-Chimera-Core + [lgfx] build_flags = -DTEST_LGFX diff --git a/examples/Test/build_test/platformio_lib_deps.release.ini b/examples/Test/build_test/platformio_lib_deps.release.ini deleted file mode 100644 index 1bf1dbba..00000000 --- a/examples/Test/build_test/platformio_lib_deps.release.ini +++ /dev/null @@ -1,5 +0,0 @@ -[lib_lgfx] -lib_deps = LovyanGFX - -[lib_chimeracore] -lib_deps = ESP32-Chimera-Core From 7ce9133259199f5380e07e05f7293f1d9083651e Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 16:27:14 +0200 Subject: [PATCH 31/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 2 +- .../{platformio_lib_deps.dev.ini => dev_lib_deps.ini} | 0 examples/Test/build_test/platformio.ini | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename examples/Test/build_test/{platformio_lib_deps.dev.ini => dev_lib_deps.ini} (100%) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 2fc535b5..b35bc586 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -91,7 +91,7 @@ jobs: - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} - [[ "${{ env.BRANCH_NAME }}" == "master" ]] && rm platformio_lib_deps.dev.ini || echo "Develop!" + [[ "${{ env.BRANCH_NAME }}" == "master" ]] && rm dev_lib_deps.ini || echo "Develop!" pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install file://$(realpath ../../../) pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} diff --git a/examples/Test/build_test/platformio_lib_deps.dev.ini b/examples/Test/build_test/dev_lib_deps.ini similarity index 100% rename from examples/Test/build_test/platformio_lib_deps.dev.ini rename to examples/Test/build_test/dev_lib_deps.ini diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 850a4f18..a5a2aeb4 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -1,7 +1,7 @@ [platformio] default_envs = m5stack-core-esp32 src_dir = main -extra_configs = *.ini +extra_configs = dev_lib_deps.ini [env] From 5bfa8da5dc091af02f06b96776c57183cb998650 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 16:37:15 +0200 Subject: [PATCH 32/50] Adding pio tests --- examples/Test/build_test/dev_lib_deps.ini | 48 ++++++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/examples/Test/build_test/dev_lib_deps.ini b/examples/Test/build_test/dev_lib_deps.ini index e0d0f8c6..0ba21e12 100644 --- a/examples/Test/build_test/dev_lib_deps.ini +++ b/examples/Test/build_test/dev_lib_deps.ini @@ -1,5 +1,49 @@ +[lib_sdupdater] +lib_deps = M5Stack-SD-Updater + [lib_lgfx] -lib_deps = git+https://github.com/lovyan03/LovyanGFX#develop +lib_deps = git+https://github.com/lovyan03/LovyanGFX#develop [lib_chimeracore] -lib_deps = git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 +lib_deps = git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 + + +[lgfx] +lib_deps = + ${lib_sdupdater.lib_deps} + ${lib_lgfx.lib_deps} + +[M5Stack] +lib_deps = + ${lib_sdupdater.lib_deps} + ${lib_chimeracore.lib_deps} + +[S3Box] +lib_deps = + ${lib_sdupdater.lib_deps} + ${lib_chimeracore.lib_deps} + +[env:lgfx@1.0.6] +extends = esp32_1_0_6, lgfx +[env:lgfx@2.0.0] +extends = esp32_2_0_0, lgfx +[env:lgfx@2.0.1] +extends = esp32_2_0_1, lgfx +[env:lgfx@2.0.2] +extends = esp32_2_0_2, lgfx +[env:lgfx@2.0.3-RC1] +extends = esp32_2_0_3, lgfx + +[env:m5stack-core-esp32@1.0.6] +extends = esp32_1_0_6, M5Stack +[env:m5stack-core-esp32@2.0.0] +extends = esp32_2_0_0, M5Stack +[env:m5stack-core-esp32@2.0.1] +extends = esp32_2_0_1, M5Stack +[env:m5stack-core-esp32@2.0.2] +extends = esp32_2_0_2, M5Stack +[env:m5stack-core-esp32@2.0.3-RC1] +extends = esp32_2_0_3, M5Stack + +[env:s3box@2.0.3-RC1] +extends = esp32_2_0_3, S3Box From 92c6475391b8c502646af8f3a24c4e7439ec0a21 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 16:46:04 +0200 Subject: [PATCH 33/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 3 +- examples/Test/build_test/dev_lib_deps.ini | 49 ----------------------- examples/Test/build_test/platformio.ini | 2 +- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 examples/Test/build_test/dev_lib_deps.ini diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index b35bc586..bfaa488e 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -91,7 +91,8 @@ jobs: - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} - [[ "${{ env.BRANCH_NAME }}" == "master" ]] && rm dev_lib_deps.ini || echo "Develop!" + [[ "${{ env.BRANCH_NAME }}" == "master" ]] && echo "Release" || pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install git+https://github.com/lovyan03/LovyanGFX#develop + [[ "${{ env.BRANCH_NAME }}" == "master" ]] && echo "Release" || pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install file://$(realpath ../../../) pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} diff --git a/examples/Test/build_test/dev_lib_deps.ini b/examples/Test/build_test/dev_lib_deps.ini deleted file mode 100644 index 0ba21e12..00000000 --- a/examples/Test/build_test/dev_lib_deps.ini +++ /dev/null @@ -1,49 +0,0 @@ -[lib_sdupdater] -lib_deps = M5Stack-SD-Updater - -[lib_lgfx] -lib_deps = git+https://github.com/lovyan03/LovyanGFX#develop - -[lib_chimeracore] -lib_deps = git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 - - -[lgfx] -lib_deps = - ${lib_sdupdater.lib_deps} - ${lib_lgfx.lib_deps} - -[M5Stack] -lib_deps = - ${lib_sdupdater.lib_deps} - ${lib_chimeracore.lib_deps} - -[S3Box] -lib_deps = - ${lib_sdupdater.lib_deps} - ${lib_chimeracore.lib_deps} - -[env:lgfx@1.0.6] -extends = esp32_1_0_6, lgfx -[env:lgfx@2.0.0] -extends = esp32_2_0_0, lgfx -[env:lgfx@2.0.1] -extends = esp32_2_0_1, lgfx -[env:lgfx@2.0.2] -extends = esp32_2_0_2, lgfx -[env:lgfx@2.0.3-RC1] -extends = esp32_2_0_3, lgfx - -[env:m5stack-core-esp32@1.0.6] -extends = esp32_1_0_6, M5Stack -[env:m5stack-core-esp32@2.0.0] -extends = esp32_2_0_0, M5Stack -[env:m5stack-core-esp32@2.0.1] -extends = esp32_2_0_1, M5Stack -[env:m5stack-core-esp32@2.0.2] -extends = esp32_2_0_2, M5Stack -[env:m5stack-core-esp32@2.0.3-RC1] -extends = esp32_2_0_3, M5Stack - -[env:s3box@2.0.3-RC1] -extends = esp32_2_0_3, S3Box diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index a5a2aeb4..b15b2e0d 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -1,7 +1,7 @@ [platformio] default_envs = m5stack-core-esp32 src_dir = main -extra_configs = dev_lib_deps.ini +;extra_configs = dev_lib_deps.ini [env] From 7069c06c13f56b6b7be9c6d99c132336d2a78b91 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 16:53:04 +0200 Subject: [PATCH 34/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index bfaa488e..ee01d797 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -44,6 +44,8 @@ jobs: - 2.0.2 - 2.0.3-RC1 + + exclude: - { piocontext: s3box, platform-version: 1.0.6 } - { piocontext: s3box, platform-version: 2.0.0 } @@ -91,8 +93,8 @@ jobs: - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} - [[ "${{ env.BRANCH_NAME }}" == "master" ]] && echo "Release" || pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install git+https://github.com/lovyan03/LovyanGFX#develop - [[ "${{ env.BRANCH_NAME }}" == "master" ]] && echo "Release" || pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 - pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install file://$(realpath ../../../) + [[ "${{ env.BRANCH_NAME }}" == "master" ]] && echo "Release" || pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install --no-save git+https://github.com/lovyan03/LovyanGFX#develop + [[ "${{ env.BRANCH_NAME }}" == "master" ]] && echo "Release" || pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install --no-save git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 + pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install --no-save file://$(realpath ../../../) pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} From ef0bc4af58093d3878af654cb73cd60f672a7741 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 16:57:42 +0200 Subject: [PATCH 35/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 3 +-- examples/Test/build_test/dev_lib_deps.ini | 8 ++++++++ examples/Test/build_test/platformio.ini | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 examples/Test/build_test/dev_lib_deps.ini diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index ee01d797..0eedb719 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -93,8 +93,7 @@ jobs: - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} - [[ "${{ env.BRANCH_NAME }}" == "master" ]] && echo "Release" || pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install --no-save git+https://github.com/lovyan03/LovyanGFX#develop - [[ "${{ env.BRANCH_NAME }}" == "master" ]] && echo "Release" || pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install --no-save git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 + [[ "${{ env.BRANCH_NAME }}" == "master" ]] && rm dev_lib_deps.ini || echo "Develop!" pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install --no-save file://$(realpath ../../../) pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} diff --git a/examples/Test/build_test/dev_lib_deps.ini b/examples/Test/build_test/dev_lib_deps.ini new file mode 100644 index 00000000..51aaeeee --- /dev/null +++ b/examples/Test/build_test/dev_lib_deps.ini @@ -0,0 +1,8 @@ +[lib_sdupdater] +lib_deps = M5Stack-SD-Updater + +[lib_lgfx] +lib_deps = git+https://github.com/lovyan03/LovyanGFX#develop + +[lib_chimeracore] +lib_deps = git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index b15b2e0d..a5a2aeb4 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -1,7 +1,7 @@ [platformio] default_envs = m5stack-core-esp32 src_dir = main -;extra_configs = dev_lib_deps.ini +extra_configs = dev_lib_deps.ini [env] From cd8743d1df25f09a3d8dccdf626130d66b80bd8b Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 17:04:42 +0200 Subject: [PATCH 36/50] Adding pio tests --- examples/Test/build_test/dev_lib_deps.ini | 15 ++++++++++++++- examples/Test/build_test/platformio.ini | 19 +++++++++++++++---- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/examples/Test/build_test/dev_lib_deps.ini b/examples/Test/build_test/dev_lib_deps.ini index 51aaeeee..fa4b828c 100644 --- a/examples/Test/build_test/dev_lib_deps.ini +++ b/examples/Test/build_test/dev_lib_deps.ini @@ -5,4 +5,17 @@ lib_deps = M5Stack-SD-Updater lib_deps = git+https://github.com/lovyan03/LovyanGFX#develop [lib_chimeracore] -lib_deps = git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 +lib_deps = + git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 + git+https://github.com/lovyan03/LovyanGFX#develop + +[lib_m5unified] +lib_deps = + git+https://github.com/M5Stack/M5Unified#develop + git+https://github.com/M5Stack/M5GFX#develop + +[lib_m5core2] +lib_deps = M5Core2 + +[lib_m5stickc] +lib_deps = M5StickC diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index a5a2aeb4..b520909c 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -53,6 +53,18 @@ lib_deps = LovyanGFX [lib_chimeracore] lib_deps = ESP32-Chimera-Core +[lib_m5unified] +lib_deps = + M5Unified + M5GFX + +[lib_m5core2] +lib_deps = M5Core2 + +[lib_m5stickc] +lib_deps = M5StickC + + [lgfx] build_flags = -DTEST_LGFX @@ -60,13 +72,12 @@ lib_deps = ${lib_sdupdater.lib_deps} ${lib_lgfx.lib_deps} - [M5StickC] board = m5stick-c build_flags = -DTEST_M5StickC lib_deps = ${lib_sdupdater.lib_deps} - M5StickC + ${lib_m5stickc.lib_deps} [M5Stack] board = m5stack-core-esp32 @@ -80,13 +91,13 @@ board = m5stack-core2 build_flags = -DTEST_M5Core2 lib_deps = ${lib_sdupdater.lib_deps} - M5Core2 + ${lib_m5core2.lib_deps} [M5Unified] build_flags = -DTEST_M5Unified lib_deps = ${lib_sdupdater.lib_deps} - M5Unified + ${lib_m5unified.lib_deps} [S3Box] board = esp32dev From 67013bfce43bec5ea2be83ff283049494ae75b16 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 17:16:08 +0200 Subject: [PATCH 37/50] Adding pio tests --- examples/Test/build_test/dev_lib_deps.ini | 14 ++++++-- examples/Test/build_test/platformio.ini | 41 +++++++++++------------ 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/examples/Test/build_test/dev_lib_deps.ini b/examples/Test/build_test/dev_lib_deps.ini index fa4b828c..d6971677 100644 --- a/examples/Test/build_test/dev_lib_deps.ini +++ b/examples/Test/build_test/dev_lib_deps.ini @@ -2,20 +2,28 @@ lib_deps = M5Stack-SD-Updater [lib_lgfx] -lib_deps = git+https://github.com/lovyan03/LovyanGFX#develop +lib_deps = + ${lib_sdupdater.lib_deps} + git+https://github.com/lovyan03/LovyanGFX#develop [lib_chimeracore] lib_deps = + ${lib_sdupdater.lib_deps} git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 git+https://github.com/lovyan03/LovyanGFX#develop [lib_m5unified] lib_deps = + ${lib_sdupdater.lib_deps} git+https://github.com/M5Stack/M5Unified#develop git+https://github.com/M5Stack/M5GFX#develop [lib_m5core2] -lib_deps = M5Core2 +lib_deps = + ${lib_sdupdater.lib_deps} + M5Core2 [lib_m5stickc] -lib_deps = M5StickC +lib_deps = + ${lib_sdupdater.lib_deps} + M5StickC diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index b520909c..b30ec24d 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -48,64 +48,61 @@ platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/ lib_deps = M5Stack-SD-Updater [lib_lgfx] -lib_deps = LovyanGFX +lib_deps = + ${lib_sdupdater.lib_deps} + LovyanGFX [lib_chimeracore] -lib_deps = ESP32-Chimera-Core +lib_deps = + ${lib_sdupdater.lib_deps} + ESP32-Chimera-Core [lib_m5unified] lib_deps = + ${lib_sdupdater.lib_deps} M5Unified M5GFX [lib_m5core2] -lib_deps = M5Core2 +lib_deps = + ${lib_sdupdater.lib_deps} + M5Core2 [lib_m5stickc] -lib_deps = M5StickC +lib_deps = + ${lib_sdupdater.lib_deps} + M5StickC [lgfx] build_flags = -DTEST_LGFX -lib_deps = - ${lib_sdupdater.lib_deps} - ${lib_lgfx.lib_deps} +lib_deps = ${lib_lgfx.lib_deps} [M5StickC] board = m5stick-c build_flags = -DTEST_M5StickC -lib_deps = - ${lib_sdupdater.lib_deps} - ${lib_m5stickc.lib_deps} +lib_deps = ${lib_m5stickc.lib_deps} [M5Stack] board = m5stack-core-esp32 build_flags = -DTEST_M5Stack -lib_deps = - ${lib_sdupdater.lib_deps} - ${lib_chimeracore.lib_deps} +lib_deps = ${lib_chimeracore.lib_deps} [M5Core2] board = m5stack-core2 build_flags = -DTEST_M5Core2 -lib_deps = - ${lib_sdupdater.lib_deps} - ${lib_m5core2.lib_deps} +lib_deps = ${lib_m5core2.lib_deps} [M5Unified] build_flags = -DTEST_M5Unified -lib_deps = - ${lib_sdupdater.lib_deps} - ${lib_m5unified.lib_deps} +lib_deps = ${lib_m5unified.lib_deps} [S3Box] board = esp32dev board_build.mcu = esp32s3 build_flags = -DTEST_S3Box -lib_deps = - ${lib_sdupdater.lib_deps} - ${lib_chimeracore.lib_deps} +lib_deps = ${lib_chimeracore.lib_deps} [env:m5stack-core-esp32] [env:m5stack-core2] From e7bc2cb521d6640f1b246ed9c7cb836fbad01103 Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 17:26:16 +0200 Subject: [PATCH 38/50] Adding pio tests --- examples/Test/build_test/dev_lib_deps.ini | 14 +++++++------- examples/Test/build_test/platformio.ini | 19 ++++++++++++------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/examples/Test/build_test/dev_lib_deps.ini b/examples/Test/build_test/dev_lib_deps.ini index d6971677..d398a332 100644 --- a/examples/Test/build_test/dev_lib_deps.ini +++ b/examples/Test/build_test/dev_lib_deps.ini @@ -3,27 +3,27 @@ lib_deps = M5Stack-SD-Updater [lib_lgfx] lib_deps = - ${lib_sdupdater.lib_deps} git+https://github.com/lovyan03/LovyanGFX#develop + ${lib_sdupdater.lib_deps} [lib_chimeracore] lib_deps = - ${lib_sdupdater.lib_deps} - git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 git+https://github.com/lovyan03/LovyanGFX#develop + git+https://github.com/tobozo/ESP32-Chimera-Core#1.4.2 + ${lib_sdupdater.lib_deps} [lib_m5unified] lib_deps = - ${lib_sdupdater.lib_deps} - git+https://github.com/M5Stack/M5Unified#develop git+https://github.com/M5Stack/M5GFX#develop + git+https://github.com/M5Stack/M5Unified#develop + ${lib_sdupdater.lib_deps} [lib_m5core2] lib_deps = - ${lib_sdupdater.lib_deps} M5Core2 + ${lib_sdupdater.lib_deps} [lib_m5stickc] lib_deps = - ${lib_sdupdater.lib_deps} M5StickC + ${lib_sdupdater.lib_deps} diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index b30ec24d..170eb16f 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -61,7 +61,6 @@ lib_deps = lib_deps = ${lib_sdupdater.lib_deps} M5Unified - M5GFX [lib_m5core2] lib_deps = @@ -76,33 +75,39 @@ lib_deps = [lgfx] +extends = lib_lgfx build_flags = -DTEST_LGFX -lib_deps = ${lib_lgfx.lib_deps} +;lib_deps = ${lib_lgfx.lib_deps} [M5StickC] +extends = lib_m5stickc board = m5stick-c build_flags = -DTEST_M5StickC -lib_deps = ${lib_m5stickc.lib_deps} +;lib_deps = ${lib_m5stickc.lib_deps} [M5Stack] +extends = lib_chimeracore board = m5stack-core-esp32 build_flags = -DTEST_M5Stack -lib_deps = ${lib_chimeracore.lib_deps} +;lib_deps = ${lib_chimeracore.lib_deps} [M5Core2] +extends = lib_m5core2 board = m5stack-core2 build_flags = -DTEST_M5Core2 -lib_deps = ${lib_m5core2.lib_deps} +;lib_deps = ${lib_m5core2.lib_deps} [M5Unified] +extends = lib_m5unified build_flags = -DTEST_M5Unified -lib_deps = ${lib_m5unified.lib_deps} +;lib_deps = ${lib_m5unified.lib_deps} [S3Box] +extends = lib_chimeracore board = esp32dev board_build.mcu = esp32s3 build_flags = -DTEST_S3Box -lib_deps = ${lib_chimeracore.lib_deps} +;lib_deps = ${lib_chimeracore.lib_deps} [env:m5stack-core-esp32] [env:m5stack-core2] From a83fad25398ff653c34849a1c014be329607615e Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 18:11:38 +0200 Subject: [PATCH 39/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 0eedb719..4b264141 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -38,14 +38,11 @@ jobs: platform-version: - 1.0.6 - # platform-version 2.0.0 has no valid core - 2.0.0 - 2.0.1 - 2.0.2 - 2.0.3-RC1 - - exclude: - { piocontext: s3box, platform-version: 1.0.6 } - { piocontext: s3box, platform-version: 2.0.0 } From aaf45f598d8bf9f1fdf2c93bf30fad6fa4cd837a Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 18:12:28 +0200 Subject: [PATCH 40/50] Adding pio tests --- .github/workflows/.ArduinoBuild.yml.kate-swp | Bin 0 -> 62 bytes .github/workflows/ArduinoBuild.yml | 57 +++++-------------- 2 files changed, 13 insertions(+), 44 deletions(-) create mode 100644 .github/workflows/.ArduinoBuild.yml.kate-swp diff --git a/.github/workflows/.ArduinoBuild.yml.kate-swp b/.github/workflows/.ArduinoBuild.yml.kate-swp new file mode 100644 index 0000000000000000000000000000000000000000..4351bf20f2d1998f8dd6b6ad91034956d5775663 GIT binary patch literal 62 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vnx$<>dxp2nvO%~g&&dLWL>?ptA$sX(p Ol+glWE+A%1cLe}KdJ%O1 literal 0 HcmV?d00001 diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml index aa443ab4..d4f59677 100644 --- a/.github/workflows/ArduinoBuild.yml +++ b/.github/workflows/ArduinoBuild.yml @@ -23,38 +23,29 @@ jobs: - 1.0.6 - 2.0.0 - 2.0.1 - #- 2.0.2 # has broken SD Support + - 2.0.2 # has broken SD Support - 2.0.3-RC1 matrix-context: - - M5Core2-test - M5Stack-test - M5StickC-test - LGFX-test - M5Unified-test - S3Box-Test + #- TTGO-LoRa32-V2-test - M5Stack - M5Core2 - M5Fire - OdroidGo - #- TTGO-LoRa32-V2-test - - #exclude: - # - matrix-context: OdroidGo-SD-Menu - # sdk-version: 1.0.6 exclude: + - sdk-version: 2.0.2 # has broken SD Support # There's no esp32s3box support before 2.0.3 - - matrix-context: S3Box-Test - sdk-version: 1.0.6 - - matrix-context: S3Box-Test - sdk-version: 2.0.0 - - matrix-context: S3Box-Test - sdk-version: 2.0.1 - #- matrix-context: S3Box-Test - # sdk-version: 2.0.2 - + - { matrix-context: S3Box-Test, sdk-version: 1.0.6 } + - { matrix-context: S3Box-Test, sdk-version: 2.0.0 } + - { matrix-context: S3Box-Test, sdk-version: 2.0.1 } + #- { matrix-context: S3Box-Test sdk-version: 2.0.2 } include: @@ -62,36 +53,15 @@ jobs: - sdk-version: 1.0.6 - sdk-version: 2.0.0 - sdk-version: 2.0.1 - #- sdk-version: 2.0.2 # has broken SD Support - sdk-version: 2.0.3-RC1 # library health test sketches - - matrix-context: M5Core2-test - arduino-board: m5stack-core2 - sketch-names: M5Core2-SDLoader-Snippet.ino - required-libraries: "M5Core2" - - matrix-context: M5Stack-test - arduino-board: m5stack-core-esp32 - sketch-names: M5Stack-SDLoader-Snippet.ino - required-libraries: "ESP32-Chimera-Core,LovyanGFX" - - - matrix-context: S3Box-Test - arduino-board: esp32s3box - sketch-names: M5Stack-SDLoader-Snippet.ino - required-libraries: "ESP32-Chimera-Core,LovyanGFX" - - - matrix-context: M5Unified-test - arduino-board: m5stack-core2 - sketch-names: M5Unified.ino - required-libraries: "M5GFX,M5Unified" - - matrix-context: M5StickC-test - arduino-board: m5stick-c - sketch-names: M5StickC-SPIFFS-Loader-Snippet.ino - required-libraries: "M5StickC" - - matrix-context: LGFX-test - arduino-board: m5stack-core-esp32 - sketch-names: LGFX-SDLoader-Snippet.ino - required-libraries: "LovyanGFX" + - { matrix-context: M5Core2-test, arduino-board: m5stack-core2, sketch-names: M5Core2-SDLoader-Snippet.ino, required-libraries: "M5Core2", ... } + - { matrix-context: M5Stack-test, arduino-board: m5stack-core-esp32, sketch-names: M5Stack-SDLoader-Snippet.ino, required-libraries: "ESP32-Chimera-Core,LovyanGFX", ... } + - { matrix-context: S3Box-Test, arduino-board: esp32s3box, sketch-names: M5Stack-SDLoader-Snippet.ino, required-libraries: "ESP32-Chimera-Core,LovyanGFX", ... } + - { matrix-context: M5Unified-test, arduino-board: m5stack-core2, sketch-names: M5Unified.ino, required-libraries: "M5GFX,M5Unified", ... } + - { matrix-context: M5StickC-test, arduino-board: m5stick-c, sketch-names: M5StickC-SPIFFS-Loader-Snippet.ino, required-libraries: "M5StickC", ... } + - { matrix-context: LGFX-test, arduino-board: m5stack-core-esp32, sketch-names: LGFX-SDLoader-Snippet.ino, required-libraries: "LovyanGFX", ... } # Launcher and Appstore - matrix-context: M5Stack @@ -124,7 +94,6 @@ jobs: #sketch-names: TTGO-test.ino #required-libraries: "ESP32-Chimera-Core,LovyanGFX,ArduinoJson" - fail-fast: false steps: From 00cd346140f1f408f741c2bd27c1805cfb73788f Mon Sep 17 00:00:00 2001 From: tobozo Date: Wed, 13 Apr 2022 18:15:39 +0200 Subject: [PATCH 41/50] Adding pio tests --- .github/workflows/.ArduinoBuild.yml.kate-swp | Bin 62 -> 0 bytes .github/workflows/ArduinoBuild.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .github/workflows/.ArduinoBuild.yml.kate-swp diff --git a/.github/workflows/.ArduinoBuild.yml.kate-swp b/.github/workflows/.ArduinoBuild.yml.kate-swp deleted file mode 100644 index 4351bf20f2d1998f8dd6b6ad91034956d5775663..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vnx$<>dxp2nvO%~g&&dLWL>?ptA$sX(p Ol+glWE+A%1cLe}KdJ%O1 diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml index d4f59677..d62ae144 100644 --- a/.github/workflows/ArduinoBuild.yml +++ b/.github/workflows/ArduinoBuild.yml @@ -13,7 +13,7 @@ on: jobs: matrix_build: - name: ${{ matrix.matrix-context }} (${{ matrix.sketch-names }}@${{ matrix.sdk-version }}) + name: ${{ matrix.matrix-context }}@${{ matrix.sdk-version }}) runs-on: ubuntu-latest strategy: From a58f7e0749ad4672df29416efacd517685618eeb Mon Sep 17 00:00:00 2001 From: tobozo Date: Fri, 15 Apr 2022 12:19:54 +0200 Subject: [PATCH 42/50] Adding pio tests --- examples/Test/build_test/platformio.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 170eb16f..aed03ec6 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -18,11 +18,11 @@ platform_packages = framework-arduinoespressif32 [platform_tasmota] platform = https://github.com/tasmota/platform-espressif32 -[platform_official] +[platform_dev] platform = https://github.com/platformio/platform-espressif32.git [esp32_1_0_6] -platform = ${platform_official.platform} +platform = ${platform_default.platform} platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.6 [esp32_2_0_0] From 09f7c2d343ef2ab10424cd78ec65534d64812241 Mon Sep 17 00:00:00 2001 From: tobozo Date: Fri, 15 Apr 2022 12:26:01 +0200 Subject: [PATCH 43/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 4b264141..fe6cd953 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -90,7 +90,7 @@ jobs: - name: Run PlatformIO run: | cd ${{ env.PROJECT_DIR }} - [[ "${{ env.BRANCH_NAME }}" == "master" ]] && rm dev_lib_deps.ini || echo "Develop!" + [[ "${{ env.BRANCH_NAME }}" == "master" ]] && rm dev_lib_deps.ini || echo "Develop!" && pio system prune -f pio lib -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} install --no-save file://$(realpath ../../../) pio run -e ${{ matrix.piocontext }}@${{ matrix.platform-version }} From 3f2b69bd4e18b32c048a87ae538986a361e98335 Mon Sep 17 00:00:00 2001 From: tobozo Date: Fri, 15 Apr 2022 12:37:47 +0200 Subject: [PATCH 44/50] Adding pio tests --- examples/Test/build_test/platformio.ini | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index aed03ec6..233cc845 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -18,11 +18,11 @@ platform_packages = framework-arduinoespressif32 [platform_tasmota] platform = https://github.com/tasmota/platform-espressif32 -[platform_dev] -platform = https://github.com/platformio/platform-espressif32.git +;[platform_dev] +;platform = https://github.com/platformio/platform-espressif32.git [esp32_1_0_6] -platform = ${platform_default.platform} +platform = espressif32 platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.6 [esp32_2_0_0] @@ -77,37 +77,32 @@ lib_deps = [lgfx] extends = lib_lgfx build_flags = -DTEST_LGFX -;lib_deps = ${lib_lgfx.lib_deps} [M5StickC] extends = lib_m5stickc board = m5stick-c build_flags = -DTEST_M5StickC -;lib_deps = ${lib_m5stickc.lib_deps} [M5Stack] extends = lib_chimeracore board = m5stack-core-esp32 build_flags = -DTEST_M5Stack -;lib_deps = ${lib_chimeracore.lib_deps} [M5Core2] extends = lib_m5core2 board = m5stack-core2 build_flags = -DTEST_M5Core2 -;lib_deps = ${lib_m5core2.lib_deps} [M5Unified] extends = lib_m5unified build_flags = -DTEST_M5Unified -;lib_deps = ${lib_m5unified.lib_deps} [S3Box] extends = lib_chimeracore board = esp32dev board_build.mcu = esp32s3 build_flags = -DTEST_S3Box -;lib_deps = ${lib_chimeracore.lib_deps} + [env:m5stack-core-esp32] [env:m5stack-core2] From 3131599fa3feca38ad43adc9d2346a7bd88bdfa4 Mon Sep 17 00:00:00 2001 From: tobozo Date: Fri, 15 Apr 2022 12:54:16 +0200 Subject: [PATCH 45/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 10 +++++----- examples/Test/build_test/platformio.ini | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index fe6cd953..9e04e993 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -72,11 +72,11 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - - name: Cache PlatformIO - uses: actions/cache@v2 - with: - path: ~/.platformio - key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} + #- name: Cache PlatformIO + #uses: actions/cache@v2 + #with: + #path: ~/.platformio + #key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python uses: actions/setup-python@v2 diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 233cc845..a0529251 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -23,7 +23,9 @@ platform = https://github.com/tasmota/platform-espressif32 [esp32_1_0_6] platform = espressif32 -platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.6 +platform_packages = + toolchain-xtensa32 @ ~2.50200.0 + framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.6 [esp32_2_0_0] platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream From ffcf4e5db9423481350896b68579d18c3ea9d625 Mon Sep 17 00:00:00 2001 From: tobozo Date: Fri, 15 Apr 2022 14:09:33 +0200 Subject: [PATCH 46/50] Adding pio tests --- .github/workflows/PlatformioBuild.yml | 10 +++++----- examples/Test/build_test/platformio.ini | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 9e04e993..fe6cd953 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -72,11 +72,11 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - #- name: Cache PlatformIO - #uses: actions/cache@v2 - #with: - #path: ~/.platformio - #key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} + - name: Cache PlatformIO + uses: actions/cache@v2 + with: + path: ~/.platformio + key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python uses: actions/setup-python@v2 diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index a0529251..32a1226b 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -22,10 +22,10 @@ platform = https://github.com/tasmota/platform-espressif32 ;platform = https://github.com/platformio/platform-espressif32.git [esp32_1_0_6] -platform = espressif32 -platform_packages = - toolchain-xtensa32 @ ~2.50200.0 - framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.6 +platform = espressif32 @ ^3 +;platform_packages = +; toolchain-xtensa32 @ ~2.50200.0 +; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.6 [esp32_2_0_0] platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream From d908db3e9863db3ff50f0c0eb197b81329680837 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sun, 31 Jul 2022 10:47:23 +0200 Subject: [PATCH 47/50] Updated package versions --- .github/workflows/ArduinoBuild.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml index d62ae144..718db998 100644 --- a/.github/workflows/ArduinoBuild.yml +++ b/.github/workflows/ArduinoBuild.yml @@ -23,8 +23,9 @@ jobs: - 1.0.6 - 2.0.0 - 2.0.1 - - 2.0.2 # has broken SD Support - - 2.0.3-RC1 + # - 2.0.2 # has broken SD Support + - 2.0.3 + - 2.0.4 matrix-context: - M5Core2-test @@ -53,7 +54,8 @@ jobs: - sdk-version: 1.0.6 - sdk-version: 2.0.0 - sdk-version: 2.0.1 - - sdk-version: 2.0.3-RC1 + - sdk-version: 2.0.3 + - sdk-version: 2.0.4 # library health test sketches - { matrix-context: M5Core2-test, arduino-board: m5stack-core2, sketch-names: M5Core2-SDLoader-Snippet.ino, required-libraries: "M5Core2", ... } From d8760688443792e2bf1384ced9eb3ff52ea29cff Mon Sep 17 00:00:00 2001 From: tobozo Date: Sun, 31 Jul 2022 11:19:07 +0200 Subject: [PATCH 48/50] removed obsolete packages + fix gh-action mess --- .github/workflows/ArduinoBuild.yml | 9 +++---- .github/workflows/PlatformioBuild.yml | 7 +++--- examples/Test/build_test/platformio.ini | 32 ++++++++++++++++++------- src/M5StackUpdaterUI.h | 2 +- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml index 718db998..2774905e 100644 --- a/.github/workflows/ArduinoBuild.yml +++ b/.github/workflows/ArduinoBuild.yml @@ -21,8 +21,8 @@ jobs: sdk-version: - 1.0.6 - - 2.0.0 - - 2.0.1 + #- 2.0.0 + #- 2.0.1 # - 2.0.2 # has broken SD Support - 2.0.3 - 2.0.4 @@ -44,9 +44,10 @@ jobs: - sdk-version: 2.0.2 # has broken SD Support # There's no esp32s3box support before 2.0.3 - { matrix-context: S3Box-Test, sdk-version: 1.0.6 } - - { matrix-context: S3Box-Test, sdk-version: 2.0.0 } - - { matrix-context: S3Box-Test, sdk-version: 2.0.1 } + #- { matrix-context: S3Box-Test, sdk-version: 2.0.0 } + #- { matrix-context: S3Box-Test, sdk-version: 2.0.1 } #- { matrix-context: S3Box-Test sdk-version: 2.0.2 } + - { matrix-context: M5Core2-test, sdk-version: 1.0.6 } # M5Core2.h suddenly ceased to support 1.0.6 (I2S and I2C broken) include: diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index fe6cd953..ae5724db 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -40,14 +40,15 @@ jobs: - 1.0.6 - 2.0.0 - 2.0.1 - - 2.0.2 - - 2.0.3-RC1 + #- 2.0.2 # has broken SD Support + - 2.0.3 + - 2.0.4 exclude: - { piocontext: s3box, platform-version: 1.0.6 } - { piocontext: s3box, platform-version: 2.0.0 } - { piocontext: s3box, platform-version: 2.0.1 } - - { piocontext: s3box, platform-version: 2.0.2 } + #- { piocontext: s3box, platform-version: 2.0.2 } include: - piocontext: lgfx diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 32a1226b..0bf6de34 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -42,8 +42,12 @@ platform = ${platform_tasmota.platform} platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.2 [esp32_2_0_3] -platform = ${platform_tasmota.platform} -platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3-RC1 +platform = espressif32 @ ^4 +platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3 + +[esp32_2_0_4] +platform = espressif32 +platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.4 [lib_sdupdater] @@ -121,8 +125,10 @@ extends = esp32_2_0_0, M5Stack extends = esp32_2_0_1, M5Stack [env:m5stack-core-esp32@2.0.2] extends = esp32_2_0_2, M5Stack -[env:m5stack-core-esp32@2.0.3-RC1] +[env:m5stack-core-esp32@2.0.3] extends = esp32_2_0_3, M5Stack +[env:m5stack-core-esp32@2.0.4] +extends = esp32_2_0_4, M5Stack [env:m5stack-core2@1.0.6] extends = esp32_1_0_6, M5Core2 @@ -132,8 +138,10 @@ extends = esp32_2_0_0, M5Core2 extends = esp32_2_0_1, M5Core2 [env:m5stack-core2@2.0.2] extends = esp32_2_0_2, M5Core2 -[env:m5stack-core2@2.0.3-RC1] +[env:m5stack-core2@2.0.3] extends = esp32_2_0_3, M5Core2 +[env:m5stack-core2@2.0.4] +extends = esp32_2_0_4, M5Core2 [env:m5stick-c@1.0.6] extends = esp32_1_0_6, M5StickC @@ -143,8 +151,10 @@ extends = esp32_2_0_0, M5StickC extends = esp32_2_0_1, M5StickC [env:m5stick-c@2.0.2] extends = esp32_2_0_2, M5StickC -[env:m5stick-c@2.0.3-RC1] +[env:m5stick-c@2.0.3] extends = esp32_2_0_3, M5StickC +[env:m5stick-c@2.0.4] +extends = esp32_2_0_4, M5StickC [env:m5unified@1.0.6] extends = esp32_1_0_6, M5Unified @@ -154,8 +164,10 @@ extends = esp32_2_0_0, M5Unified extends = esp32_2_0_1, M5Unified [env:m5unified@2.0.2] extends = esp32_2_0_2, M5Unified -[env:m5unified@2.0.3-RC1] +[env:m5unified@2.0.3] extends = esp32_2_0_3, M5Unified +[env:m5unified@2.0.4] +extends = esp32_2_0_4, M5Unified [env:lgfx@1.0.6] extends = esp32_1_0_6, lgfx @@ -165,8 +177,12 @@ extends = esp32_2_0_0, lgfx extends = esp32_2_0_1, lgfx [env:lgfx@2.0.2] extends = esp32_2_0_2, lgfx -[env:lgfx@2.0.3-RC1] +[env:lgfx@2.0.3] +extends = esp32_2_0_3, lgfx +[env:lgfx@2.0.4] extends = esp32_2_0_3, lgfx -[env:s3box@2.0.3-RC1] +[env:s3box@2.0.3] extends = esp32_2_0_3, S3Box +[env:s3box@2.0.4] +extends = esp32_2_0_4, S3Box diff --git a/src/M5StackUpdaterUI.h b/src/M5StackUpdaterUI.h index e93d1a38..9694d7f0 100644 --- a/src/M5StackUpdaterUI.h +++ b/src/M5StackUpdaterUI.h @@ -500,7 +500,7 @@ static void SDMenuProgressHeadless( int state, int size ) xpos = 0 ; } } - int posX = (SDU_GFX.width() - ProgressStyle.width+2) >> 1; + //int posX = (SDU_GFX.width() - ProgressStyle.width+2) >> 1; int posY = (SDU_GFX.height()- ProgressStyle.height+2) >> 1; SDU_GFX.setCursor( xpos, posY - 20 ); SDU_GFX.print( label ); From 61fa45e8746a80bcbf0f8d17ed7cbcdb116c5099 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sun, 31 Jul 2022 12:01:35 +0200 Subject: [PATCH 49/50] still fixing gh-action mess --- .github/workflows/ArduinoBuild.yml | 1 + examples/Test/build_test/platformio.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml index 2774905e..89836128 100644 --- a/.github/workflows/ArduinoBuild.yml +++ b/.github/workflows/ArduinoBuild.yml @@ -114,6 +114,7 @@ jobs: required-libraries: ${{ matrix.required-libraries }} extra-arduino-lib-install-args: --no-deps # extra-arduino-cli-args: ${{ matrix.extra-arduino-cli-args }} + extra-arduino-cli-args: "--warnings default " # see https://github.com/ArminJo/arduino-test-compile/issues/28 sketch-names: ${{ matrix.sketch-names }} set-build-path: true build-properties: ${{ toJson(matrix.build-properties) }} diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini index 0bf6de34..762bd5de 100644 --- a/examples/Test/build_test/platformio.ini +++ b/examples/Test/build_test/platformio.ini @@ -46,7 +46,7 @@ platform = espressif32 @ ^4 platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3 [esp32_2_0_4] -platform = espressif32 +platform = espressif32 @ ^5 platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.4 From 8d78a09ce0e4b54ad645c2dc1b6f4e1a730ecb84 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sun, 31 Jul 2022 12:27:03 +0200 Subject: [PATCH 50/50] still fixing gh-action mess --- .github/workflows/ArduinoBuild.yml | 6 ++++-- .github/workflows/PlatformioBuild.yml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml index 89836128..d9b1957e 100644 --- a/.github/workflows/ArduinoBuild.yml +++ b/.github/workflows/ArduinoBuild.yml @@ -47,14 +47,16 @@ jobs: #- { matrix-context: S3Box-Test, sdk-version: 2.0.0 } #- { matrix-context: S3Box-Test, sdk-version: 2.0.1 } #- { matrix-context: S3Box-Test sdk-version: 2.0.2 } + - { matrix-context: S3Box-Test, sdk-version: 2.0.4 } # will be fixed in 2.0.5 https://github.com/espressif/arduino-esp32/pull/6962/files - { matrix-context: M5Core2-test, sdk-version: 1.0.6 } # M5Core2.h suddenly ceased to support 1.0.6 (I2S and I2C broken) + include: # buildable sdk versions - sdk-version: 1.0.6 - - sdk-version: 2.0.0 - - sdk-version: 2.0.1 + #- sdk-version: 2.0.0 + #- sdk-version: 2.0.1 - sdk-version: 2.0.3 - sdk-version: 2.0.4 diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index ae5724db..e951c622 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -49,6 +49,8 @@ jobs: - { piocontext: s3box, platform-version: 2.0.0 } - { piocontext: s3box, platform-version: 2.0.1 } #- { piocontext: s3box, platform-version: 2.0.2 } + - { piocontext: m5stack-core2, platform-version: 1.0.6 } # M5Core2.h broken I2S support with 1.0.6 + - { piocontext: m5stack-core2, platform-version: 2.0.0 } # M5Core2.h broken I2S support with 2.0.0 include: - piocontext: lgfx