Skip to content

Commit 3d5183b

Browse files
committed
Merge branch 'release/v14.2.0'
2 parents 83a0c97 + c51c83a commit 3d5183b

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

builder/main.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
105105
# Target: Build executable and linkable firmware
106106
#
107107

108-
if "zephyr" in env.get("PIOFRAMEWORK", []):
108+
frameworks = env.get("PIOFRAMEWORK", [])
109+
if "zephyr" in frameworks:
109110
env.SConscript(
110111
join(platform.get_package_dir(
111112
"framework-zephyr"), "scripts", "platformio", "platformio-build-pre.py"),
@@ -219,7 +220,7 @@ def _jlink_cmd_script(env, source):
219220

220221
upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
221222

222-
if "arduino" in env.get("PIOFRAMEWORK"):
223+
if "arduino" in frameworks:
223224
if env.subst("$BOARD").startswith("portenta"):
224225
upload_actions.insert(
225226
0,

platform.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/platformio/platform-ststm32.git"
2020
},
21-
"version": "14.1.0",
21+
"version": "14.2.0",
2222
"frameworks": {
2323
"mbed": {
2424
"package": "framework-mbed",
@@ -216,7 +216,7 @@
216216
"type": "framework",
217217
"optional": true,
218218
"owner": "platformio",
219-
"version": "~2.3.0"
219+
"version": "~2.4.0"
220220
},
221221
"framework-stm32cubef0": {
222222
"type": "framework",
@@ -246,7 +246,7 @@
246246
"type": "framework",
247247
"optional": true,
248248
"owner": "platformio",
249-
"version": "~1.25.0"
249+
"version": "~1.26.0"
250250
},
251251
"framework-stm32cubef7": {
252252
"type": "framework",
@@ -258,25 +258,25 @@
258258
"type": "framework",
259259
"optional": true,
260260
"owner": "platformio",
261-
"version": "~1.3.0"
261+
"version": "~1.5.0"
262262
},
263263
"framework-stm32cubeg4": {
264264
"type": "framework",
265265
"optional": true,
266266
"owner": "platformio",
267-
"version": "~1.3.0"
267+
"version": "~1.4.0"
268268
},
269269
"framework-stm32cubeh7": {
270270
"type": "framework",
271271
"optional": true,
272272
"owner": "platformio",
273-
"version": "~1.8.0"
273+
"version": "~1.9.0"
274274
},
275275
"framework-stm32cubel0": {
276276
"type": "framework",
277277
"optional": true,
278278
"owner": "platformio",
279-
"version": "~1.11.0"
279+
"version": "~1.12.0"
280280
},
281281
"framework-stm32cubel1": {
282282
"type": "framework",
@@ -288,13 +288,13 @@
288288
"type": "framework",
289289
"optional": true,
290290
"owner": "platformio",
291-
"version": "~1.16.0"
291+
"version": "~1.17.0"
292292
},
293293
"framework-stm32cubel5": {
294294
"type": "framework",
295295
"optional": true,
296296
"owner": "platformio",
297-
"version": "~1.3.0"
297+
"version": "~1.4.0"
298298
},
299299
"framework-zephyr": {
300300
"type": "framework",

0 commit comments

Comments
 (0)