Skip to content

Commit a1e6055

Browse files
committed
Merge branch 'release/v1.12.4'
2 parents f8d59ee + 40591c3 commit a1e6055

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

builder/frameworks/espidf.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ def find_default_component(target_configs):
808808
'"$PYTHONEXE" "%s" -q --flash-size "%s" $SOURCE $TARGET'
809809
% (
810810
join(FRAMEWORK_DIR, "components", "partition_table", "gen_esp32part.py"),
811-
board.get("upload.flash_size", "detect"),
811+
board.get("upload.flash_size", "4MB"),
812812
),
813813
"Generating partitions $TARGET",
814814
),
@@ -925,11 +925,8 @@ def find_default_component(target_configs):
925925
# Target: ESP-IDF menuconfig
926926
#
927927

928-
AlwaysBuild(
929-
env.Alias(
930-
"menuconfig", None, [env.VerboseAction(RunMenuconfig, "Running menuconfig...")]
931-
)
932-
)
928+
env.AddPlatformTarget("menuconfig", None, [env.VerboseAction(
929+
RunMenuconfig, "Running menuconfig...")], "Run Menuconfig")
933930

934931
#
935932
# Process main parts of the framework

platform.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-espressif32.git"
1414
},
15-
"version": "1.12.3",
15+
"version": "1.12.4",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json",
@@ -26,15 +26,24 @@
2626
},
2727
"espidf": {
2828
"package": "framework-espidf",
29-
"script": "builder/frameworks/espidf.py"
29+
"script": "builder/frameworks/espidf.py",
30+
"description": "ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.",
31+
"url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/",
32+
"title": "Espressif IoT Development Framework"
3033
},
3134
"simba": {
3235
"package": "framework-simba",
33-
"script": "builder/frameworks/simba.py"
36+
"script": "builder/frameworks/simba.py",
37+
"description": "Simba is an RTOS and build framework with aims to make embedded programming easy and portable",
38+
"url": "http://simba-os.readthedocs.org",
39+
"title": "Simba"
3440
},
3541
"pumbaa": {
3642
"package": "framework-pumbaa",
37-
"script": "builder/frameworks/pumbaa.py"
43+
"script": "builder/frameworks/pumbaa.py",
44+
"description": "Pumbaa is Python on top of Simba. The implementation is a port of MicroPython, designed for embedded devices with limited amount of RAM and code memory",
45+
"url": "http://pumbaa.readthedocs.org/",
46+
"title": "Pumbaa"
3847
}
3948
},
4049
"packages": {

0 commit comments

Comments
 (0)