From 40e5dc48ba2f7efea2e159df37073313c3b95be6 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 11 Oct 2022 13:57:04 +0200 Subject: [PATCH 1/7] Install and use only needed framework --- builder/main.py | 2 -- platform.json | 7 +++---- platform.py | 14 ++++++++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/builder/main.py b/builder/main.py index e95eeca99..dc195c8e7 100644 --- a/builder/main.py +++ b/builder/main.py @@ -34,10 +34,8 @@ if "CORE32SOLO1" in extra_flags or "FRAMEWORK_ARDUINO_SOLO1" in build_flags: FRAMEWORK_DIR = platform.get_package_dir("framework-arduino-solo1") - print ("Solo1 framework will be used") elif "CORE32ITEAD" in extra_flags or "FRAMEWORK_ARDUINO_ITEAD" in build_flags: FRAMEWORK_DIR = platform.get_package_dir("framework-arduino-ITEAD") - print ("ITEAD framework will be used") else: FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32") diff --git a/platform.json b/platform.json index 94484b4ef..2d120bb2f 100644 --- a/platform.json +++ b/platform.json @@ -34,19 +34,19 @@ "packages": { "framework-arduinoespressif32": { "type": "framework", - "optional": false, + "optional": true, "owner": "tasmota", "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.5.1/framework-arduinoespressif32.zip" }, "framework-arduino-solo1": { "type": "framework", - "optional": false, + "optional": true, "owner": "tasmota", "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.5.1/framework-arduinoespressif32-solo1.zip" }, "framework-arduino-ITEAD": { "type": "framework", - "optional": false, + "optional": true, "owner": "tasmota", "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.5.1/framework-arduinoespressif32-ITEAD.zip" }, @@ -135,4 +135,3 @@ } } } - diff --git a/platform.py b/platform.py index 5aae48548..b0c582f6c 100644 --- a/platform.py +++ b/platform.py @@ -32,8 +32,18 @@ def configure_default_packages(self, variables, targets): board_config = self.board_config(variables.get("board")) mcu = variables.get("board_build.mcu", board_config.get("build.mcu", "esp32")) + core_variant_board = ''.join(variables.get("board_build.extra_flags", board_config.get("build.extra_flags", ""))) + core_variant_board = core_variant_board.replace("-D", " ") + core_variant_build = (''.join(variables.get("build_flags", []))).replace("-D", " ") frameworks = variables.get("pioframework", []) + if "CORE32SOLO1" in core_variant_board or "FRAMEWORK_ARDUINO_SOLO1" in core_variant_build: + self.packages["framework-arduino-solo1"]["optional"] = False + elif "CORE32ITEAD" in core_variant_board or "FRAMEWORK_ARDUINO_ITEAD" in core_variant_build: + self.packages["framework-arduino-ITEAD"]["optional"] = False + else: + self.packages["framework-arduinoespressif32"]["optional"] = False + if "buildfs" in targets: filesystem = variables.get("board_build.filesystem", "spiffs") if filesystem == "littlefs": @@ -47,10 +57,6 @@ def configure_default_packages(self, variables, targets): if os.path.isdir("ulp"): self.packages["toolchain-esp32ulp"]["optional"] = False - build_core = variables.get( - "board_build.core", board_config.get("build.core", "arduino") - ).lower() - if "espidf" in frameworks: # Common packages for IDF and mixed Arduino+IDF projects self.packages["toolchain-esp32ulp"]["optional"] = False From de9f0f374cc178ddcb3a0e0d4672f327aefa1f37 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 15 Oct 2022 11:42:41 +0200 Subject: [PATCH 2/7] rm overlooked "mbctool" --- platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.py b/platform.py index b0c582f6c..3226e326b 100644 --- a/platform.py +++ b/platform.py @@ -100,7 +100,7 @@ def _add_dynamic_options(self, board): # debug tools debug = board.manifest.get("debug", {}) - non_debug_protocols = ["esptool", "espota", "mbctool"] + non_debug_protocols = ["esptool", "espota"] supported_debug_tools = [ "cmsis-dap", "esp-prog", From a8e3fe8e577e0ee8e917a3ee27fd93b50a6cc65a Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 16 Oct 2022 13:42:06 +0200 Subject: [PATCH 3/7] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6958ca19d..885fbf0ed 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,12 @@ Espressif Systems is a privately held fabless semiconductor company. They provid 1. [Install PlatformIO](http://platformio.org) 2. Create PlatformIO project and configure a platform option in [platformio.ini](http://docs.platformio.org/page/projectconf.html) file: -### Stable Release (including ESP32-solo1) +### Stable Release supporting Arduino and IDF based on Arduino Core 2.0.5 and can be used with Platformio for the ESP32/ESP32solo1, ESP32C3, ESP32S2 and ESP32S3 ``` [platformio] platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5.1/platform-espressif32-2.0.5.1.zip -framework = arduino, espidf +framework = arduino ``` to use the ESP32 Solo1 Arduino framework add in your env ``` From 8c192639bd8e12a6a1ef9edbed6b6c47a6adeb21 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 17 Oct 2022 18:16:04 +0200 Subject: [PATCH 4/7] esptool v4.3.1 increased flash speed for S2/S3 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 2d120bb2f..c752c7527 100644 --- a/platform.json +++ b/platform.json @@ -89,7 +89,7 @@ "tool-esptoolpy": { "type": "uploader", "owner": "tasmota", - "version": "https://github.com/tasmota/esptool/releases/download/v4.3/esptool-4.3.zip" + "version": "https://github.com/tasmota/esptool/releases/download/v4.3.1/esptool-4.3.1.zip" }, "tool-openocd-esp32": { "type": "debugger", From 5236895ad459932c90b0fb1090a1b915e00f7895 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 28 Oct 2022 10:52:10 +0200 Subject: [PATCH 5/7] 2.0.5.2 --- platform.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform.json b/platform.json index c752c7527..d7f02afe5 100644 --- a/platform.json +++ b/platform.json @@ -18,7 +18,7 @@ "type": "git", "url": "https://github.com/tasmota/platform-espressif32.git" }, - "version": "2.0.5", + "version": "2.0.5+2", "frameworks": { "arduino": { "script": "builder/frameworks/arduino.py" @@ -36,25 +36,25 @@ "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.5.1/framework-arduinoespressif32.zip" + "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v2.0.5.2/framework-arduinoespressif32.zip" }, "framework-arduino-solo1": { "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.5.1/framework-arduinoespressif32-solo1.zip" + "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1038/framework-arduinoespressif32-solo1.zip" }, "framework-arduino-ITEAD": { "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.5.1/framework-arduinoespressif32-ITEAD.zip" + "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1037/framework-arduinoespressif32-ITEAD.zip" }, "framework-espidf": { "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/tasmota/esp-idf/releases/download/v4.4.3.5/esp-idf-v4.4.3.5.zip" + "version": "https://github.com/tasmota/esp-idf/releases/download/v4.4.3.6/esp-idf-v4.4.3.6.zip" }, "toolchain-xtensa-esp32": { "type": "toolchain", From 81127ef24d3c2302cdfc849c5c3fc49cd6fa2be3 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 28 Oct 2022 11:04:03 +0200 Subject: [PATCH 6/7] Update examples.yml --- .github/workflows/examples.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 0f765c7bc..5298cbc35 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -1,13 +1,18 @@ name: Examples -on: [push, pull_request] +on: + workflow_dispatch: # Manually start a workflow + push: + paths-ignore: + - '.github/**' # Ignore changes towards the .github directory + - '**.md' # Do no build if *.md files changes jobs: build: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macOS-12] example: - "examples/arduino-ble5-advertising" - "examples/arduino-blink" @@ -34,7 +39,7 @@ jobs: with: submodules: "recursive" - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.9" - name: Install dependencies From d6a5467931000cca150de327391e5d3eae0e491c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 28 Oct 2022 11:23:10 +0200 Subject: [PATCH 7/7] Tasmota repo --- platform.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform.json b/platform.json index d7f02afe5..a263c52a9 100644 --- a/platform.json +++ b/platform.json @@ -36,19 +36,19 @@ "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v2.0.5.2/framework-arduinoespressif32.zip" + "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.5.2/framework-arduinoespressif32.zip" }, "framework-arduino-solo1": { "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1038/framework-arduinoespressif32-solo1.zip" + "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.5.2/framework-arduinoespressif32-solo1.zip" }, "framework-arduino-ITEAD": { "type": "framework", "optional": true, "owner": "tasmota", - "version": "https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1037/framework-arduinoespressif32-ITEAD.zip" + "version": "https://github.com/tasmota/arduino-esp32/releases/download/2.0.5.2/framework-arduinoespressif32-ITEAD.zip" }, "framework-espidf": { "type": "framework",