Merge branch 'release/v12.1.1'

Author: valeros

boards/nucleo_l412rb_p.json

@@ -0,0 +1,40 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32L412xx",
+    "f_cpu": "80000000L",
+    "mcu": "stm32l412rbt6p",
+    "product_line": "STM32L412xx"
+  },
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32L412RB",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_board": "st_nucleo_l4",
+    "openocd_target": "stm32l4x",
+    "svd_path": "STM32L4x2.svd"
+  },
+  "frameworks": [
+    "cmsis",
+    "stm32cube"
+  ],
+  "name": "ST Nucleo L412RB-P",
+  "upload": {
+    "maximum_ram_size": 40960,
+    "maximum_size": 131072,
+    "protocol": "stlink",
+    "protocols": [
+      "jlink",
+      "cmsis-dap",
+      "stlink",
+      "blackmagic",
+      "mbed"
+    ]
+  },
+  "url": "https://www.st.com/en/evaluation-tools/nucleo-l412rb-p.html",
+  "vendor": "ST"
+}

boards/portenta_h7_m4.json

@@ -14,14 +14,6 @@
       [
         "0x2341",
         "0x035b"
-      ],
-      [
-        "0x2341",
-        "0x025b"
-      ],
-      [
-        "0x2341",
-        "0x045b"
       ]
     ]
   },

boards/portenta_h7_m7.json

@@ -14,14 +14,6 @@
       [
         "0x2341",
         "0x035b"
-      ],
-      [
-        "0x2341",
-        "0x025b"
-      ],
-      [
-        "0x2341",
-        "0x045b"
       ]
     ]
   },

builder/main.py

@@ -210,7 +210,7 @@ def _jlink_cmd_script(env, source):
 
     # default tool for all boards with embedded DFU bootloader over USB
     _upload_tool = '"%s"' % join(platform.get_package_dir(
-        "tool-dfuutil") or "", "bin", "dfu-util"),
+        "tool-dfuutil") or "", "bin", "dfu-util")
     _upload_flags = [
         "-d", ",".join(["%s:%s" % (hwid[0], hwid[1]) for hwid in hwids]),
         "-a", "0", "-s",
@@ -223,9 +223,7 @@ def _jlink_cmd_script(env, source):
         if env.subst("$BOARD").startswith("portenta"):
             upload_actions.insert(
                 0,
-                env.VerboseAction(
-                    env.AutodetectUploadPort, "Looking for upload port..."
-                ),
+                env.VerboseAction(BeforeUpload, "Looking for upload port...")
             )
         elif board.get("build.mcu").startswith("stm32f103"):
             # F103 series doesn't have embedded DFU over USB

platform.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-ststm32.git"
   },
-  "version": "12.1.0",
+  "version": "12.1.1",
   "frameworks": {
     "mbed": {
       "package": "framework-mbed",

platform.py

@@ -37,6 +37,7 @@ def configure_default_packages(self, variables, targets):
                 self.frameworks["arduino"][
                     "script"
                 ] = "builder/frameworks/arduino/mbed-core/arduino-core-mbed.py"
+                self.packages["framework-arduinoststm32"]["optional"] = True
             elif build_core == "maple":
                 self.frameworks["arduino"]["package"] = "framework-arduinoststm32-maple"
                 self.packages["framework-arduinoststm32-maple"]["optional"] = False