Merge pull request #74 from tobozo/1.4.1

1.4.1

.github/workflows/ArduinoBuild.yml

@@ -1,8 +1,5 @@
 name: ArduinoBuild
 
-env:
-  SKETCH_NAME: Display.ino
-
 on:
   push:
     paths:
@@ -16,55 +13,70 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
-    name: ${{ matrix.fancy-name }}
 
+  matrix_build:
+    name: ${{ matrix.board }}@${{ matrix.platform-version }}
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
 
-        arduino-boards-fqbn:
-          - esp32:esp32:esp32
-          - esp32:esp32:m5stick-c
-          - esp32:esp32:m5stack-core-esp32
-          - esp32:esp32:m5stack-fire
-          - esp32:esp32:m5stack-core2
-          - esp32:esp32:odroid_esp32
-          - esp32:esp32:esp32wroverkit
-          - esp32:esp32:d32_pro
-          - esp32:esp32:twatch
-          - esp32:esp32:ttgo-t1
-          #- esp32:esp32:ttgo-lora32-v2
-          #- esp32:esp32:d-duino-32-xs
+        platform-version:
+          # ESP32 Core versions
+          - 1.0.6
+          - 2.0.0
+          - 2.0.1
+          - 2.0.2
+          - 2.0.3-RC1
 
-        platform-url:
-          - https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
+        board:
+          # Supported boards fancy names
+          - esp32
+          - esp32wroverkit
+          - m5stack-core2
+          - m5stack-core-esp32
+          - m5stick-c
+          - m5stack-fire
+          - twatch
+          - ttgo-t1
+          - d32_pro
+          - esp32s3box
+          - odroid_esp32
 
-        required-libraries:
-          - LovyanGFX
+        exclude:
+          # No esp32s3box support before 2.0.3
+          - board: esp32s3box
+            platform-version: 1.0.6
+          - board: esp32s3box
+            platform-version: 2.0.0
+          - board: esp32s3box
+            platform-version: 2.0.1
+          - board: esp32s3box
+            platform-version: 2.0.2
+          # No ESP32-Wrover-Kit board profile before 2.0.0
+          - board: esp32wroverkit
+            platform-version: 1.0.6
 
         include:
-          - arduino-boards-fqbn: esp32:esp32:esp32
-            fancy-name: ESP32 Generic
-          - arduino-boards-fqbn: esp32:esp32:m5stick-c
-            fancy-name: M5StickC
-          - arduino-boards-fqbn: esp32:esp32:m5stack-core-esp32
-            fancy-name: M5Stack
-          - arduino-boards-fqbn: esp32:esp32:m5stack-core2
-            fancy-name: M5Core2
-          - arduino-boards-fqbn: esp32:esp32:m5stack-fire
-            fancy-name: M5Fire
-          - arduino-boards-fqbn: esp32:esp32:odroid_esp32
-            fancy-name: OdroidGo
-          - arduino-boards-fqbn: esp32:esp32:esp32wroverkit
-            fancy-name: Wrover-Kit
-          - arduino-boards-fqbn: esp32:esp32:d32_pro
-            fancy-name: LoLin D32 Pro
-          - arduino-boards-fqbn: esp32:esp32:twatch
-            fancy-name: TTGO TWatch
-          - arduino-boards-fqbn: esp32:esp32:ttgo-t1
-            fancy-name: TTGO T-1
+          # testable boards
+          - board: esp32
+          - board: esp32wroverkit
+          - board: m5stack-core2
+          - board: m5stack-core-esp32
+          - board: m5stick-c
+          - board: m5stack-fire
+          - board: twatch
+          - board: ttgo-t1
+          - board: d32_pro
+          - board: esp32s3box
+          - board: odroid_esp32
+
+          # testable sdk versions
+          - platform-version: 1.0.6
+          - platform-version: 2.0.0
+          - platform-version: 2.0.1
+          - platform-version: 2.0.2
+          - platform-version: 2.0.3-RC1
 
       fail-fast: false
 
@@ -74,15 +86,23 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Compile example
-        uses: ArminJo/arduino-test-compile@v3
+      - name: Checkout custom library
+        uses: actions/checkout@v2
         with:
-          arduino-board-fqbn: ${{ matrix.arduino-boards-fqbn }}
-          platform-url: ${{ matrix.platform-url }}
-          required-libraries: ${{ matrix.required-libraries }}
-          build-properties: ${{ toJson(matrix.build-properties) }}
-          sketch-names: ${{ env.SKETCH_NAME }}
-          #platform-default-url: ${{ env.PLATFORM_DEFAULT_URL }}
-          #sketches-exclude: ${{ matrix.sketches-exclude }}
-
+          repository: Lovyan03/LovyanGFX
+          ref: develop
+          path: CustomLGFX # must contain string "Custom"
 
+      - name: ${{ matrix.board }}
+        uses: ArminJo/arduino-test-compile@v3
+        with:
+          platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
+          arduino-board-fqbn: esp32:esp32:${{ matrix.board }}
+          arduino-platform: esp32:esp32@${{ matrix.platform-version }}
+          #required-libraries: LovyanGFX
+          extra-arduino-lib-install-args: --no-deps
+          sketch-names: Display.ino
+          set-build-path: true
+          # extra-arduino-cli-args: ${{ matrix.extra-arduino-cli-args }}
+          # build-properties: ${{ toJson(matrix.build-properties) }}
+          # debug-install: true

.github/workflows/PlatformioBuild.yml

@@ -32,6 +32,7 @@ jobs:
           - m5stack-core2
           - odroid_esp32
           - esp32wroverkit
+          - esp32s3box
           - d32_pro
           - twatch
           - ttgo-t1

README.md

@@ -1,7 +1,9 @@
 # ESP32-Chimera-Core Library
 
 [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP32-Chimera-Core.svg?)](https://www.ardu-badge.com/ESP32-Chimera-Core)
-[![Build Status](https://travis-ci.com/tobozo/ESP32-Chimera-Core.svg?branch=master)](https://travis-ci.com/github/tobozo/ESP32-Chimera-Core)
+[![PlatformIO Registry](https://badges.registry.platformio.org/packages/tobozo/library/ESP32-Chimera-Core.svg)](https://registry.platformio.org/packages/libraries/tobozo/ESP32-Chimera-Core)
+![Arduino Build](https://github.com/tobozo/ESP32-Chimera-Core/actions/workflows/ArduinoBuild.yml/badge.svg)
+![Platformio Build](https://github.com/tobozo/ESP32-Chimera-Core/actions/workflows/PlatformioBuild.yml/badge.svg)
 
 ![Illustration By Jacopo Ligozzi](https://user-images.githubusercontent.com/1893754/71980273-ed9bb100-321f-11ea-8982-49702af29c9f.png)
 
@@ -13,6 +15,7 @@ This library is a *substitute* of the original [M5Stack](https://github.com/m5st
   - [M5Stack Core2](https://m5stack.com/products/m5stack-core2-esp32-iot-development-kit)
   - [M5StickC](https://m5stack.com/collections/m5-core/products/stick-c)
   - [Odroid-Go](https://www.hardkernel.com/shop/odroid-go/)
+  - [ESP32-S3-Box](https://github.com/espressif/esp-box)
   - [D-Duino-32-XS](https://www.tindie.com/products/lspoplove/dstike-d-duino-32-xs/)
   - [LoLin D32-Pro](https://www.aliexpress.com/item/32883116057.html)
   - [ESP32-Wrover-Kit (v4.1, v4.2, v4.3)](https://www.sparkfun.com/products/14917)
@@ -30,7 +33,7 @@ It also implements a set of extra features:
 
 
 GFX implementation is a courtesy of @lovyan03 who (in the first days of this library) did a marvelous work of integrating his
-[LovyanGFX](https://github.com/lovyan03/LovyanGFX) library into his own [ESP32-Chimera-Core fork](https://github.com/lovyan03/ESP32-Chimera-Core). Since then, [LovyanGFX](https://github.com/lovyan03/LovyanGFX) has become an external dependency of this library.
+[LovyanGFX](https://github.com/lovyan03/LovyanGFX) library into his own [ESP32-Chimera-Core fork](https://github.com/lovyan03/ESP32-Chimera-Core). Since then, [LovyanGFX](https://github.com/lovyan03/LovyanGFX) has become an external dependency of this library and even given birth to [M5Unified](https://github.com/M5Stack/M5Unified) which has the same spirit as Chimera-Core but focuses on M5 products only.
 
 [LovyanGFX](https://github.com/lovyan03/LovyanGFX) is an optimized display driver maintained by [@lovyan03](https://github.com/lovyan03/),
 it brings an average 30% speed improvement compared to other drivers along with more flexibility towards adding custom boards.

boards/boards.local.txt

@@ -1,3 +1,15 @@
+########## Odroid-Go fix for wroom/wrover mismatch with upload and partition size) ###########
+
+odroid_esp32.upload.maximum_size=6553600
+odroid_esp32.upload.maximum_data_size=4521984
+
+odroid_esp32.menu.PartitionScheme.default=Default (2 x 6.5 MB app, 3.6 MB SPIFFS)
+odroid_esp32.menu.PartitionScheme.default.build.partitions=default_16MB
+odroid_esp32.menu.PartitionScheme.default.upload.maximum_size=6553600
+odroid_esp32.menu.PartitionScheme.large_spiffs=Large SPIFFS (7 MB)
+odroid_esp32.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
+odroid_esp32.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824
+
 
 ############# Chimera-Core specific : D-Duino-32-XS ##########################################
 

examples/Tests/build_test/platformio.ini

@@ -51,3 +51,9 @@ board = ttgo-t1
 
 [env:ttgo-lora32-v2]
 board = ttgo-lora32-v2
+
+[env:esp32s3box]
+platform = https://github.com/tasmota/platform-espressif32
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3-RC1
+board = esp32dev
+board_build.mcu = esp32s3

examples/Tests/esp32-s3-box/esp32-s3-box.ino

@@ -0,0 +1,43 @@
+#include <ESP32-Chimera-Core.h>
+
+#if defined HAS_SDCARD
+  #define USE_SDUPDATER
+#endif
+
+
+#define SDU_APP_NAME   "ESP32-S3-Box Test"      // app title for the sd-updater lobby screen
+#define SDU_APP_PATH   "/S3BoxTest.bin" // app binary file name on the SD Card (also displayed on the sd-updater lobby screen)
+#define SDU_APP_AUTHOR "@tobozo"      // app binary author name for the sd-updater lobby screen
+#if defined USE_SDUPDATER
+  #include <M5StackUpdater.h> // https://github.com/tobozo/M5Stack-SD-Updater (get it from your library manager)
+#endif
+
+
+
+void setup()
+{
+
+  M5.begin();
+
+  checkSDUpdater( SD, MENU_BIN, 15000, TFCARD_CS_PIN );
+
+}
+
+void loop()
+{
+  /*
+  if( digitalRead( GPIO_NUM_1 ) != lastbtnstate ) {
+    lastbtnstate = 1-lastbtnstate;
+    log_d("btnstate: %d", lastbtnstate );
+  }*/
+  //BtnMute->read();
+  //if( BtnMute->wasPressed() ) log_e("BtnMute");
+
+   //M5.update();
+   //if( M5.BtnA.wasPressed() ) log_e("BtnA");
+//   if( M5.BtnB.wasPressed() ) log_e("BtnB");
+//   if( M5.BtnC.wasPressed() ) log_e("BtnC");
+
+  //delay(100);
+
+}

library.json

@@ -22,7 +22,7 @@
       "name": "LovyanGFX"
     }
   ],
-  "version": "1.4.0",
+  "version": "1.4.1",
   "framework": "arduino",
   "platforms": "espressif32",
   "headers": "ESP32-Chimera-Core.h",

library.properties

@@ -1,5 +1,5 @@
 name=ESP32-Chimera-Core
-version=1.4.0
+version=1.4.1
 author=tobozo,Lovyan03
 maintainer[email protected]
 sentence=Alternate library M5Stack/M5Core2/Odroid-Go/D-Duino and possiblly other ESP32/TFT/SD bundles