Merge branch 'release/v15.4.0'

Author: valeros

.github/workflows/examples.yml

@@ -7,8 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, windows-latest, macos-latest]
-        python-version: [3.7]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         example:
           - "examples/arduino-blink"
           - "examples/arduino-external-libs"
@@ -59,18 +58,17 @@ jobs:
           - "tests/arduino-blink-different-cores"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: "recursive"
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - name: Set up Python
+        uses: actions/setup-python@v3
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.9"
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
           pip install -U https://github.com/platformio/platformio/archive/develop.zip
-          platformio platform install file://.
+          pio pkg install --global --platform symlink://.
       - name: Build examples
         run: |
-          platformio run -d ${{ matrix.example }}
+          pio run -d ${{ matrix.example }}

README.md

@@ -1,4 +1,4 @@
-# ST STM32: development platform for [PlatformIO](http://platformio.org)
+# ST STM32: development platform for [PlatformIO](https://platformio.org)
 
 [![Build Status](https://github.com/platformio/platform-ststm32/workflows/Examples/badge.svg)](https://github.com/platformio/platform-ststm32/actions)
 
@@ -9,7 +9,7 @@ The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is des
 
 # Usage
 
-1. [Install PlatformIO](http://platformio.org)
+1. [Install PlatformIO](https://platformio.org)
 2. Create PlatformIO project and configure a platform option in [platformio.ini](https://docs.platformio.org/page/projectconf.html) file:
 
 ## Stable version

builder/compat.py

@@ -21,7 +21,7 @@
 env = DefaultEnvironment()
 
 env.Append(
-    ASFLAGS=["-x", "assembler-with-cpp"],
+    ASPPFLAGS=["-x", "assembler-with-cpp"],
 
     CCFLAGS=[
         "-Os",  # optimize for size
@@ -58,6 +58,3 @@
             "-mcpu=%s" % env.BoardConfig().get("build.cpu")
         ]
     )
-
-# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
-env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])

builder/frameworks/_bare.py

@@ -215,18 +215,22 @@ def process_dsp_lib():
     )
 
 
-env.Replace(AS="$CC", ASCOM="$ASPPCOM")
+machine_flags = [
+    "-mthumb",
+    "-mcpu=%s" % board.get("build.cpu"),
+]
 
 env.Append(
-    ASFLAGS=["-x", "assembler-with-cpp"],
+    ASFLAGS=machine_flags,
+    ASPPFLAGS=[
+        "-x", "assembler-with-cpp",
+    ],
 
-    CCFLAGS=[
+    CCFLAGS=machine_flags + [
         "-Os",  # optimize for size
         "-ffunction-sections",  # place each function in its own section
         "-fdata-sections",
         "-Wall",
-        "-mthumb",
-        "-mcpu=%s" % board.get("build.cpu"),
         "-nostdlib",
     ],
 
@@ -267,11 +271,9 @@ def process_dsp_lib():
         "-fno-exceptions"
     ],
 
-    LINKFLAGS=[
+    LINKFLAGS=machine_flags + [
         "-Os",
         "-Wl,--gc-sections,--relax",
-        "-mthumb",
-        "-mcpu=%s" % board.get("build.cpu"),
         "--specs=nano.specs",
         "--specs=nosys.specs",
     ],
@@ -283,9 +285,6 @@ def process_dsp_lib():
     LIBS=["c", "gcc", "m", "stdc++", "nosys"],
 )
 
-# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
-env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
-
 if not board.get("build.ldscript", ""):
     env.Replace(LDSCRIPT_PATH=get_linker_script(
         board.get("build.mcu", ""), board.get("build.cpu", "")))

builder/frameworks/arduino/mbed-core

@@ -20,7 +20,7 @@
 from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild,
                           Builder, Default, DefaultEnvironment)
 
-from platformio.util import get_serial_ports
+from platformio.public import list_serial_ports
 
 
 def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
@@ -33,7 +33,7 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
     if not bool(upload_options.get("disable_flushing", False)):
         env.FlushSerialBuffer("$UPLOAD_PORT")
 
-    before_ports = get_serial_ports()
+    before_ports = list_serial_ports()
 
     if bool(upload_options.get("use_1200bps_touch", False)):
         env.TouchSerialPort("$UPLOAD_PORT", 1200)
@@ -43,7 +43,6 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
 
 
 env = DefaultEnvironment()
-env.SConscript("compat.py", exports="env")
 platform = env.PioPlatform()
 board = env.BoardConfig()