From 14e9326a35da05ef9c9cc4cc7d8709b03ef94774 Mon Sep 17 00:00:00 2001 From: valeros Date: Tue, 2 Mar 2021 20:40:04 +0200 Subject: [PATCH 1/5] Take into account serverless debug probes when configuring debug speed --- platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.py b/platform.py index c6d8e1f..90d4415 100644 --- a/platform.py +++ b/platform.py @@ -129,9 +129,9 @@ def _add_default_debug_tools(self, board): def configure_debug_options(self, initial_debug_options, ide_data): debug_options = copy.deepcopy(initial_debug_options) - server_executable = debug_options["server"]["executable"].lower() adapter_speed = initial_debug_options.get("speed") if adapter_speed: + server_executable = debug_options["server"].get("executable", "").lower() if "openocd" in server_executable: debug_options["server"]["arguments"].extend( ["-c", "adapter speed %s" % adapter_speed] From e1d8dd0ea90a0a3097a58ef723f3693b0da9ed16 Mon Sep 17 00:00:00 2001 From: valeros Date: Wed, 3 Mar 2021 12:34:35 +0200 Subject: [PATCH 2/5] Add safe value for debug server when configuring debug speed --- platform.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform.py b/platform.py index 90d4415..f730a9e 100644 --- a/platform.py +++ b/platform.py @@ -131,7 +131,8 @@ def configure_debug_options(self, initial_debug_options, ide_data): debug_options = copy.deepcopy(initial_debug_options) adapter_speed = initial_debug_options.get("speed") if adapter_speed: - server_executable = debug_options["server"].get("executable", "").lower() + server_options = debug_options.get("server") or {} + server_executable = server_options.get("executable", "").lower() if "openocd" in server_executable: debug_options["server"]["arguments"].extend( ["-c", "adapter speed %s" % adapter_speed] From c18f7dd70bb018e09ede98b5ace250ba78f51d38 Mon Sep 17 00:00:00 2001 From: valeros Date: Fri, 23 Jul 2021 00:41:01 +0300 Subject: [PATCH 3/5] Add an explicit dependency on checkprogsize target for the final binary --- builder/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/main.py b/builder/main.py index e5437ec..523daf2 100644 --- a/builder/main.py +++ b/builder/main.py @@ -121,6 +121,7 @@ else: target_firm = env.ElfToHex( join("$BUILD_DIR", "${PROGNAME}"), target_elf) + env.Depends(target_firm, "checkprogsize") AlwaysBuild(env.Alias("nobuild", target_firm)) target_buildprog = env.Alias("buildprog", target_firm, target_firm) From a6337990ac7f5f3ec4102d8d5a3bc325f92e18c8 Mon Sep 17 00:00:00 2001 From: valeros Date: Fri, 23 Jul 2021 00:46:53 +0300 Subject: [PATCH 4/5] Initial support for Zephyr 2.6.0 --- platform.json | 112 +------------------------------------------------- platform.py | 3 +- 2 files changed, 2 insertions(+), 113 deletions(-) diff --git a/platform.json b/platform.json index 5e0e996..6772d01 100644 --- a/platform.json +++ b/platform.json @@ -58,117 +58,7 @@ "type": "framework", "optional": true, "owner": "platformio", - "version": "~2.20500.0" - }, - "framework-zephyr-cmsis": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.c3bd2094f9" - }, - "framework-zephyr-canopennode": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.468d350028" - }, - "framework-zephyr-civetweb": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.e6903b80c0" - }, - "framework-zephyr-fatfs": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.1d1fcc725a" - }, - "framework-zephyr-hal-nordic": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.f0d54d8449" - }, - "framework-zephyr-hal-st": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.b52fdbf4b6" - }, - "framework-zephyr-libmetal": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.9d4ee2c3cf" - }, - "framework-zephyr-lvgl": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.31acbaa36e" - }, - "framework-zephyr-mbedtls": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.24d84ecff1" - }, - "framework-zephyr-mcuboot": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.3fc59410b6" - }, - "framework-zephyr-mcumgr": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.43845e883f" - }, - "framework-zephyr-open-amp": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.de1b85a130" - }, - "framework-zephyr-loramac-node": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.3f545d76a2" - }, - "framework-zephyr-openthread": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.1d668284a0" - }, - "framework-zephyr-segger": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.38c79a447e" - }, - "framework-zephyr-sof": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.b5b772dd61" - }, - "framework-zephyr-tinycbor": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.40daca97b4" - }, - "framework-zephyr-tinycrypt": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.3e9a49d267" - }, - "framework-zephyr-littlefs": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.9e4498d1c7" - }, - "framework-zephyr-mipi-sys-t": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.75e671550a" - }, - "framework-zephyr-tfm-mcuboot": { - "optional": true, - "owner": "platformio", - "version": "1.7.0-rc1" - }, - "framework-zephyr-trusted-firmware-m": { - "optional": true, - "owner": "platformio", - "version": "0.0.0-alpha+sha.96340fb6c0" + "version": "~2.20600.0" }, "tool-sreccat": { "owner": "platformio", diff --git a/platform.py b/platform.py index f730a9e..805918d 100644 --- a/platform.py +++ b/platform.py @@ -29,8 +29,7 @@ def configure_default_packages(self, variables, targets): self.packages["tool-nrfjprog"]["optional"] = False if "zephyr" in variables.get("pioframework", []): for p in self.packages: - if p.startswith("framework-zephyr-") or p in ( - "tool-cmake", "tool-dtc", "tool-ninja"): + if p in ("tool-cmake", "tool-dtc", "tool-ninja"): self.packages[p]["optional"] = False self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0" if "windows" not in get_systype(): From 058ae7a03fe4e33a8254cd9aa00d3350d9383e05 Mon Sep 17 00:00:00 2001 From: valeros Date: Fri, 30 Jul 2021 21:07:12 +0300 Subject: [PATCH 5/5] Bump version to 7.1.0 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 6772d01..ec94578 100644 --- a/platform.json +++ b/platform.json @@ -18,7 +18,7 @@ "type": "git", "url": "https://github.com/platformio/platform-nordicnrf51.git" }, - "version": "7.0.0", + "version": "7.1.0", "frameworks": { "arduino": { "package": "framework-arduinonordicnrf5",