Merge pull request #412 from lovyan03/develop

1.1.7
lovyan03 · Jun 10, 2023 · 0cabacd · 0cabacd
2 parents 8be80cb + 38fbb02
commit 0cabacd
Show file tree

Hide file tree

Showing 35 changed files with 565 additions and 2,952 deletions.
diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml
@@ -32,20 +32,23 @@ jobs:
           - m5stick-c
           - m5stack-core-esp32
           - m5stack-core2
+          - m5stack-cores3
 
         platform-version:
           - 1.0.6
-          - 2.0.4
+          #- 2.0.4
           - 2.0.5
           - 2.0.6
           - 2.0.7
+          - 2.0.8
           - default
 
         exclude:
           - { board: esp32-c3, platform-version: 1.0.6 }
           - { board: esp32-s3, platform-version: 1.0.6 }
           - { board: esp32-s3, platform-version: default } # 2.0.5 => esp32s3/include/newlib/platform_include/assert.h:20:10: fatal error: sdkconfig.h: No such file or directory
           - { board: esp32-s2, platform-version: 1.0.6 }
+          - { board: m5stack-cores3, platform-version: 1.0.6 }
 
         include:
           - board: esp32
@@ -55,6 +58,7 @@ jobs:
           - board: m5stick-c
           - board: m5stack-core-esp32
           - board: m5stack-core2
+          - board: m5stack-cores3
           - { board: esp8266, platform-version: 3.0.0, ... }
           - { board: esp8266, platform-version: 3.1.0, ... }
           - { board: esp8266, platform-version: 3.2.0, ... }
@@ -96,5 +100,7 @@ jobs:
 
         run: |
           cd ${{ env.PROJECT_DIR }}
-          pio pkg install -e ${{ matrix.board }}@${{ matrix.platform-version }} --no-save --library file://$(realpath ../../../)
-          pio run -e ${{ matrix.board }}@${{ matrix.platform-version }}
+          export pio_ver=${{ matrix.platform-version }}
+          export pio_env="${pio_ver//./_}"
+          pio pkg install -e ${{ matrix.board }}-$pio_env --no-save --library file://$(realpath ../../../)
+          pio run -e ${{ matrix.board }}-$pio_env
diff --git a/.github/workflows/issues-auto-closer.yml b/.github/workflows/issues-auto-closer.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
       - name: Automatically close issues that do not follow the issue template
         uses: lucasbento/[email protected]
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          issue-close-message: "@${issue.user.login}: hello! :wave:\n\nThis issue is being automatically closed because it does not follow the issue template." # optional property
+          issue-close-message: "Hello! :wave:\n\nThis issue is being automatically closed because it does not follow the issue template." # optional property
           closed-issues-label: "🙁 Not following issue template" # optional property
diff --git a/examples/Test/build_test/platformio_atmelsam.ini b/examples/Test/build_test/platformio_atmelsam.ini
@@ -5,11 +5,11 @@ platform = atmelsam
 [env:seeed_wio_terminal]
 [env:adafruit_pybadge_m4]
 
-[env:seeed_wio_terminal@default]
+[env:seeed_wio_terminal-default]
 platform = ${atmelsam_default.platform}
 board = seeed_wio_terminal
 
-[env:adafruit_pybadge_m4@default]
+[env:adafruit_pybadge_m4-default]
 platform = ${atmelsam_default.platform}
 board = adafruit_pybadge_m4
 build_src_flags =

diff --git a/examples/Test/build_test/platformio_esp32.ini b/examples/Test/build_test/platformio_esp32.ini
@@ -50,7 +50,10 @@ build_flags       = ${coding_standards.build_flags}
 platform          = https://github.com/tasmota/platform-espressif32
 platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.7/esp32-2.0.7.zip
 build_flags       = ${coding_standards.build_flags}
-
+[esp32_2_0_8]
+platform          = https://github.com/tasmota/platform-espressif32
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.8/esp32-2.0.8.zip
+build_flags       = ${coding_standards.build_flags}
 
 
 
@@ -68,6 +71,18 @@ board             = m5stick-c
 board             = m5stack-core-esp32
 [M5Core2]
 board             = m5stack-core2
+[M5CoreS3]
+board = esp32-s3-devkitc-1
+board_upload.flash_size = 16MB
+board_upload.maximum_size = 16777216
+board_build.partitions = default_16MB.csv
+board_build.arduino.memory_type = qio_qspi
+build_flags =
+    ${env.build_flags}
+    -DARDUINO_M5STACK_CORES3
+    -DBOARD_HAS_PSRAM
+    -DARDUINO_UDB_MODE=1
+
 [esp32c3]
 board             = esp32dev
 board_build.mcu   = esp32c3
@@ -87,143 +102,167 @@ board_build.mcu   = esp32s3
 [env:m5stick-c]
 [env:m5stack-core-esp32]
 [env:m5stack-core2]
+[env:m5stack-cores3]
 [env:esp32-s2]
 [env:esp32-s3]
 [env:esp32-c3]
 
 
-[env:[email protected]]
+[env:m5stack-cores3-2_0_5]
+extends          = M5CoreS3, esp32_2_0_5
+[env:m5stack-cores3-2_0_6]
+extends          = M5CoreS3, esp32_2_0_6
+[env:m5stack-cores3-2_0_7]
+extends          = M5CoreS3, esp32_2_0_7
+[env:m5stack-cores3-2_0_8]
+extends          = M5CoreS3, esp32_2_0_8
+[env:m5stack-cores3-default]
+extends          = M5CoreS3, esp32_2_0_8
+
+
+[env:esp32-1_0_6]
 extends           = esp32, esp32_1_0_6
 board             = esp32dev
-[env:esp32@2.0.0]
+[env:esp32-2_0_0]
 extends           = esp32, esp32_2_0_0
-[env:esp32@2.0.1]
+[env:esp32-2_0_1]
 extends           = esp32, esp32_2_0_1
-[env:esp32@2.0.2]
+[env:esp32-2_0_2]
 extends           = esp32, esp32_2_0_2
-[env:esp32@2.0.3]
+[env:esp32-2_0_3]
 extends           = esp32, esp32_2_0_3
-[env:esp32@2.0.4]
+[env:esp32-2_0_4]
 extends           = esp32, esp32_2_0_4
-[env:esp32@2.0.5]
+[env:esp32-2_0_5]
 extends           = esp32, esp32_2_0_5
-[env:esp32@2.0.6]
+[env:esp32-2_0_6]
 extends           = esp32, esp32_2_0_6
-[env:esp32@2.0.7]
+[env:esp32-2_0_7]
 extends           = esp32, esp32_2_0_7
-
-
-[env:esp32@default]
+[env:esp32-2_0_8]
+extends           = esp32, esp32_2_0_8
+[env:esp32-default]
 extends           = esp32, esp32_default
 
-[env:m5stick-c@1.0.6]
+[env:m5stick-c-1_0_6]
 extends           = M5StickC, esp32_1_0_6
-[env:m5stick-c@2.0.0]
+[env:m5stick-c-2_0_0]
 extends           = M5StickC, esp32_2_0_0
-[env:m5stick-c@2.0.1]
+[env:m5stick-c-2_0_1]
 extends           = M5StickC, esp32_2_0_1
-[env:m5stick-c@2.0.2]
+[env:m5stick-c-2_0_2]
 extends           = M5StickC, esp32_2_0_2
-[env:m5stick-c@2.0.3]
+[env:m5stick-c-2_0_3]
 extends           = M5StickC, esp32_2_0_3
-[env:m5stick-c@2.0.4]
+[env:m5stick-c-2_0_4]
 extends           = esp32, esp32_2_0_4
-[env:m5stick-c@2.0.5]
+[env:m5stick-c-2_0_5]
 extends           = esp32, esp32_2_0_5
-[env:m5stick-c@2.0.6]
+[env:m5stick-c-2_0_6]
 extends           = esp32, esp32_2_0_6
-[env:m5stick-c@2.0.7]
+[env:m5stick-c-2_0_7]
 extends           = esp32, esp32_2_0_7
-[env:m5stick-c@default]
+[env:m5stick-c-2_0_8]
+extends           = esp32, esp32_2_0_8
+[env:m5stick-c-default]
 extends           = M5StickC, esp32_default
 
 
-[env:m5stack-core-esp32@1.0.6]
+[env:m5stack-core-esp32-1_0_6]
 extends           = M5Stack, esp32_1_0_6
-[env:m5stack-core-esp32@2.0.0]
+[env:m5stack-core-esp32-2_0_0]
 extends           = M5Stack, esp32_2_0_0
-[env:m5stack-core-esp32@2.0.1]
+[env:m5stack-core-esp32-2_0_1]
 extends           = M5Stack, esp32_2_0_1
-[env:m5stack-core-esp32@2.0.2]
+[env:m5stack-core-esp32-2_0_2]
 extends           = M5Stack, esp32_2_0_2
-[env:m5stack-core-esp32@2.0.3]
+[env:m5stack-core-esp32-2_0_3]
 extends           = M5Stack, esp32_2_0_3
-[env:m5stack-core-esp32@2.0.4]
+[env:m5stack-core-esp32-2_0_4]
 extends           = esp32, esp32_2_0_4
-[env:m5stack-core-esp32@2.0.5]
+[env:m5stack-core-esp32-2_0_5]
 extends           = esp32, esp32_2_0_5
-[env:m5stack-core-esp32@2.0.6]
+[env:m5stack-core-esp32-2_0_6]
 extends           = esp32, esp32_2_0_6
-[env:m5stack-core-esp32@2.0.7]
+[env:m5stack-core-esp32-2_0_7]
 extends           = esp32, esp32_2_0_7
-[env:m5stack-core-esp32@default]
+[env:m5stack-core-esp32-2_0_8]
+extends           = esp32, esp32_2_0_8
+[env:m5stack-core-esp32-default]
 extends           = M5Stack, esp32_default
 
-[env:m5stack-core2@1.0.6]
+[env:m5stack-core2-1_0_6]
 extends           = M5Core2, esp32_1_0_6
-[env:m5stack-core2@2.0.0]
+[env:m5stack-core2-2_0_0]
 extends           = M5Core2, esp32_2_0_0
-[env:m5stack-core2@2.0.1]
+[env:m5stack-core2-2_0_1]
 extends           = M5Core2, esp32_2_0_1
-[env:m5stack-core2@2.0.2]
+[env:m5stack-core2-2_0_2]
 extends           = M5Core2, esp32_2_0_2
-[env:m5stack-core2@2.0.3]
+[env:m5stack-core2-2_0_3]
 extends           = M5Core2, esp32_2_0_3
-[env:m5stack-core2@2.0.4]
+[env:m5stack-core2-2_0_4]
 extends           = esp32, esp32_2_0_4
-[env:m5stack-core2@2.0.5]
+[env:m5stack-core2-2_0_5]
 extends           = esp32, esp32_2_0_5
-[env:m5stack-core2@2.0.6]
+[env:m5stack-core2-2_0_6]
 extends           = esp32, esp32_2_0_6
-[env:m5stack-core2@2.0.7]
+[env:m5stack-core2-2_0_7]
 extends           = esp32, esp32_2_0_7
-[env:m5stack-core2@default]
+[env:m5stack-core2-2_0_8]
+extends           = esp32, esp32_2_0_8
+[env:m5stack-core2-default]
 extends           = M5Core2, esp32_default
 
-
-[env:[email protected]]
+[env:esp32-c3-2_0_1]
 extends           = esp32c3, esp32_2_0_1
-[env:esp32-c3@2.0.2]
+[env:esp32-c3-2_0_2]
 extends           = esp32c3, esp32_2_0_2
-[env:esp32-c3@2.0.3]
+[env:esp32-c3-2_0_3]
 extends           = esp32c3, esp32_2_0_3
-[env:esp32-c3@2.0.4]
+[env:esp32-c3-2_0_4]
 extends           = esp32c3, esp32_2_0_4
-[env:esp32-c3@2.0.5]
+[env:esp32-c3-2_0_5]
 extends           = esp32c3, esp32_2_0_5
-[env:esp32-c3@2.0.6]
+[env:esp32-c3-2_0_6]
 extends           = esp32c3, esp32_2_0_6
-[env:esp32-c3@2.0.7]
+[env:esp32-c3-2_0_7]
 extends           = esp32c3, esp32_2_0_7
-[env:esp32-c3@default]
+[env:esp32-c3-2_0_8]
+extends           = esp32c3, esp32_2_0_8
+[env:esp32-c3-default]
 extends           = esp32c3, esp32_default
 
-[env:esp32-s2@2.0.1]
+[env:esp32-s2-2_0_1]
 extends           = esp32s2, esp32_2_0_1
-[env:esp32-s2@2.0.2]
+[env:esp32-s2-2_0_2]
 extends           = esp32s2, esp32_2_0_2
-[env:esp32-s2@2.0.3]
+[env:esp32-s2-2_0_3]
 extends           = esp32s2, esp32_2_0_3
-[env:esp32-s2@2.0.4]
+[env:esp32-s2-2_0_4]
 extends           = esp32, esp32_2_0_4
-[env:esp32-s2@2.0.5]
+[env:esp32-s2-2_0_5]
 extends           = esp32, esp32_2_0_5
-[env:esp32-s2@2.0.6]
+[env:esp32-s2-2_0_6]
 extends           = esp32, esp32_2_0_6
-[env:esp32-s2@2.0.7]
+[env:esp32-s2-2_0_7]
 extends           = esp32, esp32_2_0_7
-[env:esp32-s2@default]
+[env:esp32-s2-2_0_8]
+extends           = esp32, esp32_2_0_8
+[env:esp32-s2-default]
 extends           = esp32s2, esp32_default
 
-[env:esp32-s3@2.0.3]
+[env:esp32-s3-2_0_3]
 extends           = esp32s3, esp32_2_0_3
-[env:esp32-s3@2.0.4]
+[env:esp32-s3-2_0_4]
 extends           = esp32, esp32_2_0_4
-[env:esp32-s3@2.0.5]
+[env:esp32-s3-2_0_5]
 extends           = esp32, esp32_2_0_5
-[env:esp32-s3@2.0.6]
+[env:esp32-s3-2_0_6]
 extends           = esp32, esp32_2_0_6
-[env:esp32-s3@2.0.7]
+[env:esp32-s3-2_0_7]
 extends           = esp32, esp32_2_0_7
-[env:esp32-s3@default]
+[env:esp32-s3-2_0_8]
+extends           = esp32, esp32_2_0_8
+[env:esp32-s3-default]
 extends           = esp32s3, esp32_default
diff --git a/examples/Test/build_test/platformio_esp8266.ini b/examples/Test/build_test/platformio_esp8266.ini
@@ -14,15 +14,15 @@ platform = [email protected]
 
 [env:esp8266]
 
-[env:esp8266@3.0.0]
+[env:esp8266-3_0_0]
 platform = ${esp8266_3_0_0.platform}
 board = d1_mini
 
-[env:esp8266@3.1.0]
+[env:esp8266-3_1_0]
 platform = ${esp8266_3_1_0.platform}
 board = d1_mini
 
-[env:esp8266@3.2.0]
+[env:esp8266-3_2_0]
 platform = ${esp8266_3_2_0.platform}
 board = d1_mini
 
diff --git a/examples/Test/build_test/platformio_rpipico.ini b/examples/Test/build_test/platformio_rpipico.ini
@@ -7,7 +7,7 @@ board_build.core = earlephilhower
 
 
 
-[env:pico@default]
+[env:pico-default]
 extends = rpipico_default
 build_flags       =
   -DDUMMY_DISPLAY
diff --git a/library.json b/library.json
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/lovyan03/LovyanGFX.git"
   },
-  "version": "1.1.6",
+  "version": "1.1.7",
   "frameworks": ["arduino", "espidf"],
   "platforms": ["espressif32", "espressif8266", "atmelsam"],
   "headers": "LovyanGFX.hpp",

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=LovyanGFX
-version=1.1.6
+version=1.1.7
 author=lovyan03
 maintainer=lovyan03
 sentence=TFT LCD Graphics driver with touch for ESP32, ESP8266, SAMD21, SAMD51, RP2040