Skip to content

Commit

Permalink
Merge pull request #76 from tobozo/1.4.5
Browse files Browse the repository at this point in the history
1.4.5
  • Loading branch information
tobozo authored Jun 7, 2022
2 parents 11db98a + f5359ca commit 122245a
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 241 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ArduinoBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- 2.0.0
- 2.0.1
- 2.0.2
- 2.0.3-RC1
- 2.0.3

board:
# Supported boards fancy names
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
- platform-version: 2.0.0
- platform-version: 2.0.1
- platform-version: 2.0.2
- platform-version: 2.0.3-RC1
- platform-version: 2.0.3

fail-fast: false

Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/PlatformioBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ on:
master_branch:
description: 'Main branch'
required: true
type: string
default: 'master'

jobs:
Expand All @@ -35,15 +34,15 @@ jobs:

# This matrix is highly dependant on platformio.ini contents
# It expects [env] values named after the board and the platform
# version e.g. [m5stack-fire@2.0.3-RC1] and trusts that env
# version e.g. [m5stack-fire@2.0.3] and trusts that env
# for loading the relevant platform version

platform-version:
- 1.0.6
- 2.0.0
- 2.0.1
- 2.0.2
- 2.0.3-RC1
- 2.0.3

board:
- esp32
Expand Down Expand Up @@ -73,7 +72,7 @@ jobs:
- platform-version: 2.0.0
- platform-version: 2.0.1
- platform-version: 2.0.2
- platform-version: 2.0.3-RC1
- platform-version: 2.0.3
- board: esp32
- board: m5stick-c
- board: m5stack-core-esp32
Expand Down
29 changes: 14 additions & 15 deletions examples/Tests/build_test/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,17 @@ platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/
[esp32_2_0_1]
extends = lib_lgfx
platform = espressif32 @ ^4
; platform = https://github.com/tasmota/platform-espressif32
platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1

[esp32_2_0_2]
extends = lib_lgfx
platform = https://github.com/tasmota/platform-espressif32
platform = espressif32 @ ^4
platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.2

[esp32_2_0_3]
extends = lib_lgfx
platform = https://github.com/tasmota/platform-espressif32
platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3-RC1
platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.3/esp32-2.0.3.zip


[esp32]
Expand Down Expand Up @@ -95,7 +94,7 @@ extends = esp32_2_0_0, esp32
extends = esp32_2_0_1, esp32
[env:esp32@2.0.2]
extends = esp32_2_0_2, esp32
[env:esp32@2.0.3-RC1]
[env:esp32@2.0.3]
extends = esp32_2_0_3, esp32

[env:m5stick-c@1.0.6]
Expand All @@ -106,7 +105,7 @@ 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:m5stack-core-esp32@1.0.6]
Expand All @@ -117,7 +116,7 @@ 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-core2@1.0.6]
Expand All @@ -128,7 +127,7 @@ 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-fire@1.0.6]
Expand All @@ -139,7 +138,7 @@ extends = esp32_2_0_0, M5Fire
extends = esp32_2_0_1, M5Fire
[env:m5stack-fire@2.0.2]
extends = esp32_2_0_2, M5Fire
[env:m5stack-fire@2.0.3-RC1]
[env:m5stack-fire@2.0.3]
extends = esp32_2_0_3, M5Fire

[env:odroid_esp32@1.0.6]
Expand All @@ -150,7 +149,7 @@ extends = esp32_2_0_0, OdroidGo
extends = esp32_2_0_1, OdroidGo
[env:odroid_esp32@2.0.2]
extends = esp32_2_0_2, OdroidGo
[env:odroid_esp32@2.0.3-RC1]
[env:odroid_esp32@2.0.3]
extends = esp32_2_0_3, OdroidGo

[env:esp-wrover-kit@1.0.6]
Expand All @@ -161,7 +160,7 @@ extends = esp32_2_0_0, WroverKit
extends = esp32_2_0_1, WroverKit
[env:esp-wrover-kit@2.0.2]
extends = esp32_2_0_2, WroverKit
[env:esp-wrover-kit@2.0.3-RC1]
[env:esp-wrover-kit@2.0.3]
extends = esp32_2_0_3, WroverKit

[env:lolin_d32_pro@1.0.6]
Expand All @@ -172,7 +171,7 @@ extends = esp32_2_0_0, D32Pro
extends = esp32_2_0_1, D32Pro
[env:lolin_d32_pro@2.0.2]
extends = esp32_2_0_2, D32Pro
[env:lolin_d32_pro@2.0.3-RC1]
[env:lolin_d32_pro@2.0.3]
extends = esp32_2_0_3, D32Pro

[env:ttgo-t-watch@1.0.6]
Expand All @@ -183,7 +182,7 @@ extends = esp32_2_0_0, Twatch
extends = esp32_2_0_1, Twatch
[env:ttgo-t-watch@2.0.2]
extends = esp32_2_0_2, Twatch
[env:ttgo-t-watch@2.0.3-RC1]
[env:ttgo-t-watch@2.0.3]
extends = esp32_2_0_3, Twatch

[env:ttgo-t1@1.0.6]
Expand All @@ -194,7 +193,7 @@ extends = esp32_2_0_0, T1
extends = esp32_2_0_1, T1
[env:ttgo-t1@2.0.2]
extends = esp32_2_0_2, T1
[env:ttgo-t1@2.0.3-RC1]
[env:ttgo-t1@2.0.3]
extends = esp32_2_0_3, T1

[env:ttgo-lora32-v2@1.0.6]
Expand All @@ -205,10 +204,10 @@ extends = esp32_2_0_0, Lora32
extends = esp32_2_0_1, Lora32
[env:ttgo-lora32-v2@2.0.2]
extends = esp32_2_0_2, Lora32
[env:ttgo-lora32-v2@2.0.3-RC1]
[env:ttgo-lora32-v2@2.0.3]
extends = esp32_2_0_3, Lora32


[env:esp32s3box@2.0.3-RC1]
[env:esp32s3box@2.0.3]
extends = esp32_2_0_3, S3Box

2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"name": "LovyanGFX"
}
],
"version": "1.4.2",
"version": "1.4.5",
"framework": "arduino",
"platforms": "espressif32",
"headers": "ESP32-Chimera-Core.h",
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP32-Chimera-Core
version=1.4.2
version=1.4.5
author=tobozo,Lovyan03
maintainer=tobozo@noreply.github.com
sentence=Alternate library M5Stack/M5Core2/Odroid-Go/D-Duino and possiblly other ESP32/TFT/SD bundles
Expand Down
Loading

0 comments on commit 122245a

Please sign in to comment.