Skip to content

Commit 81904b3

Browse files
committed
Merge branch 'release/v19.4.0'
2 parents fe139f7 + 71b4e78 commit 81904b3

File tree

9 files changed

+91
-10
lines changed

9 files changed

+91
-10
lines changed

boards/bluepill_f103c8.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"product_line": "STM32F103xB",
2222
"variant": "STM32F1xx/F103C8T_F103CB(T-U)",
2323
"zephyr": {
24-
"variant": "stm32_min_dev_blue"
24+
"variant": "stm32_min_dev"
2525
}
2626
},
2727
"debug": {

boards/bluepill_f103c8_128k.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"product_line": "STM32F103xB",
2222
"variant": "STM32F1xx/F103C8T_F103CB(T-U)",
2323
"zephyr": {
24-
"variant": "stm32_min_dev_blue"
24+
"variant": "stm32_min_dev"
2525
}
2626
},
2727
"debug": {

boards/nucleo_f410rb.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"extra_flags": "-DSTM32F4 -DSTM32F410Rx",
55
"f_cpu": "100000000L",
66
"mcu": "stm32f410rbt6",
7-
"product_line": "STM32F410Rx"
7+
"product_line": "STM32F410Rx",
8+
"variant": "STM32F4xx/F410R(8-B)(I-T)"
89
},
910
"debug": {
1011
"default_tools": [
@@ -19,6 +20,7 @@
1920
"svd_path": "STM32F41x.svd"
2021
},
2122
"frameworks": [
23+
"arduino",
2224
"cmsis",
2325
"stm32cube",
2426
"libopencm3",

boards/nucleo_l412rb_p.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"extra_flags": "-DSTM32L4 -DSTM32L412xx",
55
"f_cpu": "80000000L",
66
"mcu": "stm32l412rbt6p",
7-
"product_line": "STM32L412xx"
7+
"product_line": "STM32L412xx",
8+
"variant": "STM32L4xx/L412RB(I-T)xP"
89
},
910
"debug": {
1011
"default_tools": [
@@ -19,6 +20,7 @@
1920
"svd_path": "STM32L412.svd"
2021
},
2122
"frameworks": [
23+
"arduino",
2224
"cmsis",
2325
"stm32cube",
2426
"zephyr"

boards/nucleo_l552ze_q.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"frameworks": [
2727
"arduino",
2828
"cmsis",
29-
"stm32cube"
29+
"stm32cube",
30+
"zephyr"
3031
],
3132
"name": "ST Nucleo L552ZE-Q",
3233
"upload": {

boards/we_oceanus1.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"variant_h": "variant_WE_OCEANUS1.h"
5+
},
6+
"core": "stm32",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DSTM32WL -DSTM32WLxx -DSTM32WLE5xx",
9+
"f_cpu": "48000000L",
10+
"framework_extra_flags": {
11+
"arduino": "-DCUSTOM_PERIPHERAL_PINS"
12+
},
13+
"mcu": "stm32wle5ccu6 ",
14+
"product_line": "STM32WLE5xx",
15+
"variant": "STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U"
16+
},
17+
"debug": {
18+
"jlink_device": "STM32WLE5CC",
19+
"openocd_target": "stm32wlx",
20+
"svd_path": "STM32WLE5_CM4.svd"
21+
},
22+
"frameworks": [
23+
"arduino",
24+
"zephyr"
25+
],
26+
"name": "WE Oceanus-I Module",
27+
"upload": {
28+
"maximum_ram_size": 65536,
29+
"maximum_size": 262144,
30+
"protocol": "stlink",
31+
"protocols": [
32+
"stlink",
33+
"jlink"
34+
]
35+
},
36+
"url": "https://www.we-online.com/en/components/products/OCEANUS-I",
37+
"vendor": "WE"
38+
}

boards/we_oceanus1_ev.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"variant_h": "variant_WE_OCEANUS1.h"
5+
},
6+
"core": "stm32",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DSTM32WL -DSTM32WLxx -DSTM32WLE5xx",
9+
"f_cpu": "48000000L",
10+
"framework_extra_flags": {
11+
"arduino": "-DCUSTOM_PERIPHERAL_PINS"
12+
},
13+
"mcu": "stm32wle5ccu6 ",
14+
"product_line": "STM32WLE5xx",
15+
"variant": "STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U"
16+
},
17+
"debug": {
18+
"jlink_device": "STM32WLE5CC",
19+
"openocd_target": "stm32wlx",
20+
"svd_path": "STM32WLE5_CM4.svd"
21+
},
22+
"frameworks": [
23+
"arduino",
24+
"zephyr"
25+
],
26+
"name": "WE Oceanus-I EV",
27+
"upload": {
28+
"maximum_ram_size": 65536,
29+
"maximum_size": 262144,
30+
"protocol": "stlink",
31+
"protocols": [
32+
"stlink",
33+
"jlink"
34+
]
35+
},
36+
"url": "https://www.we-online.com/en/components/products/OCEANUS-I",
37+
"vendor": "WE"
38+
}

builder/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def _jlink_cmd_script(env, source):
184184
script_path = join(build_dir, "upload.jlink")
185185
commands = [
186186
"h",
187-
"loadbin %s, %s" % (source, board.get(
187+
"loadbin \"%s\", %s" % (source, board.get(
188188
"upload.offset_address", "0x08000000")),
189189
"r",
190190
"q"

platform.json

Lines changed: 4 additions & 4 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": "19.3.0",
21+
"version": "19.4.0",
2222
"frameworks": {
2323
"mbed": {
2424
"package": "framework-mbed",
@@ -190,7 +190,7 @@
190190
"type": "framework",
191191
"optional": true,
192192
"owner": "platformio",
193-
"version": "~4.21001.0"
193+
"version": "~4.21100.0"
194194
},
195195
"framework-arduinoststm32-maple": {
196196
"type": "framework",
@@ -214,7 +214,7 @@
214214
"type": "framework",
215215
"optional": true,
216216
"owner": "platformio",
217-
"version": "~4.3.1"
217+
"version": "~4.4.1"
218218
},
219219
"framework-stm32cubef0": {
220220
"type": "framework",
@@ -298,7 +298,7 @@
298298
"type": "framework",
299299
"optional": true,
300300
"owner": "platformio",
301-
"version": "~3.40200.0"
301+
"version": "~3.40201.0"
302302
},
303303
"tool-stm32flash": {
304304
"type": "uploader",

0 commit comments

Comments
 (0)