-
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #76 from tobozo/1.4.5
1.4.5
- Loading branch information
Showing
10 changed files
with
41 additions
and
241 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,6 @@ on: | |
master_branch: | ||
description: 'Main branch' | ||
required: true | ||
type: string | ||
default: 'master' | ||
|
||
jobs: | ||
|
@@ -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. [[email protected]-RC1] and trusts that env | ||
# version e.g. [[email protected]] 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 | ||
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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] | ||
|
@@ -95,7 +94,7 @@ extends = esp32_2_0_0, esp32 | |
extends = esp32_2_0_1, esp32 | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, esp32 | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, esp32 | ||
|
||
[env:[email protected]] | ||
|
@@ -106,7 +105,7 @@ extends = esp32_2_0_0, M5StickC | |
extends = esp32_2_0_1, M5StickC | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, M5StickC | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, M5StickC | ||
|
||
[env:[email protected]] | ||
|
@@ -117,7 +116,7 @@ extends = esp32_2_0_0, M5Stack | |
extends = esp32_2_0_1, M5Stack | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, M5Stack | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, M5Stack | ||
|
||
[env:[email protected]] | ||
|
@@ -128,7 +127,7 @@ extends = esp32_2_0_0, M5Core2 | |
extends = esp32_2_0_1, M5Core2 | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, M5Core2 | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, M5Core2 | ||
|
||
[env:[email protected]] | ||
|
@@ -139,7 +138,7 @@ extends = esp32_2_0_0, M5Fire | |
extends = esp32_2_0_1, M5Fire | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, M5Fire | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, M5Fire | ||
|
||
[env:[email protected]] | ||
|
@@ -150,7 +149,7 @@ extends = esp32_2_0_0, OdroidGo | |
extends = esp32_2_0_1, OdroidGo | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, OdroidGo | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, OdroidGo | ||
|
||
[env:[email protected]] | ||
|
@@ -161,7 +160,7 @@ extends = esp32_2_0_0, WroverKit | |
extends = esp32_2_0_1, WroverKit | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, WroverKit | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, WroverKit | ||
|
||
[env:[email protected]] | ||
|
@@ -172,7 +171,7 @@ extends = esp32_2_0_0, D32Pro | |
extends = esp32_2_0_1, D32Pro | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, D32Pro | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, D32Pro | ||
|
||
[env:[email protected]] | ||
|
@@ -183,7 +182,7 @@ extends = esp32_2_0_0, Twatch | |
extends = esp32_2_0_1, Twatch | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, Twatch | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, Twatch | ||
|
||
[env:[email protected]] | ||
|
@@ -194,7 +193,7 @@ extends = esp32_2_0_0, T1 | |
extends = esp32_2_0_1, T1 | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, T1 | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, T1 | ||
|
||
[env:[email protected]] | ||
|
@@ -205,10 +204,10 @@ extends = esp32_2_0_0, Lora32 | |
extends = esp32_2_0_1, Lora32 | ||
[env:[email protected]] | ||
extends = esp32_2_0_2, Lora32 | ||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, Lora32 | ||
|
||
|
||
[env:[email protected]-RC1] | ||
[env:[email protected]] | ||
extends = esp32_2_0_3, S3Box | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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[email protected] | ||
sentence=Alternate library M5Stack/M5Core2/Odroid-Go/D-Duino and possiblly other ESP32/TFT/SD bundles | ||
|
Oops, something went wrong.