Merge branch 'release/v1.12.4'

This commit is contained in:
Valerii Koval
2020-06-17 11:28:11 +03:00
2 changed files with 16 additions and 10 deletions
+3 -6
View File
@@ -808,7 +808,7 @@ partition_table = env.Command(
'"$PYTHONEXE" "%s" -q --flash-size "%s" $SOURCE $TARGET'
% (
join(FRAMEWORK_DIR, "components", "partition_table", "gen_esp32part.py"),
board.get("upload.flash_size", "detect"),
board.get("upload.flash_size", "4MB"),
),
"Generating partitions $TARGET",
),
@@ -925,11 +925,8 @@ env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", build_bootloader())
# Target: ESP-IDF menuconfig
#
AlwaysBuild(
env.Alias(
"menuconfig", None, [env.VerboseAction(RunMenuconfig, "Running menuconfig...")]
)
)
env.AddPlatformTarget("menuconfig", None, [env.VerboseAction(
RunMenuconfig, "Running menuconfig...")], "Run Menuconfig")
#
# Process main parts of the framework
+13 -4
View File
@@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-espressif32.git"
},
"version": "1.12.3",
"version": "1.12.4",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"http://dl.platformio.org/packages/manifest.json",
@@ -26,15 +26,24 @@
},
"espidf": {
"package": "framework-espidf",
"script": "builder/frameworks/espidf.py"
"script": "builder/frameworks/espidf.py",
"description": "ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.",
"url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/",
"title": "Espressif IoT Development Framework"
},
"simba": {
"package": "framework-simba",
"script": "builder/frameworks/simba.py"
"script": "builder/frameworks/simba.py",
"description": "Simba is an RTOS and build framework with aims to make embedded programming easy and portable",
"url": "http://simba-os.readthedocs.org",
"title": "Simba"
},
"pumbaa": {
"package": "framework-pumbaa",
"script": "builder/frameworks/pumbaa.py"
"script": "builder/frameworks/pumbaa.py",
"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",
"url": "http://pumbaa.readthedocs.org/",
"title": "Pumbaa"
}
},
"packages": {