Skip to content

Commit 3b68dfb

Browse files
valerosvaleros
committed
Merge branch 'release/v18.0.0'
2 parents e2078e6 + f42a497 commit 3b68dfb

27 files changed

+239
-104
lines changed

‎.github/workflows/examples.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Set up Python
5555
uses: actions/setup-python@v3
5656
with:
57-
python-version: "3.9"
57+
python-version: "3.10"
5858
- name: Install dependencies
5959
run: |
6060
pip install -U https://github.com/platformio/platformio/archive/develop.zip

‎boards/electrosmith_daisy.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"mcu": "stm32h750ibk6",
1414
"product_line": "STM32H750xx",
15-
"variant": "STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)"
15+
"variant": "STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK"
1616
},
1717
"connectivity": [
1818
"can"

‎boards/electrosmith_daisy_patch_sm.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"extra_flags": "-DSTM32H7 -DSTM32H7xx -DSTM32H750xx",
1010
"f_cpu": "400000000L",
1111
"framework_extra_flags": {
12-
"arduino": "-DCUSTOM_PERIPHERAL_PINS"
12+
"arduino": "-DCUSTOM_PERIPHERAL_PINS -DARDUINO_DAISY_PATCH_SM"
1313
},
1414
"mcu": "stm32h750ibk6",
1515
"product_line": "STM32H750xx",
16-
"variant": "STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)"
16+
"variant": "STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK"
1717
},
1818
"connectivity": [
1919
"can"

‎boards/electrosmith_daisy_petal_sm.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"extra_flags": "-DSTM32H7 -DSTM32H7xx -DSTM32H750xx",
1010
"f_cpu": "400000000L",
1111
"framework_extra_flags": {
12-
"arduino": "-DCUSTOM_PERIPHERAL_PINS"
12+
"arduino": "-DCUSTOM_PERIPHERAL_PINS -DARDUINO_DAISY_PETAL_SM"
1313
},
1414
"mcu": "stm32h750ibk6",
1515
"product_line": "STM32H750xx",
16-
"variant": "STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)"
16+
"variant": "STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK"
1717
},
1818
"connectivity": [
1919
"can"

‎boards/giga_r1_m4.json

-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
[
1616
"0x2341",
1717
"0x0366"
18-
],
19-
[
20-
"0x2341",
21-
"0x0266"
22-
],
23-
[
24-
"0x2341",
25-
"0x0466"
2618
]
2719
]
2820
},

‎boards/giga_r1_m7.json

-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
[
1616
"0x2341",
1717
"0x0366"
18-
],
19-
[
20-
"0x2341",
21-
"0x0266"
22-
],
23-
[
24-
"0x2341",
25-
"0x0466"
2618
]
2719
]
2820
},

‎boards/mkr_sharky.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"extra_flags": "-DSTM32WB -DSTM32WBxx -DSTM32WB55xx",
66
"f_cpu": "64000000L",
77
"mcu": "stm32wb55cg",
8-
"variant": "STM32WBxx/WB55C(C-E-G)U"
8+
"variant": "STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U"
99
},
1010
"connectivity": [
1111
"bluetooth"

‎boards/nicla_vision.json

-12
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@
1515
[
1616
"0x2341",
1717
"0x035F"
18-
],
19-
[
20-
"0x2341",
21-
"0x025F"
22-
],
23-
[
24-
"0x2341",
25-
"0x045F"
26-
],
27-
[
28-
"0x2341",
29-
"0x055F"
3018
]
3119
]
3220
},

‎boards/nicla_vision_m4.json

-12
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@
1515
[
1616
"0x2341",
1717
"0x035F"
18-
],
19-
[
20-
"0x2341",
21-
"0x025F"
22-
],
23-
[
24-
"0x2341",
25-
"0x045F"
26-
],
27-
[
28-
"0x2341",
29-
"0x055F"
3018
]
3119
]
3220
},

‎boards/nucleo_f439zi.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
{
22
"build": {
3+
"arduino": {
4+
"variant_h": "variant_NUCLEO_F4x9ZI.h"
5+
},
36
"cpu": "cortex-m4",
47
"extra_flags": "-DSTM32F4 -DSTM32F439xx",
58
"f_cpu": "180000000L",
69
"mcu": "stm32f439zit6",
7-
"product_line": "STM32F439xx"
10+
"product_line": "STM32F439xx",
11+
"variant": "STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)"
812
},
913
"connectivity": [
1014
"can",
@@ -23,14 +27,15 @@
2327
"svd_path": "STM32F439x.svd"
2428
},
2529
"frameworks": [
30+
"arduino",
2631
"cmsis",
2732
"mbed",
2833
"stm32cube",
2934
"libopencm3"
3035
],
3136
"name": "ST Nucleo F439ZI",
3237
"upload": {
33-
"maximum_ram_size": 262144,
38+
"maximum_ram_size": 196608,
3439
"maximum_size": 2097152,
3540
"protocol": "stlink",
3641
"protocols": [
@@ -41,6 +46,6 @@
4146
"mbed"
4247
]
4348
},
44-
"url": "https://developer.mbed.org/platforms/ST-Nucleo-F439ZI/",
49+
"url": "https://www.st.com/en/evaluation-tools/nucleo-f439zi.html",
4550
"vendor": "ST"
4651
}

‎boards/nucleo_g431rb.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"f_cpu": "170000000L",
77
"mcu": "stm32g431rbt6",
88
"product_line": "STM32G431xx",
9-
"variant": "STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)"
9+
"variant": "STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)"
1010
},
1111
"connectivity": [
1212
"can"

‎boards/nucleo_g474re.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"f_cpu": "170000000L",
77
"mcu": "stm32g474ret6",
88
"product_line": "STM32G474xx",
9-
"variant": "STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET"
9+
"variant": "STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET"
1010
},
1111
"connectivity": [
1212
"can"

‎boards/nucleo_u575zi_q.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"openocd_target": "stm32u5x"
2626
},
2727
"frameworks": [
28-
"arduino"
28+
"arduino",
29+
"mbed"
2930
],
3031
"name": "ST Nucleo U575ZI-Q",
3132
"upload": {

‎boards/rymcu_f407ve.json

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"variant_h": "variant_generic.h"
5+
},
6+
"core": "stm32",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DSTM32F407xx -DARDUINO_GENERIC_F407VETX -DSTM32F4",
9+
"f_cpu": "168000000L",
10+
"hwids": [
11+
[
12+
"0x1EAF",
13+
"0x0003"
14+
],
15+
[
16+
"0x0483",
17+
"0x3748"
18+
]
19+
],
20+
"mcu": "stm32f407vet6",
21+
"product_line": "STM32F407xx",
22+
"variant": "STM32F4xx/F407V(E-G)T_F417V(E-G)T"
23+
},
24+
"debug": {
25+
"default_tools": [
26+
"stlink"
27+
],
28+
"jlink_device": "STM32F407VE",
29+
"openocd_extra_args": [
30+
"-c",
31+
"reset_config none"
32+
],
33+
"openocd_target": "stm32f4x",
34+
"svd_path": "STM32F40x.svd"
35+
},
36+
"frameworks": [
37+
"arduino",
38+
"cmsis",
39+
"stm32cube",
40+
"libopencm3"
41+
],
42+
"name": "RYMCU STM32F407VE (192k RAM. 512k Flash)",
43+
"upload": {
44+
"disable_flushing": false,
45+
"maximum_ram_size": 131072,
46+
"maximum_size": 514288,
47+
"protocol": "stlink",
48+
"protocols": [
49+
"jlink",
50+
"cmsis-dap",
51+
"stlink",
52+
"blackmagic",
53+
"serial",
54+
"dfu"
55+
],
56+
"require_upload_port": true,
57+
"use_1200bps_touch": false,
58+
"wait_for_upload_port": false
59+
},
60+
"url": "https://rymcu.com/products",
61+
"vendor": "RYMCU"
62+
}

‎boards/rymcu_nebulapi_f103ve.json

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"variant_h": "variant_generic.h"
5+
},
6+
"core": "stm32",
7+
"cpu": "cortex-m3",
8+
"extra_flags": "-DSTM32F103xE -DSTM32F1 -DARDUINO_GENERIC_F103VETX",
9+
"f_cpu": "72000000L",
10+
"hwids": [
11+
[
12+
"0x1EAF",
13+
"0x0003"
14+
],
15+
[
16+
"0x1EAF",
17+
"0x0004"
18+
]
19+
],
20+
"mcu": "stm32f103vet6",
21+
"product_line": "STM32F103xE",
22+
"variant": "STM32F1xx/F103V(C-D-E)(H-T)"
23+
},
24+
"debug": {
25+
"jlink_device": "STM32F103VE",
26+
"openocd_target": "stm32f1x",
27+
"svd_path": "STM32F103xx.svd"
28+
},
29+
"frameworks": [
30+
"arduino",
31+
"cmsis",
32+
"libopencm3",
33+
"stm32cube"
34+
],
35+
"name": "RYMCU Nebula Pi F103VE (64k RAM. 512k Flash)",
36+
"upload": {
37+
"disable_flushing": false,
38+
"maximum_ram_size": 65536,
39+
"maximum_size": 524288,
40+
"protocol": "stlink",
41+
"protocols": [
42+
"jlink",
43+
"cmsis-dap",
44+
"stlink",
45+
"blackmagic",
46+
"serial",
47+
"dfu"
48+
],
49+
"require_upload_port": true,
50+
"use_1200bps_touch": false,
51+
"wait_for_upload_port": false
52+
},
53+
"url": "https://rymcu.com/products",
54+
"vendor": "RYMCU"
55+
}

‎examples/zephyr-blink/src/main.c

+15-13
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7+
#include <stdio.h>
78
#include <zephyr/kernel.h>
89
#include <zephyr/drivers/gpio.h>
910

1011
/* 1000 msec = 1 sec */
11-
#define SLEEP_TIME_MS 300
12+
#define SLEEP_TIME_MS 1000
1213

1314
/* The devicetree node identifier for the "led0" alias. */
1415
#define LED0_NODE DT_ALIAS(led0)
@@ -19,28 +20,29 @@
1920
*/
2021
static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(LED0_NODE, gpios);
2122

22-
void main(void)
23+
int main(void)
2324
{
2425
int ret;
26+
bool led_state = true;
2527

26-
if (!gpio_is_ready_dt(&led))
27-
{
28-
return;
28+
if (!gpio_is_ready_dt(&led)) {
29+
return 0;
2930
}
3031

3132
ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE);
32-
if (ret < 0)
33-
{
34-
return;
33+
if (ret < 0) {
34+
return 0;
3535
}
3636

37-
while (1)
38-
{
37+
while (1) {
3938
ret = gpio_pin_toggle_dt(&led);
40-
if (ret < 0)
41-
{
42-
return;
39+
if (ret < 0) {
40+
return 0;
4341
}
42+
43+
led_state = !led_state;
44+
printf("LED state: %s\n", led_state ? "ON" : "OFF");
4445
k_msleep(SLEEP_TIME_MS);
4546
}
47+
return 0;
4648
}

‎examples/zephyr-blink/zephyr/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
cmake_minimum_required(VERSION 3.13.1)
4-
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
3+
cmake_minimum_required(VERSION 3.20.0)
4+
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
55
project(blinky)
66

77
target_sources(app PRIVATE ../src/main.c)

‎examples/zephyr-cpp-synchronization/zephyr/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
cmake_minimum_required(VERSION 3.13.1)
4-
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
3+
cmake_minimum_required(VERSION 3.20.0)
4+
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
55
project(cpp_synchronization)
66

77
target_sources(app PRIVATE ../src/main.cpp)

0 commit comments

Comments
 (0)