Skip to content

Commit

Permalink
Platform 2024.07.10
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason2866 authored Jul 7, 2024
1 parent 19cfdb4 commit 5c119c9
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Espressif Systems is a privately held fabless semiconductor company. They provid
Support for the ESP32/ESP32solo1, ESP32C2, ESP32C3, ESP32C6, ESP32S2, ESP32S3 and ESP32-H2
```
[platformio]
platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.11/platform-espressif32.zip
platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.07.10/platform-espressif32.zip
framework = arduino
```
to use the ESP32 Solo1 Arduino framework add in your env
Expand Down
24 changes: 17 additions & 7 deletions builder/frameworks/espidf.py
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ def compile_source_files(

preserve_source_file_extension = board.get(
"build.esp-idf.preserve_source_file_extension", "yes"
) == "yes"
) == "yes"

objects.append(
build_envs[compile_group_idx].StaticObject(
Expand Down Expand Up @@ -991,12 +991,24 @@ def find_default_component(target_configs):
env.Exit(1)


def get_version_cmake_file():
version_cmake = os.path.join(FRAMEWORK_DIR, "tools", "cmake", "version.cmake")
with open(version_cmake, "r") as file:
string = file.read().replace("\n", "").replace("(", " ").replace(")", " ")
list = string.split()
v_major = list[(list.index("IDF_VERSION_MAJOR"))+1]
v_minor = list[(list.index("IDF_VERSION_MINOR"))+1]
v_patch = list[(list.index("IDF_VERSION_PATCH"))+1]
version = v_major + "." + v_minor + "." + v_patch
return version


def create_version_file():
version_file = os.path.join(FRAMEWORK_DIR, "version.txt")
if not os.path.isfile(version_file):
with open(version_file, "w") as fp:
package_version = platform.get_package_version("framework-espidf")
fp.write(get_original_version(package_version) or package_version)
version = get_version_cmake_file()
fp.write(version)


def generate_empty_partition_image(binary_path, image_size):
Expand Down Expand Up @@ -1229,10 +1241,8 @@ def get_idf_venv_dir():
# unnecessary reinstallation of Python dependencies in cases when Arduino
# as an IDF component requires a different version of the IDF package and
# hence a different set of Python deps or their versions
idf_version = get_original_version(platform.get_package_version("framework-espidf"))
return os.path.join(
env.subst("$PROJECT_CORE_DIR"), "penv", ".espidf-" + idf_version
)
idf_version = get_version_cmake_file()
return os.path.join(env.subst("$PROJECT_CORE_DIR"), "penv", ".espidf-" + idf_version)


def ensure_python_venv_available():
Expand Down
10 changes: 5 additions & 5 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"type": "git",
"url": "https://github.com/tasmota/platform-espressif32.git"
},
"version": "2024.06.11",
"version": "2024.07.10",
"frameworks": {
"arduino": {
"script": "builder/frameworks/arduino.py"
Expand All @@ -33,25 +33,25 @@
"type": "framework",
"optional": true,
"owner": "tasmota",
"version": "https://github.com/tasmota/arduino-esp32/releases/download/3.0.2.240625/framework-arduinoespressif32.zip"
"version": "https://github.com/tasmota/arduino-esp32/releases/download/3.0.2.240707/framework-arduinoespressif32.zip"
},
"framework-arduino-solo1": {
"type": "framework",
"optional": true,
"owner": "tasmota",
"version": "https://github.com/tasmota/arduino-esp32/releases/download/3.0.2.240625/framework-arduinoespressif32-solo1.zip"
"version": "https://github.com/tasmota/arduino-esp32/releases/download/3.0.2.240707/framework-arduinoespressif32-solo1.zip"
},
"framework-arduino-ITEAD": {
"type": "framework",
"optional": true,
"owner": "tasmota",
"version": "https://github.com/tasmota/arduino-esp32/releases/download/3.0.2.240625/framework-arduinoespressif32-ITEAD.zip"
"version": "https://github.com/tasmota/arduino-esp32/releases/download/3.0.2.240707/framework-arduinoespressif32-ITEAD.zip"
},
"framework-espidf": {
"type": "framework",
"optional": true,
"owner": "tasmota",
"version": "https://github.com/tasmota/esp-idf/releases/download/v5.1.4.240625/esp-idf-v5.1.4.zip"
"version": "https://github.com/tasmota/esp-idf/releases/download/v5.1.4.240629/esp-idf-v5.1.4.zip"
},
"toolchain-xtensa-esp32": {
"type": "toolchain",
Expand Down

0 comments on commit 5c119c9

Please sign in to comment.