Merge branch 'release/v18.0.0'

platformio · Nov 29, 2024 · 3b68dfb · 3b68dfb
2 parents e2078e6 + f42a497
commit 3b68dfb
Show file tree

Hide file tree

Showing 27 changed files with 239 additions and 104 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           pip install -U https://github.com/platformio/platformio/archive/develop.zip

diff --git a/boards/electrosmith_daisy.json b/boards/electrosmith_daisy.json
@@ -12,7 +12,7 @@
     },
     "mcu": "stm32h750ibk6",
     "product_line": "STM32H750xx",
-    "variant": "STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)"
+    "variant": "STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK"
   },
   "connectivity": [
     "can"

diff --git a/boards/electrosmith_daisy_patch_sm.json b/boards/electrosmith_daisy_patch_sm.json
@@ -9,11 +9,11 @@
     "extra_flags": "-DSTM32H7 -DSTM32H7xx -DSTM32H750xx",
     "f_cpu": "400000000L",
     "framework_extra_flags": {
-      "arduino": "-DCUSTOM_PERIPHERAL_PINS"
+      "arduino": "-DCUSTOM_PERIPHERAL_PINS -DARDUINO_DAISY_PATCH_SM"
     },
     "mcu": "stm32h750ibk6",
     "product_line": "STM32H750xx",
-    "variant": "STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)"
+    "variant": "STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK"
   },
   "connectivity": [
     "can"

diff --git a/boards/electrosmith_daisy_petal_sm.json b/boards/electrosmith_daisy_petal_sm.json
@@ -9,11 +9,11 @@
     "extra_flags": "-DSTM32H7 -DSTM32H7xx -DSTM32H750xx",
     "f_cpu": "400000000L",
     "framework_extra_flags": {
-      "arduino": "-DCUSTOM_PERIPHERAL_PINS"
+      "arduino": "-DCUSTOM_PERIPHERAL_PINS -DARDUINO_DAISY_PETAL_SM"
     },
     "mcu": "stm32h750ibk6",
     "product_line": "STM32H750xx",
-    "variant": "STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)"
+    "variant": "STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK"
   },
   "connectivity": [
     "can"

diff --git a/boards/giga_r1_m4.json b/boards/giga_r1_m4.json
@@ -15,14 +15,6 @@
       [
           "0x2341",
           "0x0366"
-      ],
-      [
-          "0x2341",
-          "0x0266"
-      ],
-      [
-          "0x2341",
-          "0x0466"
       ]
     ]
   },

diff --git a/boards/giga_r1_m7.json b/boards/giga_r1_m7.json
@@ -15,14 +15,6 @@
       [
           "0x2341",
           "0x0366"
-      ],
-      [
-          "0x2341",
-          "0x0266"
-      ],
-      [
-          "0x2341",
-          "0x0466"
       ]
     ]
   },

diff --git a/boards/mkr_sharky.json b/boards/mkr_sharky.json
@@ -5,7 +5,7 @@
     "extra_flags": "-DSTM32WB -DSTM32WBxx -DSTM32WB55xx",
     "f_cpu": "64000000L",
     "mcu": "stm32wb55cg",
-    "variant": "STM32WBxx/WB55C(C-E-G)U"
+    "variant": "STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U"
   },
   "connectivity": [
     "bluetooth"

diff --git a/boards/nicla_vision.json b/boards/nicla_vision.json
@@ -15,18 +15,6 @@
       [
         "0x2341",
         "0x035F"
-      ],
-      [
-        "0x2341",
-        "0x025F"
-      ],
-      [
-        "0x2341",
-        "0x045F"
-      ],
-      [
-        "0x2341",
-        "0x055F"
       ]
     ]
   },

diff --git a/boards/nicla_vision_m4.json b/boards/nicla_vision_m4.json
@@ -15,18 +15,6 @@
       [
         "0x2341",
         "0x035F"
-      ],
-      [
-        "0x2341",
-        "0x025F"
-      ],
-      [
-        "0x2341",
-        "0x045F"
-      ],
-      [
-        "0x2341",
-        "0x055F"
       ]
     ]
   },

diff --git a/boards/nucleo_f439zi.json b/boards/nucleo_f439zi.json
@@ -1,10 +1,14 @@
 {
   "build": {
+    "arduino": {
+      "variant_h": "variant_NUCLEO_F4x9ZI.h"
+    },
     "cpu": "cortex-m4",
     "extra_flags": "-DSTM32F4 -DSTM32F439xx",
     "f_cpu": "180000000L",
     "mcu": "stm32f439zit6",
-    "product_line": "STM32F439xx"
+    "product_line": "STM32F439xx",
+    "variant": "STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)"
   },
   "connectivity": [
     "can",
@@ -23,14 +27,15 @@
     "svd_path": "STM32F439x.svd"
   },
   "frameworks": [
+    "arduino",
     "cmsis",
     "mbed",
     "stm32cube",
     "libopencm3"
   ],
   "name": "ST Nucleo F439ZI",
   "upload": {
-    "maximum_ram_size": 262144,
+    "maximum_ram_size": 196608,
     "maximum_size": 2097152,
     "protocol": "stlink",
     "protocols": [
@@ -41,6 +46,6 @@
       "mbed"
     ]
   },
-  "url": "https://developer.mbed.org/platforms/ST-Nucleo-F439ZI/",
+  "url": "https://www.st.com/en/evaluation-tools/nucleo-f439zi.html",
   "vendor": "ST"
 }
diff --git a/boards/nucleo_g431rb.json b/boards/nucleo_g431rb.json
@@ -6,7 +6,7 @@
     "f_cpu": "170000000L",
     "mcu": "stm32g431rbt6",
     "product_line": "STM32G431xx",
-    "variant": "STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)"
+    "variant": "STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)"
   },
   "connectivity": [
     "can"

diff --git a/boards/nucleo_g474re.json b/boards/nucleo_g474re.json
@@ -6,7 +6,7 @@
     "f_cpu": "170000000L",
     "mcu": "stm32g474ret6",
     "product_line": "STM32G474xx",
-    "variant": "STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET"
+    "variant": "STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET"
   },
   "connectivity": [
     "can"

diff --git a/boards/nucleo_u575zi_q.json b/boards/nucleo_u575zi_q.json
@@ -25,7 +25,8 @@
     "openocd_target": "stm32u5x"
   },
   "frameworks": [
-    "arduino"
+    "arduino",
+    "mbed"
   ],
   "name": "ST Nucleo U575ZI-Q",
   "upload": {

diff --git a/boards/rymcu_f407ve.json b/boards/rymcu_f407ve.json
@@ -0,0 +1,62 @@
+{
+  "build": {
+    "arduino": {
+      "variant_h": "variant_generic.h"
+    },
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F407xx -DARDUINO_GENERIC_F407VETX -DSTM32F4",
+    "f_cpu": "168000000L",
+    "hwids": [
+      [
+        "0x1EAF",
+        "0x0003"
+      ],
+      [
+        "0x0483",
+        "0x3748"
+      ]
+    ],
+    "mcu": "stm32f407vet6",
+    "product_line": "STM32F407xx",
+    "variant": "STM32F4xx/F407V(E-G)T_F417V(E-G)T"
+  },
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32F407VE",
+    "openocd_extra_args": [
+      "-c",
+      "reset_config none"
+    ],
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F40x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "stm32cube",
+    "libopencm3"
+  ],
+  "name": "RYMCU STM32F407VE (192k RAM. 512k Flash)",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 131072,
+    "maximum_size": 514288,
+    "protocol": "stlink",
+    "protocols": [
+      "jlink",
+      "cmsis-dap",
+      "stlink",
+      "blackmagic",
+      "serial",
+      "dfu"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://rymcu.com/products",
+  "vendor": "RYMCU"
+}
diff --git a/boards/rymcu_nebulapi_f103ve.json b/boards/rymcu_nebulapi_f103ve.json
@@ -0,0 +1,55 @@
+{
+  "build": {
+    "arduino": {
+      "variant_h": "variant_generic.h"
+    },
+    "core": "stm32",
+    "cpu": "cortex-m3",
+    "extra_flags": "-DSTM32F103xE -DSTM32F1 -DARDUINO_GENERIC_F103VETX",
+    "f_cpu": "72000000L",
+    "hwids": [
+      [
+        "0x1EAF",
+        "0x0003"
+      ],
+      [
+        "0x1EAF",
+        "0x0004"
+      ]
+    ],
+    "mcu": "stm32f103vet6",
+    "product_line": "STM32F103xE",
+    "variant": "STM32F1xx/F103V(C-D-E)(H-T)"
+  },
+  "debug": {
+    "jlink_device": "STM32F103VE",
+    "openocd_target": "stm32f1x",
+    "svd_path": "STM32F103xx.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "libopencm3",
+    "stm32cube"
+  ],
+  "name": "RYMCU Nebula Pi F103VE (64k RAM. 512k Flash)",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 65536,
+    "maximum_size": 524288,
+    "protocol": "stlink",
+    "protocols": [
+      "jlink",
+      "cmsis-dap",
+      "stlink",
+      "blackmagic",
+      "serial",
+      "dfu"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://rymcu.com/products",
+  "vendor": "RYMCU"
+}
diff --git a/examples/zephyr-blink/src/main.c b/examples/zephyr-blink/src/main.c
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <stdio.h>
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 
 /* 1000 msec = 1 sec */
-#define SLEEP_TIME_MS 300
+#define SLEEP_TIME_MS   1000
 
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
@@ -19,28 +20,29 @@
  */
 static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(LED0_NODE, gpios);
 
-void main(void)
+int main(void)
 {
 	int ret;
+	bool led_state = true;
 
-	if (!gpio_is_ready_dt(&led))
-	{
-		return;
+	if (!gpio_is_ready_dt(&led)) {
+		return 0;
 	}
 
 	ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE);
-	if (ret < 0)
-	{
-		return;
+	if (ret < 0) {
+		return 0;
 	}
 
-	while (1)
-	{
+	while (1) {
 		ret = gpio_pin_toggle_dt(&led);
-		if (ret < 0)
-		{
-			return;
+		if (ret < 0) {
+			return 0;
 		}
+
+		led_state = !led_state;
+		printf("LED state: %s\n", led_state ? "ON" : "OFF");
 		k_msleep(SLEEP_TIME_MS);
 	}
+	return 0;
 }
diff --git a/examples/zephyr-blink/zephyr/CMakeLists.txt b/examples/zephyr-blink/zephyr/CMakeLists.txt
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
-include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(blinky)
 
 target_sources(app PRIVATE ../src/main.c)
diff --git a/examples/zephyr-cpp-synchronization/zephyr/CMakeLists.txt b/examples/zephyr-cpp-synchronization/zephyr/CMakeLists.txt
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13.1)
-include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(cpp_synchronization)
 
 target_sources(app PRIVATE ../src/main.cpp)