Skip to content

Commit 19cfdb4

Browse files
authored
Platform 2024.06.11 Tasmota Arduino Core 3.0.2
1 parent 9244be6 commit 19cfdb4

File tree

4 files changed

+11
-15
lines changed

4 files changed

+11
-15
lines changed

.github/workflows/examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: git clone Tasmota and add to examples
5050
if: "matrix.example == 'examples/tasmota' && matrix.os != 'windows-2022'"
5151
run: |
52-
git clone https://github.com/arendst/Tasmota.git examples/tasmota
52+
git clone -b development --recursive --depth 1 --shallow-submodule https://github.com/arendst/Tasmota.git examples/tasmota
5353
cp examples/tasmota_platformio_override.ini examples/tasmota/platformio_override.ini
5454
- name: Build examples
5555
if: "matrix.example != 'examples/tasmota' || matrix.os != 'windows-2022'"

builder/frameworks/arduino.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,22 @@
3131
from platformio.package.version import pepver_to_semver
3232

3333
env = DefaultEnvironment()
34+
platform = env.PioPlatform()
3435

3536
extra_flags = ''.join([element.replace("-D", " ") for element in env.BoardConfig().get("build.extra_flags", "")])
3637
build_flags = ''.join([element.replace("-D", " ") for element in env.GetProjectOption("build_flags")])
3738

3839
SConscript("_embed_files.py", exports="env")
3940

4041
if ("CORE32SOLO1" in extra_flags or "FRAMEWORK_ARDUINO_SOLO1" in build_flags) and ("arduino" in env.subst("$PIOFRAMEWORK") and "espidf" not in env.subst("$PIOFRAMEWORK")):
41-
SConscript(
42-
join(DefaultEnvironment().PioPlatform().get_package_dir(
43-
"framework-arduino-solo1"), "tools", "platformio-build.py"))
44-
42+
FRAMEWORK_DIR = platform.get_package_dir("framework-arduino-solo1")
4543
elif ("CORE32ITEAD" in extra_flags or "FRAMEWORK_ARDUINO_ITEAD" in build_flags) and ("arduino" in env.subst("$PIOFRAMEWORK") and "espidf" not in env.subst("$PIOFRAMEWORK")):
46-
SConscript(
47-
join(DefaultEnvironment().PioPlatform().get_package_dir(
48-
"framework-arduino-ITEAD"), "tools", "platformio-build.py"))
49-
44+
FRAMEWORK_DIR = platform.get_package_dir("framework-arduino-ITEAD")
5045
elif "arduino" in env.subst("$PIOFRAMEWORK") and "CORE32SOLO1" not in extra_flags and "FRAMEWORK_ARDUINO_SOLO1" not in build_flags and "CORE32ITEAD" not in extra_flags and "FRAMEWORK_ARDUINO_ITEAD" not in build_flags and "espidf" not in env.subst("$PIOFRAMEWORK"):
51-
SConscript(
52-
join(DefaultEnvironment().PioPlatform().get_package_dir(
53-
"framework-arduinoespressif32"), "tools", "platformio-build.py"))
46+
FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32")
47+
48+
if "espidf" not in env.subst("$PIOFRAMEWORK"):
49+
SConscript(join(FRAMEWORK_DIR, "tools", "platformio-build.py"))
5450

5551
def install_python_deps():
5652
def _get_installed_pip_packages():

builder/frameworks/espidf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -744,8 +744,8 @@ def compile_source_files(
744744
obj_path = os.path.join(obj_path, os.path.basename(src_path))
745745

746746
preserve_source_file_extension = board.get(
747-
"build.esp-idf.preserve_source_file_extension", True
748-
)
747+
"build.esp-idf.preserve_source_file_extension", "yes"
748+
) == "yes"
749749

750750
objects.append(
751751
build_envs[compile_group_idx].StaticObject(

examples/tasmota_platformio_override.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[platformio]
22
default_envs =
3-
tasmota32
3+
tasmota32-webcam
44
tasmota32solo1
55
tasmota32-nspanel
66
tasmota32c2

0 commit comments

Comments
 (0)