Merge branch 'release/v3.1.0'

platformio · May 31, 2022 · c9b68fc · c9b68fc
2 parents 4582db2 + 85320a3
commit c9b68fc
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 381 deletions.
diff --git a/.github/workflows/examples.yml b/.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-internal-libs"
@@ -17,18 +16,17 @@ jobs:
           - "examples/native-blink"
     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 }}
diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
-# TI TIVA: development platform for [PlatformIO](http://platformio.org)
+# TI TIVA: development platform for [PlatformIO](https://platformio.org)
 
 [![Build Status](https://github.com/platformio/platform-titiva/workflows/Examples/badge.svg)](https://github.com/platformio/platform-titiva/actions)
 
 Texas Instruments TM4C12x MCUs offer the industrys most popular ARM Cortex-M4 core with scalable memory and package options, unparalleled connectivity peripherals, advanced application functions, industry-leading analog integration, and extensive software solutions.
 
-* [Home](http://platformio.org/platforms/titiva) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/page/platforms/titiva.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Home](https://registry.platformio.org/platforms/platformio/titiva) (home page in the PlatformIO Registry)
+* [Documentation](https://docs.platformio.org/page/platforms/titiva.html) (advanced usage, packages, boards, frameworks, etc.)
 
 # Usage
 
-1. [Install PlatformIO](http://platformio.org)
-2. Create PlatformIO project and configure a platform option in [platformio.ini](http://docs.platformio.org/page/projectconf.html) file:
+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
 
@@ -32,5 +32,5 @@ board = ...
 
 # Configuration
 
-Please navigate to [documentation](http://docs.platformio.org/page/platforms/titiva.html).
+Please navigate to [documentation](https://docs.platformio.org/page/platforms/titiva.html).
 
diff --git a/builder/frameworks/energia.py b/builder/frameworks/energia.py
@@ -35,31 +35,33 @@
 FRAMEWORK_VERSION = platform.get_package_version("framework-energiativa")
 assert isdir(FRAMEWORK_DIR)
 
+machine_flags = [
+    "-mabi=aapcs",
+    "-mfloat-abi=hard",
+    "-mfpu=fpv4-sp-d16",
+]
 
 env.Append(
+    ASFLAGS=machine_flags,
+
+    CCFLAGS=machine_flags + [
+        "--param", "max-inline-insns-single=500"
+    ],
+
     CPPDEFINES=[
         ("ARDUINO", 10805),
         ("ENERGIA", int(FRAMEWORK_VERSION.split(".")[1])),
         ("printf", "iprintf")
     ],
 
-    CCFLAGS=[
-        "-mfloat-abi=hard",
-        "-mfpu=fpv4-sp-d16",
-        "-mabi=aapcs",
-        "--param", "max-inline-insns-single=500"
-    ],
-
-    LINKFLAGS=[
+    LINKFLAGS=machine_flags + [
         "-Wl,--entry=ResetISR",
         # "-Wl,--cref",
         "-Wl,--check-sections",
         "-Wl,--gc-sections",
         "-Wl,--unresolved-symbols=report-all",
         "-Wl,--warn-common",
         "-Wl,--warn-section-align",
-        "-mfloat-abi=hard",
-        "-mfpu=fpv4-sp-d16",
         "-fsingle-precision-constant"
     ],
 

diff --git a/builder/frameworks/libopencm3 b/builder/frameworks/libopencm3
diff --git a/builder/main.py b/builder/main.py
@@ -51,15 +51,21 @@
 if env.get("PROGNAME", "program") == "program":
     env.Replace(PROGNAME="firmware")
 
+machine_flags = [
+    "-mthumb",
+]
+
 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",
         "-nostdlib"
     ],
 
@@ -78,9 +84,8 @@
         ("F_CPU", "$BOARD_F_CPU")
     ],
 
-    LINKFLAGS=[
+    LINKFLAGS=machine_flags + [
         "-Os",
-        "-mthumb",
         "-nostartfiles",
         "-nostdlib"
     ],
@@ -115,6 +120,9 @@
 
 if "BOARD" in env:
     env.Append(
+        ASFLAGS=[
+            "-mcpu=%s" % board.get("build.cpu")
+        ],
         CCFLAGS=[
             "-mcpu=%s" % board.get("build.cpu")
         ],
@@ -123,9 +131,6 @@
         ]
     )
 
-# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
-env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
-
 if "energia" in env.get("PIOFRAMEWORK", []):
     sys.stderr.write(
         "WARNING!!! Using of `framework = energia` in `platformio.ini` is "

diff --git a/examples/arduino-blink/.travis.yml b/examples/arduino-blink/.travis.yml
diff --git a/examples/arduino-blink/README.md b/examples/arduino-blink/README.md
@@ -1,7 +1,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
+1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
 2. Download [development platform with examples](https://github.com/platformio/platform-titiva/archive/develop.zip)
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/page/projectconf.html
+; https://docs.platformio.org/page/projectconf.html
 
 [env:lplm4f120h5qr]
 platform = titiva

diff --git a/examples/arduino-internal-libs/.travis.yml b/examples/arduino-internal-libs/.travis.yml
diff --git a/examples/arduino-internal-libs/README.md b/examples/arduino-internal-libs/README.md
@@ -1,7 +1,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
+1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
 2. Download [development platform with examples](https://github.com/platformio/platform-titiva/archive/develop.zip)
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/arduino-internal-libs/platformio.ini b/examples/arduino-internal-libs/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/page/projectconf.html
+; https://docs.platformio.org/page/projectconf.html
 
 [env:lplm4f120h5qr]
 platform = titiva