Skip to content

Commit 0d63e99

Browse files
committed
Merge branch 'release/v8.1.0'
2 parents d033074 + 1d977e4 commit 0d63e99

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

builder/main.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
else:
9898
target_elf = env.BuildProgram()
9999
target_firm = env.ElfToBin(join("$BUILD_DIR", "${PROGNAME}"), target_elf)
100+
env.Depends(target_firm, "checkprogsize")
100101

101102
AlwaysBuild(env.Alias("nobuild", target_firm))
102103
target_buildprog = env.Alias("buildprog", target_firm, target_firm)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio

platform.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/platformio/platform-nxplpc.git"
2020
},
21-
"version": "8.0.0",
21+
"version": "8.1.0",
2222
"frameworks": {
2323
"mbed": {
2424
"package": "framework-mbed",
@@ -42,7 +42,7 @@
4242
"type": "framework",
4343
"optional": true,
4444
"owner": "platformio",
45-
"version": "~6.60600.0",
45+
"version": "~6.60900.0",
4646
"optionalVersions": [
4747
"~6.51506.0"
4848
]

platform.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,10 @@ def _add_default_debug_tools(self, board):
157157

158158
def configure_debug_options(self, initial_debug_options, ide_data):
159159
debug_options = copy.deepcopy(initial_debug_options)
160-
server_executable = debug_options["server"]["executable"].lower()
161160
adapter_speed = initial_debug_options.get("speed")
162161
if adapter_speed:
162+
server_options = debug_options.get("server") or {}
163+
server_executable = server_options.get("executable", "").lower()
163164
if "openocd" in server_executable:
164165
debug_options["server"]["arguments"].extend(
165166
["-c", "adapter speed %s" % adapter_speed]

0 commit comments

Comments
 (0)