Skip to content

Commit 754cda5

Browse files
valerosvaleros
committed
Merge branch 'release/v19.0.0'
2 parents 3b68dfb + cb066e2 commit 754cda5

File tree

8 files changed

+176
-27
lines changed

8 files changed

+176
-27
lines changed

‎boards/blues_cygnet.json‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"variant_h": "variant_CYGNET.h"
5+
},
6+
"core": "stm32",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DSTM32L4 -DSTM32L4xx -DSTM32L433xx",
9+
"f_cpu": "80000000L",
10+
"framework_extra_flags": {
11+
"arduino": "-DARDUINO_CYGNET -DCUSTOM_PERIPHERAL_PINS"
12+
},
13+
"mcu": "stm32l433cct6",
14+
"product_line": "STM32L433xx",
15+
"variant": "STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)"
16+
},
17+
"connectivity": [
18+
"can"
19+
],
20+
"debug": {
21+
"default_tools": [
22+
"stlink"
23+
],
24+
"jlink_device": "STM32L433CC",
25+
"openocd_target": "stm32l4x",
26+
"svd_path": "STM32L4x3.svd"
27+
},
28+
"frameworks": [
29+
"arduino",
30+
"cmsis",
31+
"stm32cube",
32+
"libopencm3"
33+
],
34+
"name": "Blues Cygnet",
35+
"upload": {
36+
"maximum_ram_size": 65536,
37+
"maximum_size": 262144,
38+
"protocol": "stlink",
39+
"protocols": [
40+
"dfu",
41+
"blackmagic",
42+
"cmsis-dap",
43+
"jlink",
44+
"stlink",
45+
"mbed"
46+
]
47+
},
48+
"url": "https://blues.com/feather-mcu/",
49+
"vendor": "Blues"
50+
}

‎boards/blues_swan_r5.json‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"variant_h": "variant_SWAN_R5.h"
5+
},
6+
"core": "stm32",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DSTM32L4 -DSTM32L4xx -DSTM32L4R5xx",
9+
"f_cpu": "120000000L",
10+
"framework_extra_flags": {
11+
"arduino": "-DARDUINO_SWAN_R5 -DCUSTOM_PERIPHERAL_PINS"
12+
},
13+
"mcu": "stm32l4r5ziy6",
14+
"product_line": "STM32L4R5xx",
15+
"variant": "STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY"
16+
},
17+
"connectivity": [
18+
"can"
19+
],
20+
"debug": {
21+
"default_tools": [
22+
"stlink"
23+
],
24+
"jlink_device": "STM32L4R5ZI",
25+
"openocd_target": "stm32l4x",
26+
"svd_path": "STM32L4R5.svd"
27+
},
28+
"frameworks": [
29+
"arduino",
30+
"cmsis",
31+
"stm32cube",
32+
"libopencm3"
33+
],
34+
"name": "Blues Swan R5",
35+
"upload": {
36+
"maximum_ram_size": 655360,
37+
"maximum_size": 2097152,
38+
"protocol": "stlink",
39+
"protocols": [
40+
"dfu",
41+
"blackmagic",
42+
"cmsis-dap",
43+
"jlink",
44+
"serial",
45+
"stlink",
46+
"mbed"
47+
]
48+
},
49+
"url": "https://blues.com/products/swan/",
50+
"vendor": "Blues"
51+
}

‎boards/bw_swan_r5.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
22
"build": {
3+
"arduino": {
4+
"variant_h": "variant_SWAN_R5.h"
5+
},
36
"core": "stm32",
47
"cpu": "cortex-m4",
5-
"extra_flags": "-DSTM32L4 -DSTM32L4xx -DSTM32L4R5xx",
8+
"extra_flags": "-DARDUINO_SWAN_R5 -DSTM32L4 -DSTM32L4xx -DSTM32L4R5xx",
69
"f_cpu": "120000000L",
710
"framework_extra_flags": {
811
"arduino": "-DCUSTOM_PERIPHERAL_PINS"

‎boards/nucleo_f446ze.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"f_cpu": "180000000L",
77
"mcu": "stm32f446zet6",
88
"product_line": "STM32F446xx",
9-
"variant": "STM32F4XX/F446Z(C-E)(H-J-T)"
9+
"variant": "STM32F4xx/F446Z(C-E)(H-J-T)"
1010
},
1111
"connectivity": [
1212
"can"

‎examples/stm32cube-hal-blink/platformio.ini‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,24 @@ framework = stm32cube
4949
board = nucleo_f746zg
5050
build_flags = -DF7
5151

52+
[env:nucleo_g071rb]
53+
platform = ststm32
54+
framework = stm32cube
55+
board = nucleo_g071rb
56+
build_flags = -DG0
57+
58+
[env:nucleo_g474re]
59+
platform = ststm32
60+
framework = stm32cube
61+
board = nucleo_g474re
62+
build_flags = -DG4
63+
64+
[env:nucleo_h743zi]
65+
platform = ststm32
66+
framework = stm32cube
67+
board = nucleo_h743zi
68+
build_flags = -DH7
69+
5270
[env:nucleo_l053r8]
5371
platform = ststm32
5472
framework = stm32cube
@@ -78,3 +96,9 @@ platform = ststm32
7896
framework = stm32cube
7997
board = cloud_jam_l4
8098
build_flags = -DL4
99+
100+
[env:nucleo_l552ze_q]
101+
platform = ststm32
102+
framework = stm32cube
103+
board = nucleo_l552ze_q
104+
build_flags = -DL5

‎examples/stm32cube-hal-blink/src/main.c‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,22 @@
1010
#include "stm32f4xx_hal.h"
1111
#elif F7
1212
#include "stm32f7xx_hal.h"
13+
#elif H7
14+
#include "stm32h7xx_hal.h"
15+
#elif G0
16+
#include "stm32g0xx_hal.h"
17+
#elif G4
18+
#include "stm32g4xx_hal.h"
19+
#elif H7
20+
#include "stm32f7xx_hal.h"
1321
#elif L0
1422
#include "stm32l0xx_hal.h"
1523
#elif L1
1624
#include "stm32l1xx_hal.h"
1725
#elif L4
1826
#include "stm32l4xx_hal.h"
27+
#elif L5
28+
#include "stm32l5xx_hal.h"
1929
#else
2030
#error "Unsupported STM32 Family"
2131
#endif

‎platform.json‎

Lines changed: 15 additions & 15 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": "18.0.0",
21+
"version": "19.0.0",
2222
"frameworks": {
2323
"mbed": {
2424
"package": "framework-mbed",
@@ -220,85 +220,85 @@
220220
"type": "framework",
221221
"optional": true,
222222
"owner": "platformio",
223-
"version": "~1.11.0"
223+
"version": "~1.11.5"
224224
},
225225
"framework-stm32cubef1": {
226226
"type": "framework",
227227
"optional": true,
228228
"owner": "platformio",
229-
"version": "~1.8.0"
229+
"version": "~1.8.6"
230230
},
231231
"framework-stm32cubef2": {
232232
"type": "framework",
233233
"optional": true,
234234
"owner": "platformio",
235-
"version": "~1.9.0"
235+
"version": "~1.9.5"
236236
},
237237
"framework-stm32cubef3": {
238238
"type": "framework",
239239
"optional": true,
240240
"owner": "platformio",
241-
"version": "~1.11.0"
241+
"version": "~1.11.5"
242242
},
243243
"framework-stm32cubef4": {
244244
"type": "framework",
245245
"optional": true,
246246
"owner": "platformio",
247-
"version": "~1.26.0"
247+
"version": "~1.28.1"
248248
},
249249
"framework-stm32cubef7": {
250250
"type": "framework",
251251
"optional": true,
252252
"owner": "platformio",
253-
"version": "~1.16.0"
253+
"version": "~1.17.2"
254254
},
255255
"framework-stm32cubeg0": {
256256
"type": "framework",
257257
"optional": true,
258258
"owner": "platformio",
259-
"version": "~1.5.0"
259+
"version": "~1.6.2"
260260
},
261261
"framework-stm32cubeg4": {
262262
"type": "framework",
263263
"optional": true,
264264
"owner": "platformio",
265-
"version": "~1.4.0"
265+
"version": "~1.6.1"
266266
},
267267
"framework-stm32cubeh7": {
268268
"type": "framework",
269269
"optional": true,
270270
"owner": "platformio",
271-
"version": "~1.9.0"
271+
"version": "~1.12.1"
272272
},
273273
"framework-stm32cubel0": {
274274
"type": "framework",
275275
"optional": true,
276276
"owner": "platformio",
277-
"version": "~1.12.0"
277+
"version": "~1.12.2"
278278
},
279279
"framework-stm32cubel1": {
280280
"type": "framework",
281281
"optional": true,
282282
"owner": "platformio",
283-
"version": "~1.10.0"
283+
"version": "~1.10.4"
284284
},
285285
"framework-stm32cubel4": {
286286
"type": "framework",
287287
"optional": true,
288288
"owner": "platformio",
289-
"version": "~1.17.0"
289+
"version": "~1.18.1"
290290
},
291291
"framework-stm32cubel5": {
292292
"type": "framework",
293293
"optional": true,
294294
"owner": "platformio",
295-
"version": "~1.4.0"
295+
"version": "~1.5.1"
296296
},
297297
"framework-zephyr": {
298298
"type": "framework",
299299
"optional": true,
300300
"owner": "platformio",
301-
"version": "~2.40000.0"
301+
"version": "~3.40000.0"
302302
},
303303
"tool-stm32duino": {
304304
"type": "uploader",

‎platform.py‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import subprocess
1818

1919
from platformio.managers.platform import PlatformBase
20+
from platformio.project.helpers import get_project_dir
2021

2122

2223
IS_WINDOWS = sys.platform.startswith("win")
@@ -116,16 +117,26 @@ def install_package(self, name, *args, **kwargs):
116117
if name != "framework-zephyr":
117118
return pkg
118119

119-
if not os.path.isfile(os.path.join(pkg.path, "_pio", "state.json")):
120-
self.pm.log.info("Installing Zephyr project dependencies...")
121-
try:
122-
subprocess.run([
123-
os.path.normpath(sys.executable),
124-
os.path.join(pkg.path, "scripts", "platformio", "install-deps.py"),
125-
"--platform", self.name
126-
])
127-
except subprocess.CalledProcessError:
128-
self.pm.log.info("Failed to install Zephyr dependencies!")
120+
prj_west_manifest = os.path.join(get_project_dir(), "west.yml")
121+
try:
122+
(
123+
subprocess.run(
124+
[
125+
os.path.normpath(sys.executable),
126+
os.path.join(
127+
pkg.path, "scripts", "platformio", "install-deps.py"
128+
),
129+
"--platform",
130+
self.name,
131+
] + (
132+
["--manifest", prj_west_manifest]
133+
if os.path.isfile(prj_west_manifest)
134+
else []
135+
)
136+
)
137+
)
138+
except subprocess.CalledProcessError:
139+
self.pm.log.info("Failed to install Zephyr dependencies!")
129140

130141
return pkg
131142

0 commit comments

Comments
 (0)