From a70025717f47f960915be1735b30fc4878018ebb Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 31 Mar 2022 14:19:16 +0300 Subject: [PATCH 01/14] Switch docs to HTTPs --- README.md | 8 ++++---- examples/arduino-blink/README.md | 2 +- examples/arduino-blink/platformio.ini | 2 +- examples/arduino-briki-internal-libs/README.md | 2 +- examples/arduino-briki-internal-libs/platformio.ini | 2 +- examples/arduino-external-libs/README.md | 2 +- examples/arduino-external-libs/platformio.ini | 2 +- examples/arduino-internal-libs/README.md | 2 +- examples/arduino-internal-libs/platformio.ini | 2 +- examples/arduino-web-thing-led/README.md | 2 +- examples/arduino-web-thing-led/platformio.ini | 2 +- examples/mbed-blink/README.md | 2 +- examples/mbed-blink/platformio.ini | 2 +- examples/mbed-dsp/README.md | 2 +- examples/mbed-dsp/platformio.ini | 2 +- examples/mbed-events/README.md | 2 +- examples/mbed-events/platformio.ini | 2 +- examples/mbed-serial/README.md | 2 +- examples/mbed-serial/platformio.ini | 2 +- examples/simba-blink/README.md | 2 +- examples/simba-blink/platformio.ini | 2 +- examples/zephyr-blink/README.md | 2 +- examples/zephyr-blink/platformio.ini | 2 +- examples/zephyr-drivers-lcd-hd44780/README.md | 2 +- examples/zephyr-drivers-lcd-hd44780/platformio.ini | 2 +- examples/zephyr-subsys-logger/README.md | 2 +- examples/zephyr-subsys-logger/platformio.ini | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 3a1453d5..daa1e4c9 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich peripheral and feature mix. -* [Home](http://platformio.org/platforms/atmelsam) (home page in PlatformIO Platform Registry) -* [Documentation](http://docs.platformio.org/page/platforms/atmelsam.html) (advanced usage, packages, boards, frameworks, etc.) +* [Home](https://registry.platformio.org/platforms/platformio/atmelsam) (home page in the PlatformIO Registry) +* [Documentation](https://docs.platformio.org/page/platforms/atmelsam.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: +2. Create PlatformIO project and configure a platform option in [platformio.ini](https://docs.platformio.org/page/projectconf.html) file: ## Stable version @@ -32,4 +32,4 @@ board = ... # Configuration -Please navigate to [documentation](http://docs.platformio.org/page/platforms/atmelsam.html). +Please navigate to [documentation](https://docs.platformio.org/page/platforms/atmelsam.html). diff --git a/examples/arduino-blink/README.md b/examples/arduino-blink/README.md index e8ee7cd2..181a3ac7 100644 --- 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-atmelsam/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 index 6088c794..26b4fc11 100644 --- 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:adafruit_circuitplayground_m0] platform = atmelsam diff --git a/examples/arduino-briki-internal-libs/README.md b/examples/arduino-briki-internal-libs/README.md index 3a367453..e62b03e9 100644 --- a/examples/arduino-briki-internal-libs/README.md +++ b/examples/arduino-briki-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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/arduino-briki-internal-libs/platformio.ini b/examples/arduino-briki-internal-libs/platformio.ini index df819f18..ced7d645 100644 --- a/examples/arduino-briki-internal-libs/platformio.ini +++ b/examples/arduino-briki-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:briki_abc_samd21] diff --git a/examples/arduino-external-libs/README.md b/examples/arduino-external-libs/README.md index f837b092..aeaa9868 100644 --- a/examples/arduino-external-libs/README.md +++ b/examples/arduino-external-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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/arduino-external-libs/platformio.ini b/examples/arduino-external-libs/platformio.ini index 4984a041..46910028 100644 --- a/examples/arduino-external-libs/platformio.ini +++ b/examples/arduino-external-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:adafruit_circuitplayground_m0] platform = atmelsam diff --git a/examples/arduino-internal-libs/README.md b/examples/arduino-internal-libs/README.md index cbf34491..506c5b34 100644 --- 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-atmelsam/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 index c0081d2b..44fbdf83 100644 --- 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:adafruit_circuitplayground_m0] platform = atmelsam diff --git a/examples/arduino-web-thing-led/README.md b/examples/arduino-web-thing-led/README.md index b3174cc9..1f072455 100644 --- a/examples/arduino-web-thing-led/README.md +++ b/examples/arduino-web-thing-led/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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/arduino-web-thing-led/platformio.ini b/examples/arduino-web-thing-led/platformio.ini index 324e313b..61db2d32 100755 --- a/examples/arduino-web-thing-led/platformio.ini +++ b/examples/arduino-web-thing-led/platformio.ini @@ -6,7 +6,7 @@ ; Advanced options: extra scripting ; ; Please visit documentation for the other options and examples -; http://docs.platformio.org/page/projectconf.html +; https://docs.platformio.org/page/projectconf.html [platformio] description = WiFi Web Server LED control via web of things (e.g., iot.mozilla.org gateway) diff --git a/examples/mbed-blink/README.md b/examples/mbed-blink/README.md index bcbda12d..f1d4c363 100644 --- a/examples/mbed-blink/README.md +++ b/examples/mbed-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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/mbed-blink/platformio.ini b/examples/mbed-blink/platformio.ini index 6a9843c5..348d5c62 100644 --- a/examples/mbed-blink/platformio.ini +++ b/examples/mbed-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:samd21_xpro] platform = atmelsam diff --git a/examples/mbed-dsp/README.md b/examples/mbed-dsp/README.md index faa8e6e5..e201dc5e 100644 --- a/examples/mbed-dsp/README.md +++ b/examples/mbed-dsp/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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/mbed-dsp/platformio.ini b/examples/mbed-dsp/platformio.ini index 89056d5f..7925f215 100644 --- a/examples/mbed-dsp/platformio.ini +++ b/examples/mbed-dsp/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:samd21_xpro] platform = atmelsam diff --git a/examples/mbed-events/README.md b/examples/mbed-events/README.md index 5ece2982..41116637 100644 --- a/examples/mbed-events/README.md +++ b/examples/mbed-events/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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/mbed-events/platformio.ini b/examples/mbed-events/platformio.ini index 36a77e2b..b6944d6f 100644 --- a/examples/mbed-events/platformio.ini +++ b/examples/mbed-events/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:samd21_xpro] platform = atmelsam diff --git a/examples/mbed-serial/README.md b/examples/mbed-serial/README.md index df67b7aa..ed542016 100644 --- a/examples/mbed-serial/README.md +++ b/examples/mbed-serial/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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/mbed-serial/platformio.ini b/examples/mbed-serial/platformio.ini index 89056d5f..7925f215 100644 --- a/examples/mbed-serial/platformio.ini +++ b/examples/mbed-serial/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:samd21_xpro] platform = atmelsam diff --git a/examples/simba-blink/README.md b/examples/simba-blink/README.md index 4f3874da..016fcd06 100755 --- a/examples/simba-blink/README.md +++ b/examples/simba-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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/simba-blink/platformio.ini b/examples/simba-blink/platformio.ini index 0219e053..4b4fd3ca 100755 --- a/examples/simba-blink/platformio.ini +++ b/examples/simba-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:due] platform = atmelsam diff --git a/examples/zephyr-blink/README.md b/examples/zephyr-blink/README.md index 49237094..a972f2ce 100644 --- a/examples/zephyr-blink/README.md +++ b/examples/zephyr-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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/zephyr-blink/platformio.ini b/examples/zephyr-blink/platformio.ini index 2d327b3f..27b47c05 100644 --- a/examples/zephyr-blink/platformio.ini +++ b/examples/zephyr-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:zero] platform = atmelsam diff --git a/examples/zephyr-drivers-lcd-hd44780/README.md b/examples/zephyr-drivers-lcd-hd44780/README.md index 6ecb27f6..7a6d3aae 100644 --- a/examples/zephyr-drivers-lcd-hd44780/README.md +++ b/examples/zephyr-drivers-lcd-hd44780/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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/zephyr-drivers-lcd-hd44780/platformio.ini b/examples/zephyr-drivers-lcd-hd44780/platformio.ini index b1b02e95..34c3c3f8 100644 --- a/examples/zephyr-drivers-lcd-hd44780/platformio.ini +++ b/examples/zephyr-drivers-lcd-hd44780/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:due] platform = atmelsam diff --git a/examples/zephyr-subsys-logger/README.md b/examples/zephyr-subsys-logger/README.md index 58155ff9..e3ab3e92 100644 --- a/examples/zephyr-subsys-logger/README.md +++ b/examples/zephyr-subsys-logger/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-atmelsam/archive/develop.zip) 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/zephyr-subsys-logger/platformio.ini b/examples/zephyr-subsys-logger/platformio.ini index 31e24615..d76b9e88 100644 --- a/examples/zephyr-subsys-logger/platformio.ini +++ b/examples/zephyr-subsys-logger/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:adafruit_trinket_m0] platform = atmelsam From f2f7314e60410b29331b6782bfc9765088325f3f Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 4 Apr 2022 12:04:56 +0300 Subject: [PATCH 02/14] Use the latest Github OS images --- .github/workflows/examples.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 2ab55f11..f6a5f777 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-18.04, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-latest] python-version: [3.7] example: - "examples/arduino-blink" @@ -22,10 +22,6 @@ jobs: - "examples/zephyr-blink" - "examples/zephyr-drivers-lcd-hd44780" - "examples/zephyr-subsys-logger" - exclude: - - {python-version: 2.7, example: "examples/zephyr-blink"} - - {python-version: 2.7, example: "examples/zephyr-drivers-lcd-hd44780"} - - {python-version: 2.7, example: "examples/zephyr-subsys-logger"} runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 From ec05bddec79c24fc50073dd3358112bd5db840d8 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 8 Apr 2022 12:54:14 +0300 Subject: [PATCH 03/14] Symlink dev-platform --- .github/workflows/examples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index f6a5f777..547c5eb3 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -35,7 +35,7 @@ jobs: 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 }} From 67f42c69ad65f4ddbf3abfcff130bc0c9965d41d Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 8 May 2022 20:51:14 +0300 Subject: [PATCH 04/14] Add "ARDUINO_SEEED_XIAO_M0" missed macro // Resolve #191 --- boards/seeed_xiao.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boards/seeed_xiao.json b/boards/seeed_xiao.json index dce08449..c5fa230f 100644 --- a/boards/seeed_xiao.json +++ b/boards/seeed_xiao.json @@ -10,7 +10,8 @@ "-D__SAMD21__", "-D__SAMD21G18A__", "-DARM_MATH_CM0PLUS", - "-DSEEED_XIAO_M0" + "-DSEEED_XIAO_M0", + "-DARDUINO_SEEED_XIAO_M0" ], "f_cpu": "48000000L", "hwids": [ From 36487d09861bb17b5e86078276c0391482eba52a Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 27 May 2022 15:43:54 +0300 Subject: [PATCH 05/14] Remove unnecessary files --- builder/compat.py | 38 ----------- builder/main.py | 1 - examples/arduino-blink/.travis.yml | 67 ------------------- .../arduino-briki-internal-libs/.travis.yml | 67 ------------------- examples/arduino-external-libs/.travis.yml | 67 ------------------- examples/arduino-internal-libs/.travis.yml | 67 ------------------- examples/arduino-web-thing-led/.travis.yml | 67 ------------------- examples/mbed-blink/.travis.yml | 67 ------------------- examples/mbed-dsp/.travis.yml | 67 ------------------- examples/mbed-events/.travis.yml | 67 ------------------- examples/mbed-serial/.travis.yml | 67 ------------------- examples/simba-blink/.travis.yml | 67 ------------------- examples/zephyr-blink/.travis.yml | 67 ------------------- .../zephyr-drivers-lcd-hd44780/.travis.yml | 67 ------------------- examples/zephyr-subsys-logger/.travis.yml | 67 ------------------- 15 files changed, 910 deletions(-) delete mode 100644 builder/compat.py delete mode 100644 examples/arduino-blink/.travis.yml delete mode 100644 examples/arduino-briki-internal-libs/.travis.yml delete mode 100644 examples/arduino-external-libs/.travis.yml delete mode 100644 examples/arduino-internal-libs/.travis.yml delete mode 100644 examples/arduino-web-thing-led/.travis.yml delete mode 100644 examples/mbed-blink/.travis.yml delete mode 100644 examples/mbed-dsp/.travis.yml delete mode 100644 examples/mbed-events/.travis.yml delete mode 100644 examples/mbed-serial/.travis.yml delete mode 100755 examples/simba-blink/.travis.yml delete mode 100644 examples/zephyr-blink/.travis.yml delete mode 100644 examples/zephyr-drivers-lcd-hd44780/.travis.yml delete mode 100644 examples/zephyr-subsys-logger/.travis.yml diff --git a/builder/compat.py b/builder/compat.py deleted file mode 100644 index b8dfe3d3..00000000 --- a/builder/compat.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2014-present PlatformIO -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from SCons.Script import AlwaysBuild, Import - - -Import("env") - - -# Added in PIO Core 4.4.0 -if not hasattr(env, "AddPlatformTarget"): - - def AddPlatformTarget( - env, - name, - dependencies, - actions, - title=None, - description=None, - always_build=True, - ): - target = env.Alias(name, dependencies, actions) - if always_build: - AlwaysBuild(target) - return target - - env.AddMethod(AddPlatformTarget) diff --git a/builder/main.py b/builder/main.py index 430dac79..469511bb 100644 --- a/builder/main.py +++ b/builder/main.py @@ -48,7 +48,6 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621 env = DefaultEnvironment() -env.SConscript("compat.py", exports="env") platform = env.PioPlatform() board = env.BoardConfig() upload_protocol = env.subst("$UPLOAD_PROTOCOL") diff --git a/examples/arduino-blink/.travis.yml b/examples/arduino-blink/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/arduino-blink/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/arduino-briki-internal-libs/.travis.yml b/examples/arduino-briki-internal-libs/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/arduino-briki-internal-libs/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/arduino-external-libs/.travis.yml b/examples/arduino-external-libs/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/arduino-external-libs/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/arduino-internal-libs/.travis.yml b/examples/arduino-internal-libs/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/arduino-internal-libs/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/arduino-web-thing-led/.travis.yml b/examples/arduino-web-thing-led/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/arduino-web-thing-led/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/mbed-blink/.travis.yml b/examples/mbed-blink/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/mbed-blink/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/mbed-dsp/.travis.yml b/examples/mbed-dsp/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/mbed-dsp/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/mbed-events/.travis.yml b/examples/mbed-events/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/mbed-events/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/mbed-serial/.travis.yml b/examples/mbed-serial/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/mbed-serial/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/simba-blink/.travis.yml b/examples/simba-blink/.travis.yml deleted file mode 100755 index 7c486f18..00000000 --- a/examples/simba-blink/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/zephyr-blink/.travis.yml b/examples/zephyr-blink/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/zephyr-blink/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/zephyr-drivers-lcd-hd44780/.travis.yml b/examples/zephyr-drivers-lcd-hd44780/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/zephyr-drivers-lcd-hd44780/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/examples/zephyr-subsys-logger/.travis.yml b/examples/zephyr-subsys-logger/.travis.yml deleted file mode 100644 index 7c486f18..00000000 --- a/examples/zephyr-subsys-logger/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Continuous Integration (CI) is the practice, in software -# engineering, of merging all developer working copies with a shared mainline -# several times a day < https://docs.platformio.org/page/ci/index.html > -# -# Documentation: -# -# * Travis CI Embedded Builds with PlatformIO -# < https://docs.travis-ci.com/user/integration/platformio/ > -# -# * PlatformIO integration with Travis CI -# < https://docs.platformio.org/page/ci/travis.html > -# -# * User Guide for `platformio ci` command -# < https://docs.platformio.org/page/userguide/cmd_ci.html > -# -# -# Please choose one of the following templates (proposed below) and uncomment -# it (remove "# " before each line) or use own configuration according to the -# Travis CI documentation (see above). -# - - -# -# Template #1: General project. Test it using existing `platformio.ini`. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio run - - -# -# Template #2: The project is intended to be used as a library with examples. -# - -# language: python -# python: -# - "2.7" -# -# sudo: false -# cache: -# directories: -# - "~/.platformio" -# -# env: -# - PLATFORMIO_CI_SRC=path/to/test/file.c -# - PLATFORMIO_CI_SRC=examples/file.ino -# - PLATFORMIO_CI_SRC=path/to/test/directory -# -# install: -# - pip install -U platformio -# - platformio update -# -# script: -# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N From b5dbf48fc41218eccb7e986b3ab55ec7c45d746f Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 27 May 2022 15:58:00 +0300 Subject: [PATCH 06/14] Improve support for assembly programming --- builder/frameworks/_bare.py | 4 +--- builder/frameworks/arduino/arduino-common.py | 18 +++++++++++------- builder/frameworks/arduino/arduino-sam.py | 4 ---- builder/frameworks/arduino/arduino-samd.py | 4 ---- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/builder/frameworks/_bare.py b/builder/frameworks/_bare.py index f361dd12..5dd183a7 100644 --- a/builder/frameworks/_bare.py +++ b/builder/frameworks/_bare.py @@ -23,7 +23,7 @@ build_mcu = env.get("BOARD_MCU", board.get("build.mcu", "")) env.Append( - ASFLAGS=["-x", "assembler-with-cpp"], + ASPPFLAGS=["-x", "assembler-with-cpp"], CFLAGS=[ "-std=gnu11" @@ -83,5 +83,3 @@ ] ) -# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode) -env.Append(ASFLAGS=env.get("CCFLAGS", [])[:]) diff --git a/builder/frameworks/arduino/arduino-common.py b/builder/frameworks/arduino/arduino-common.py index b4a97af8..acf7b289 100644 --- a/builder/frameworks/arduino/arduino-common.py +++ b/builder/frameworks/arduino/arduino-common.py @@ -42,20 +42,26 @@ assert os.path.isdir(FRAMEWORK_DIR) +machine_flags = [ + "-mcpu=%s" % board.get("build.cpu"), + "-mthumb", +] + env.Append( - ASFLAGS=["-x", "assembler-with-cpp"], + ASFLAGS=machine_flags, + ASPPFLAGS=[ + "-x", "assembler-with-cpp", + ], CFLAGS=[ "-std=gnu11" ], - CCFLAGS=[ + CCFLAGS=machine_flags + [ "-Os", # optimize for size "-ffunction-sections", # place each function in its own section "-fdata-sections", "-Wall", - "-mcpu=%s" % board.get("build.cpu"), - "-mthumb", "-nostdlib", "--param", "max-inline-insns-single=500" ], @@ -77,10 +83,8 @@ os.path.join(FRAMEWORK_DIR, "libraries") ], - LINKFLAGS=[ + LINKFLAGS=machine_flags + [ "-Os", - "-mcpu=%s" % board.get("build.cpu"), - "-mthumb", "-Wl,--gc-sections", "-Wl,--check-sections", "-Wl,--unresolved-symbols=report-all", diff --git a/builder/frameworks/arduino/arduino-sam.py b/builder/frameworks/arduino/arduino-sam.py index 05bf81c2..dac42d00 100644 --- a/builder/frameworks/arduino/arduino-sam.py +++ b/builder/frameworks/arduino/arduino-sam.py @@ -64,10 +64,6 @@ LIBS=["sam_sam3x8e_gcc_rel", "gcc"] ) -env.Append( - ASFLAGS=env.get("CCFLAGS", [])[:] -) - # # Target: Build Core Library # diff --git a/builder/frameworks/arduino/arduino-samd.py b/builder/frameworks/arduino/arduino-samd.py index 529279f0..f26241ca 100644 --- a/builder/frameworks/arduino/arduino-samd.py +++ b/builder/frameworks/arduino/arduino-samd.py @@ -171,10 +171,6 @@ ] ) -env.Append( - ASFLAGS=env.get("CCFLAGS", [])[:], -) - # # Target: Build Core Library # From f06764534919b9f607675ea0480c07d6cdc85b6b Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 27 May 2022 15:59:46 +0300 Subject: [PATCH 07/14] Add compatibility with PIO Core 6.0 --- .github/workflows/examples.yml | 10 ++-- README.md | 4 +- builder/main.py | 4 +- platform.json | 2 +- platform.py | 99 +++++++++++++++++++--------------- 5 files changed, 64 insertions(+), 55 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 547c5eb3..f4d74e5d 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -8,7 +8,6 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: [3.7] example: - "examples/arduino-blink" - "examples/arduino-briki-internal-libs" @@ -24,16 +23,15 @@ jobs: - "examples/zephyr-subsys-logger" 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 pio pkg install --global --platform symlink://. - name: Build examples diff --git a/README.md b/README.md index daa1e4c9..3b93171a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Atmel SAM: development platform for [PlatformIO](http://platformio.org) +# Atmel SAM: development platform for [PlatformIO](https://platformio.org) [![Build Status](https://github.com/platformio/platform-atmelsam/workflows/Examples/badge.svg)](https://github.com/platformio/platform-atmelsam/actions) @@ -9,7 +9,7 @@ Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cort # 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 diff --git a/builder/main.py b/builder/main.py index 469511bb..3ce4945d 100644 --- a/builder/main.py +++ b/builder/main.py @@ -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) diff --git a/platform.json b/platform.json index fe0d1867..272268c0 100644 --- a/platform.json +++ b/platform.json @@ -14,7 +14,7 @@ "SAM D" ], "engines": { - "platformio": "^5" + "platformio": "^6" }, "repository": { "type": "git", diff --git a/platform.py b/platform.py index 3ffb8454..2b57a0f7 100644 --- a/platform.py +++ b/platform.py @@ -12,22 +12,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -from copy import deepcopy -from platform import system +import sys -from platformio.managers.platform import PlatformBase -from platformio.util import get_systype +from platformio.public import PlatformBase +IS_WINDOWS = sys.platform.startswith("win") -class AtmelsamPlatform(PlatformBase): +class AtmelsamPlatform(PlatformBase): def configure_default_packages(self, variables, targets): if not variables.get("board"): - return PlatformBase.configure_default_packages( - self, variables, targets) + return super().configure_default_packages(variables, targets) board = self.board_config(variables.get("board")) - upload_protocol = variables.get("upload_protocol", - board.get("upload.protocol", "")) + upload_protocol = variables.get( + "upload_protocol", board.get("upload.protocol", "") + ) disabled_pkgs = [] upload_tool = "tool-openocd" if upload_protocol == "sam-ba": @@ -47,12 +46,14 @@ def configure_default_packages(self, variables, targets): disabled_pkgs.append(name) build_core = variables.get( - "board_build.core", self.board_config(variables.get("board")).get( - "build.core", "arduino")).lower() + "board_build.core", + self.board_config(variables.get("board")).get("build.core", "arduino"), + ).lower() if "arduino" in variables.get("pioframework", []): framework_package = "framework-arduino-%s" % ( - "sam" if board.get("build.mcu", "").startswith("at91") else "samd") + "sam" if board.get("build.mcu", "").startswith("at91") else "samd" + ) if build_core != "arduino": framework_package += "-" + build_core @@ -77,42 +78,44 @@ def configure_default_packages(self, variables, targets): if "mbed" in variables.get("pioframework", []): self.packages["toolchain-gccarmnoneeabi"][ - "version"] = ">=1.60301.0,<1.80000.0" + "version" + ] = ">=1.60301.0,<1.80000.0" if "simba" in variables.get("pioframework", []): self.packages["toolchain-gccarmnoneeabi"][ - "version"] = ">=1.40803.0,<1.40805.0" - if (board.get("build.core", "") in ("adafruit", "seeed", "sparkfun") - and "tool-bossac" in self.packages - and board.get("build.mcu", "").startswith(("samd51", "same51"))): + "version" + ] = ">=1.40803.0,<1.40805.0" + if ( + board.get("build.core", "") in ("adafruit", "seeed", "sparkfun") + and "tool-bossac" in self.packages + and board.get("build.mcu", "").startswith(("samd51", "same51")) + ): self.packages["tool-bossac"]["version"] = "~1.10900.0" if "zephyr" in variables.get("pioframework", []): for p in self.packages: if p in ("tool-cmake", "tool-dtc", "tool-ninja"): self.packages[p]["optional"] = False self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0" - if "windows" not in get_systype(): + if not IS_WINDOWS: self.packages["tool-gperf"]["optional"] = False for name in disabled_pkgs: del self.packages[name] - return PlatformBase.configure_default_packages(self, variables, - targets) + return super().configure_default_packages(variables, targets) def get_boards(self, id_=None): - result = PlatformBase.get_boards(self, id_) + result = super().get_boards(id_) if not result: return result if id_: return self._add_default_debug_tools(result) else: - for key, value in result.items(): + for key in result: result[key] = self._add_default_debug_tools(result[key]) return result def _add_default_debug_tools(self, board): debug = board.manifest.get("debug", {}) - upload_protocols = board.manifest.get("upload", {}).get( - "protocols", []) + upload_protocols = board.manifest.get("upload", {}).get("protocols", []) if "tools" not in debug: debug["tools"] = {} @@ -124,27 +127,34 @@ def _add_default_debug_tools(self, board): if link == "blackmagic": debug["tools"]["blackmagic"] = { "hwids": [["0x1d50", "0x6018"]], - "require_debug_port": True + "require_debug_port": True, } elif link == "jlink": assert debug.get("jlink_device"), ( - "Missed J-Link Device ID for %s" % board.id) + "Missed J-Link Device ID for %s" % board.id + ) debug["tools"][link] = { "server": { "package": "tool-jlink", "arguments": [ "-singlerun", - "-if", "SWD", - "-select", "USB", - "-device", debug.get("jlink_device"), - "-port", "2331" + "-if", + "SWD", + "-select", + "USB", + "-device", + debug.get("jlink_device"), + "-port", + "2331", ], - "executable": ("JLinkGDBServerCL.exe" - if system() == "Windows" else - "JLinkGDBServer") + "executable": ( + "JLinkGDBServerCL.exe" + if system() == "Windows" + else "JLinkGDBServer" + ), }, - "onboard": link in debug.get("onboard_tools", []) + "onboard": link in debug.get("onboard_tools", []), } else: @@ -154,19 +164,22 @@ def _add_default_debug_tools(self, board): if link == "stlink" and "at91sam3" in openocd_chipname: openocd_cmds.append("set CPUTAPID 0x2ba01477") server_args = [ - "-s", "$PACKAGE_DIR/scripts", - "-f", "interface/%s.cfg" % ( - "cmsis-dap" if link == "atmel-ice" else link), - "-c", "; ".join(openocd_cmds), - "-f", "target/%s.cfg" % debug.get("openocd_target") + "-s", + "$PACKAGE_DIR/scripts", + "-f", + "interface/%s.cfg" % ("cmsis-dap" if link == "atmel-ice" else link), + "-c", + "; ".join(openocd_cmds), + "-f", + "target/%s.cfg" % debug.get("openocd_target"), ] debug["tools"][link] = { "server": { "package": "tool-openocd", "executable": "bin/openocd", - "arguments": server_args + "arguments": server_args, }, - "onboard": link in debug.get("onboard_tools", []) + "onboard": link in debug.get("onboard_tools", []), } if link == "stlink": debug["tools"][link]["load_cmd"] = "preload" @@ -185,8 +198,6 @@ def configure_debug_options(self, initial_debug_options, ide_data): ["-c", "adapter speed %s" % adapter_speed] ) elif "jlink" in server_executable: - debug_options["server"]["arguments"].extend( - ["-speed", adapter_speed] - ) + debug_options["server"]["arguments"].extend(["-speed", adapter_speed]) return debug_options From 0fcaf7c48e41688edd2eba7952c445ea93392233 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 27 May 2022 16:03:55 +0300 Subject: [PATCH 08/14] Typo fix --- platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.py b/platform.py index 2b57a0f7..e5a11a6e 100644 --- a/platform.py +++ b/platform.py @@ -150,7 +150,7 @@ def _add_default_debug_tools(self, board): ], "executable": ( "JLinkGDBServerCL.exe" - if system() == "Windows" + if IS_WINDOWS else "JLinkGDBServer" ), }, From 3819dd2ad77c1d5035f0ebf490b5735812a40795 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 27 May 2022 16:16:22 +0300 Subject: [PATCH 09/14] Drop support for Simba framework --- .github/workflows/examples.yml | 1 - boards/due.json | 1 - boards/dueUSB.json | 3 +- builder/frameworks/simba.py | 60 ----------------------------- examples/simba-blink/.gitignore | 1 - examples/simba-blink/.skiptest | 0 examples/simba-blink/README.md | 18 --------- examples/simba-blink/include/README | 39 ------------------- examples/simba-blink/lib/README | 46 ---------------------- examples/simba-blink/platformio.ini | 13 ------- examples/simba-blink/src/main.c | 43 --------------------- examples/simba-blink/test/README | 11 ------ platform.json | 10 ----- platform.py | 4 -- 14 files changed, 1 insertion(+), 249 deletions(-) delete mode 100755 builder/frameworks/simba.py delete mode 100755 examples/simba-blink/.gitignore delete mode 100644 examples/simba-blink/.skiptest delete mode 100755 examples/simba-blink/README.md delete mode 100644 examples/simba-blink/include/README delete mode 100644 examples/simba-blink/lib/README delete mode 100755 examples/simba-blink/platformio.ini delete mode 100755 examples/simba-blink/src/main.c delete mode 100644 examples/simba-blink/test/README diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index f4d74e5d..93d3520c 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -17,7 +17,6 @@ jobs: - "examples/mbed-blink" - "examples/mbed-dsp" - "examples/mbed-serial" - - "examples/simba-blink" - "examples/zephyr-blink" - "examples/zephyr-drivers-lcd-hd44780" - "examples/zephyr-subsys-logger" diff --git a/boards/due.json b/boards/due.json index 6aceecdf..f99b2643 100644 --- a/boards/due.json +++ b/boards/due.json @@ -39,7 +39,6 @@ }, "frameworks": [ "arduino", - "simba", "zephyr" ], "name": "Arduino Due (Programming Port)", diff --git a/boards/dueUSB.json b/boards/dueUSB.json index 20e0cb50..49d7e5df 100644 --- a/boards/dueUSB.json +++ b/boards/dueUSB.json @@ -31,8 +31,7 @@ "svd_path": "ATSAM3X8E.svd" }, "frameworks": [ - "arduino", - "simba" + "arduino" ], "name": "Arduino Due (USB Native Port)", "upload": { diff --git a/builder/frameworks/simba.py b/builder/frameworks/simba.py deleted file mode 100755 index ecf0f271..00000000 --- a/builder/frameworks/simba.py +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2014-present PlatformIO -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Simba - -Simba is an RTOS and build framework. It aims to make embedded -programming easy and portable. - -http://simba-os.readthedocs.org - -""" - -from os.path import join, sep - -from SCons.Script import DefaultEnvironment, SConscript - -from platformio.builder.tools import platformio as platformio_tool - -# -# Backward compatibility with PlatformIO 2.0 -# -platformio_tool.SRC_DEFAULT_FILTER = " ".join([ - "+<*>", "-<.git%s>" % sep, "-" % sep, - "-" % sep, "-" % sep, - "-" % sep, "-" % sep -]) - - -def LookupSources(env, variant_dir, src_dir, duplicate=True, src_filter=None): - return env.CollectBuildFiles(variant_dir, src_dir, src_filter, duplicate) - - -def VariantDirWrap(env, variant_dir, src_dir, duplicate=False): - env.VariantDir(variant_dir, src_dir, duplicate) - - -env = DefaultEnvironment() - -env.AddMethod(LookupSources) -env.AddMethod(VariantDirWrap) - -env.SConscript("_bare.py") - -env.Replace( - PLATFORMFW_DIR=env.PioPlatform().get_package_dir("framework-simba") -) - -SConscript( - [env.subst(join("$PLATFORMFW_DIR", "make", "platformio.sconscript"))]) diff --git a/examples/simba-blink/.gitignore b/examples/simba-blink/.gitignore deleted file mode 100755 index aeaebb2b..00000000 --- a/examples/simba-blink/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio \ No newline at end of file diff --git a/examples/simba-blink/.skiptest b/examples/simba-blink/.skiptest deleted file mode 100644 index e69de29b..00000000 diff --git a/examples/simba-blink/README.md b/examples/simba-blink/README.md deleted file mode 100755 index 016fcd06..00000000 --- a/examples/simba-blink/README.md +++ /dev/null @@ -1,18 +0,0 @@ -How to build PlatformIO based project -===================================== - -1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html) -2. Download [development platform with examples](https://github.com/platformio/platform-atmelsam/archive/develop.zip) -3. Extract ZIP archive -4. Run these commands: - -```shell -# Change directory to example -$ cd platform-atmelsam/examples/simba-blink - -# Process example project -$ pio run - -# Upload firmware -$ pio run --target upload -``` diff --git a/examples/simba-blink/include/README b/examples/simba-blink/include/README deleted file mode 100644 index 194dcd43..00000000 --- a/examples/simba-blink/include/README +++ /dev/null @@ -1,39 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the usual convention is to give header files names that end with `.h'. -It is most portable to use only letters, digits, dashes, and underscores in -header file names, and at most one dot. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/examples/simba-blink/lib/README b/examples/simba-blink/lib/README deleted file mode 100644 index 6debab1e..00000000 --- a/examples/simba-blink/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into executable file. - -The source code of each library should be placed in a an own separate directory -("lib/your_library_name/[here are source files]"). - -For example, see a structure of the following two libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -and a contents of `src/main.c`: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -PlatformIO Library Dependency Finder will find automatically dependent -libraries scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/examples/simba-blink/platformio.ini b/examples/simba-blink/platformio.ini deleted file mode 100755 index 4b4fd3ca..00000000 --- a/examples/simba-blink/platformio.ini +++ /dev/null @@ -1,13 +0,0 @@ -; PlatformIO Project Configuration File -; -; Build options: build flags, source filter, extra scripting -; Upload options: custom port, speed and extra flags -; Library options: dependencies, extra library storages -; -; Please visit documentation for the other options and examples -; https://docs.platformio.org/page/projectconf.html - -[env:due] -platform = atmelsam -framework = simba -board = due diff --git a/examples/simba-blink/src/main.c b/examples/simba-blink/src/main.c deleted file mode 100755 index 404ec637..00000000 --- a/examples/simba-blink/src/main.c +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file main.c - * @version 4.1.0 - * - * @section License - * Copyright (C) 2015-2016, Erik Moqvist - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * This file is part of the Simba project. - */ - -#include "simba.h" - -int main() -{ - struct pin_driver_t led; - - /* Start the system. */ - sys_start(); - - /* Initialize the LED pin as output and set its value to 1. */ - pin_init(&led, &pin_led_dev, PIN_OUTPUT); - pin_write(&led, 1); - - while (1) { - /* Wait half a second. */ - thrd_sleep_us(500000); - - /* Toggle the LED on/off. */ - pin_toggle(&led); - } - - return (0); -} diff --git a/examples/simba-blink/test/README b/examples/simba-blink/test/README deleted file mode 100644 index df5066e6..00000000 --- a/examples/simba-blink/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PIO Unit Testing and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PIO Unit Testing: -- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/platform.json b/platform.json index 272268c0..f3a20122 100644 --- a/platform.json +++ b/platform.json @@ -30,10 +30,6 @@ "package": "framework-mbed", "script": "builder/frameworks/mbed/mbed.py" }, - "simba": { - "package": "framework-simba", - "script": "builder/frameworks/simba.py" - }, "zephyr": { "package": "framework-zephyr", "script": "builder/frameworks/zephyr.py" @@ -135,12 +131,6 @@ "owner": "platformio", "version": "~4.151.0" }, - "framework-simba": { - "type": "framework", - "optional": true, - "owner": "platformio", - "version": ">=7.0.0" - }, "framework-zephyr": { "type": "framework", "optional": true, diff --git a/platform.py b/platform.py index e5a11a6e..47d3d56c 100644 --- a/platform.py +++ b/platform.py @@ -80,10 +80,6 @@ def configure_default_packages(self, variables, targets): self.packages["toolchain-gccarmnoneeabi"][ "version" ] = ">=1.60301.0,<1.80000.0" - if "simba" in variables.get("pioframework", []): - self.packages["toolchain-gccarmnoneeabi"][ - "version" - ] = ">=1.40803.0,<1.40805.0" if ( board.get("build.core", "") in ("adafruit", "seeed", "sparkfun") and "tool-bossac" in self.packages From 2436effbc11969276ef1e4bff43114b67fccfa45 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 27 May 2022 17:34:15 +0300 Subject: [PATCH 10/14] Use 'pio' alias --- .github/workflows/examples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 93d3520c..d3ca3d39 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -35,4 +35,4 @@ jobs: pio pkg install --global --platform symlink://. - name: Build examples run: | - platformio run -d ${{ matrix.example }} + pio run -d ${{ matrix.example }} From 9699c06bde2e4d75cc1017de0236bec2f7cba394 Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Mon, 30 May 2022 11:52:24 +0300 Subject: [PATCH 11/14] Properly configure custom debug speed --- platform.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/platform.py b/platform.py index 47d3d56c..3edacc2b 100644 --- a/platform.py +++ b/platform.py @@ -183,17 +183,14 @@ def _add_default_debug_tools(self, board): board.manifest["debug"] = debug return board - def configure_debug_options(self, initial_debug_options, ide_data): - debug_options = deepcopy(initial_debug_options) - adapter_speed = initial_debug_options.get("speed") - if adapter_speed: - server_options = debug_options.get("server") or {} - server_executable = server_options.get("executable", "").lower() + def configure_debug_session(self, debug_config): + if debug_config.speed: + server_executable = (debug_config.server or {}).get("executable", "").lower() if "openocd" in server_executable: - debug_options["server"]["arguments"].extend( - ["-c", "adapter speed %s" % adapter_speed] + debug_config.server["arguments"].extend( + ["-c", "adapter speed %s" % debug_config.speed] ) elif "jlink" in server_executable: - debug_options["server"]["arguments"].extend(["-speed", adapter_speed]) - - return debug_options + debug_config.server["arguments"].extend( + ["-speed", debug_config.speed] + ) From f4fd6bc69f03fb9e949c09892d102da21b18eee9 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 30 May 2022 14:37:45 +0300 Subject: [PATCH 12/14] Drop support for mbed framework --- .gitmodules | 3 - builder/frameworks/mbed | 1 - examples/mbed-blink/.gitignore | 1 - examples/mbed-blink/README.md | 27 --------- examples/mbed-blink/include/README | 39 ------------ examples/mbed-blink/lib/README | 46 -------------- examples/mbed-blink/platformio.ini | 28 --------- examples/mbed-blink/src/main.cpp | 12 ---- examples/mbed-blink/test/README | 11 ---- examples/mbed-dsp/.gitignore | 1 - examples/mbed-dsp/README.md | 27 --------- examples/mbed-dsp/include/README | 39 ------------ examples/mbed-dsp/lib/README | 46 -------------- examples/mbed-dsp/platformio.ini | 28 --------- examples/mbed-dsp/src/data.cpp | 94 ----------------------------- examples/mbed-dsp/src/main.cpp | 65 -------------------- examples/mbed-dsp/test/README | 11 ---- examples/mbed-events/.gitignore | 1 - examples/mbed-events/.skiptest | 0 examples/mbed-events/README.md | 27 --------- examples/mbed-events/include/README | 39 ------------ examples/mbed-events/lib/README | 46 -------------- examples/mbed-events/platformio.ini | 30 --------- examples/mbed-events/src/main.cpp | 15 ----- examples/mbed-events/test/README | 11 ---- examples/mbed-serial/.gitignore | 1 - examples/mbed-serial/README.md | 27 --------- examples/mbed-serial/include/README | 39 ------------ examples/mbed-serial/lib/README | 46 -------------- examples/mbed-serial/platformio.ini | 28 --------- examples/mbed-serial/src/main.cpp | 10 --- examples/mbed-serial/test/README | 11 ---- platform.json | 12 +--- 33 files changed, 1 insertion(+), 821 deletions(-) delete mode 160000 builder/frameworks/mbed delete mode 100644 examples/mbed-blink/.gitignore delete mode 100644 examples/mbed-blink/README.md delete mode 100644 examples/mbed-blink/include/README delete mode 100644 examples/mbed-blink/lib/README delete mode 100644 examples/mbed-blink/platformio.ini delete mode 100644 examples/mbed-blink/src/main.cpp delete mode 100644 examples/mbed-blink/test/README delete mode 100644 examples/mbed-dsp/.gitignore delete mode 100644 examples/mbed-dsp/README.md delete mode 100644 examples/mbed-dsp/include/README delete mode 100644 examples/mbed-dsp/lib/README delete mode 100644 examples/mbed-dsp/platformio.ini delete mode 100644 examples/mbed-dsp/src/data.cpp delete mode 100644 examples/mbed-dsp/src/main.cpp delete mode 100644 examples/mbed-dsp/test/README delete mode 100644 examples/mbed-events/.gitignore delete mode 100644 examples/mbed-events/.skiptest delete mode 100644 examples/mbed-events/README.md delete mode 100644 examples/mbed-events/include/README delete mode 100644 examples/mbed-events/lib/README delete mode 100644 examples/mbed-events/platformio.ini delete mode 100644 examples/mbed-events/src/main.cpp delete mode 100644 examples/mbed-events/test/README delete mode 100644 examples/mbed-serial/.gitignore delete mode 100644 examples/mbed-serial/README.md delete mode 100644 examples/mbed-serial/include/README delete mode 100644 examples/mbed-serial/lib/README delete mode 100644 examples/mbed-serial/platformio.ini delete mode 100644 examples/mbed-serial/src/main.cpp delete mode 100644 examples/mbed-serial/test/README diff --git a/.gitmodules b/.gitmodules index ad268168..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "builder/frameworks/mbed"] - path = builder/frameworks/mbed -url=https://github.com/platformio/builder-framework-mbed.git diff --git a/builder/frameworks/mbed b/builder/frameworks/mbed deleted file mode 160000 index 9a5450ca..00000000 --- a/builder/frameworks/mbed +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9a5450cae9481fc0e1f25f5f6ff97cbd664b4292 diff --git a/examples/mbed-blink/.gitignore b/examples/mbed-blink/.gitignore deleted file mode 100644 index aeaebb2b..00000000 --- a/examples/mbed-blink/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio \ No newline at end of file diff --git a/examples/mbed-blink/README.md b/examples/mbed-blink/README.md deleted file mode 100644 index f1d4c363..00000000 --- a/examples/mbed-blink/README.md +++ /dev/null @@ -1,27 +0,0 @@ -How to build PlatformIO based project -===================================== - -1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html) -2. Download [development platform with examples](https://github.com/platformio/platform-atmelsam/archive/develop.zip) -3. Extract ZIP archive -4. Run these commands: - -```shell -# Change directory to example -$ cd platform-atmelsam/examples/mbed-blink - -# Build project -$ pio run - -# Upload firmware -$ pio run --target upload - -# Build specific environment -$ pio run -e samd21_xpro - -# Upload firmware for the specific environment -$ pio run -e samd21_xpro --target upload - -# Clean build files -$ pio run --target clean -``` diff --git a/examples/mbed-blink/include/README b/examples/mbed-blink/include/README deleted file mode 100644 index 194dcd43..00000000 --- a/examples/mbed-blink/include/README +++ /dev/null @@ -1,39 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the usual convention is to give header files names that end with `.h'. -It is most portable to use only letters, digits, dashes, and underscores in -header file names, and at most one dot. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/examples/mbed-blink/lib/README b/examples/mbed-blink/lib/README deleted file mode 100644 index 6debab1e..00000000 --- a/examples/mbed-blink/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into executable file. - -The source code of each library should be placed in a an own separate directory -("lib/your_library_name/[here are source files]"). - -For example, see a structure of the following two libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -and a contents of `src/main.c`: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -PlatformIO Library Dependency Finder will find automatically dependent -libraries scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/examples/mbed-blink/platformio.ini b/examples/mbed-blink/platformio.ini deleted file mode 100644 index 348d5c62..00000000 --- a/examples/mbed-blink/platformio.ini +++ /dev/null @@ -1,28 +0,0 @@ -; PlatformIO Project Configuration File -; -; Build options: build flags, source filter, extra scripting -; Upload options: custom port, speed and extra flags -; Library options: dependencies, extra library storages -; -; Please visit documentation for the other options and examples -; https://docs.platformio.org/page/projectconf.html - -[env:samd21_xpro] -platform = atmelsam -framework = mbed -board = samd21_xpro - -[env:saml21_xpro_b] -platform = atmelsam -framework = mbed -board = saml21_xpro_b - -[env:samr21 xpro] -platform = atmelsam -framework = mbed -board = samr21_xpro - -[env:samd21g18a] -platform = atmelsam -framework = mbed -board = samd21g18a diff --git a/examples/mbed-blink/src/main.cpp b/examples/mbed-blink/src/main.cpp deleted file mode 100644 index 8247a2e9..00000000 --- a/examples/mbed-blink/src/main.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "mbed.h" - -DigitalOut myled(LED1); - -int main() { - while(1) { - myled = 1; - wait(1); - myled = 0; - wait(1); - } -} \ No newline at end of file diff --git a/examples/mbed-blink/test/README b/examples/mbed-blink/test/README deleted file mode 100644 index df5066e6..00000000 --- a/examples/mbed-blink/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PIO Unit Testing and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PIO Unit Testing: -- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/examples/mbed-dsp/.gitignore b/examples/mbed-dsp/.gitignore deleted file mode 100644 index aeaebb2b..00000000 --- a/examples/mbed-dsp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio \ No newline at end of file diff --git a/examples/mbed-dsp/README.md b/examples/mbed-dsp/README.md deleted file mode 100644 index e201dc5e..00000000 --- a/examples/mbed-dsp/README.md +++ /dev/null @@ -1,27 +0,0 @@ -How to build PlatformIO based project -===================================== - -1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html) -2. Download [development platform with examples](https://github.com/platformio/platform-atmelsam/archive/develop.zip) -3. Extract ZIP archive -4. Run these commands: - -```shell -# Change directory to example -$ cd platform-atmelsam/examples/mbed-dsp - -# Build project -$ pio run - -# Upload firmware -$ pio run --target upload - -# Build specific environment -$ pio run -e samd21_xpro - -# Upload firmware for the specific environment -$ pio run -e samd21_xpro --target upload - -# Clean build files -$ pio run --target clean -``` diff --git a/examples/mbed-dsp/include/README b/examples/mbed-dsp/include/README deleted file mode 100644 index 194dcd43..00000000 --- a/examples/mbed-dsp/include/README +++ /dev/null @@ -1,39 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the usual convention is to give header files names that end with `.h'. -It is most portable to use only letters, digits, dashes, and underscores in -header file names, and at most one dot. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/examples/mbed-dsp/lib/README b/examples/mbed-dsp/lib/README deleted file mode 100644 index 6debab1e..00000000 --- a/examples/mbed-dsp/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into executable file. - -The source code of each library should be placed in a an own separate directory -("lib/your_library_name/[here are source files]"). - -For example, see a structure of the following two libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -and a contents of `src/main.c`: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -PlatformIO Library Dependency Finder will find automatically dependent -libraries scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/examples/mbed-dsp/platformio.ini b/examples/mbed-dsp/platformio.ini deleted file mode 100644 index 7925f215..00000000 --- a/examples/mbed-dsp/platformio.ini +++ /dev/null @@ -1,28 +0,0 @@ -; PlatformIO Project Configuration File -; -; Build options: build flags, source filter, extra scripting -; Upload options: custom port, speed and extra flags -; Library options: dependencies, extra library storages -; -; Please visit documentation for the other options and examples -; https://docs.platformio.org/page/projectconf.html - -[env:samd21_xpro] -platform = atmelsam -framework = mbed -board = samd21_xpro - -[env:saml21_xpro_b] -platform = atmelsam -framework = mbed -board = saml21_xpro_b - -[env:samr21_xpro] -platform = atmelsam -framework = mbed -board = samr21_xpro - -[env:samd21g18a] -platform = atmelsam -framework = mbed -board = samd21g18a diff --git a/examples/mbed-dsp/src/data.cpp b/examples/mbed-dsp/src/data.cpp deleted file mode 100644 index d946b36b..00000000 --- a/examples/mbed-dsp/src/data.cpp +++ /dev/null @@ -1,94 +0,0 @@ -#include "arm_math.h" - -/* ---------------------------------------------------------------------- -** Test input signal contains 1000Hz + 15000 Hz -** ------------------------------------------------------------------- */ - -float32_t testInput_f32_1kHz_15kHz[320] = -{ -+0.0000000000f, +0.5924659585f, -0.0947343455f, +0.1913417162f, +1.0000000000f, +0.4174197128f, +0.3535533906f, +1.2552931065f, -+0.8660254038f, +0.4619397663f, +1.3194792169f, +1.1827865776f, +0.5000000000f, +1.1827865776f, +1.3194792169f, +0.4619397663f, -+0.8660254038f, +1.2552931065f, +0.3535533906f, +0.4174197128f, +1.0000000000f, +0.1913417162f, -0.0947343455f, +0.5924659585f, --0.0000000000f, -0.5924659585f, +0.0947343455f, -0.1913417162f, -1.0000000000f, -0.4174197128f, -0.3535533906f, -1.2552931065f, --0.8660254038f, -0.4619397663f, -1.3194792169f, -1.1827865776f, -0.5000000000f, -1.1827865776f, -1.3194792169f, -0.4619397663f, --0.8660254038f, -1.2552931065f, -0.3535533906f, -0.4174197128f, -1.0000000000f, -0.1913417162f, +0.0947343455f, -0.5924659585f, -+0.0000000000f, +0.5924659585f, -0.0947343455f, +0.1913417162f, +1.0000000000f, +0.4174197128f, +0.3535533906f, +1.2552931065f, -+0.8660254038f, +0.4619397663f, +1.3194792169f, +1.1827865776f, +0.5000000000f, +1.1827865776f, +1.3194792169f, +0.4619397663f, -+0.8660254038f, +1.2552931065f, +0.3535533906f, +0.4174197128f, +1.0000000000f, +0.1913417162f, -0.0947343455f, +0.5924659585f, -+0.0000000000f, -0.5924659585f, +0.0947343455f, -0.1913417162f, -1.0000000000f, -0.4174197128f, -0.3535533906f, -1.2552931065f, --0.8660254038f, -0.4619397663f, -1.3194792169f, -1.1827865776f, -0.5000000000f, -1.1827865776f, -1.3194792169f, -0.4619397663f, --0.8660254038f, -1.2552931065f, -0.3535533906f, -0.4174197128f, -1.0000000000f, -0.1913417162f, +0.0947343455f, -0.5924659585f, -+0.0000000000f, +0.5924659585f, -0.0947343455f, +0.1913417162f, +1.0000000000f, +0.4174197128f, +0.3535533906f, +1.2552931065f, -+0.8660254038f, +0.4619397663f, +1.3194792169f, +1.1827865776f, +0.5000000000f, +1.1827865776f, +1.3194792169f, +0.4619397663f, -+0.8660254038f, +1.2552931065f, +0.3535533906f, +0.4174197128f, +1.0000000000f, +0.1913417162f, -0.0947343455f, +0.5924659585f, -+0.0000000000f, -0.5924659585f, +0.0947343455f, -0.1913417162f, -1.0000000000f, -0.4174197128f, -0.3535533906f, -1.2552931065f, --0.8660254038f, -0.4619397663f, -1.3194792169f, -1.1827865776f, -0.5000000000f, -1.1827865776f, -1.3194792169f, -0.4619397663f, --0.8660254038f, -1.2552931065f, -0.3535533906f, -0.4174197128f, -1.0000000000f, -0.1913417162f, +0.0947343455f, -0.5924659585f, --0.0000000000f, +0.5924659585f, -0.0947343455f, +0.1913417162f, +1.0000000000f, +0.4174197128f, +0.3535533906f, +1.2552931065f, -+0.8660254038f, +0.4619397663f, +1.3194792169f, +1.1827865776f, +0.5000000000f, +1.1827865776f, +1.3194792169f, +0.4619397663f, -+0.8660254038f, +1.2552931065f, +0.3535533906f, +0.4174197128f, +1.0000000000f, +0.1913417162f, -0.0947343455f, +0.5924659585f, --0.0000000000f, -0.5924659585f, +0.0947343455f, -0.1913417162f, -1.0000000000f, -0.4174197128f, -0.3535533906f, -1.2552931065f, --0.8660254038f, -0.4619397663f, -1.3194792169f, -1.1827865776f, -0.5000000000f, -1.1827865776f, -1.3194792169f, -0.4619397663f, --0.8660254038f, -1.2552931065f, -0.3535533906f, -0.4174197128f, -1.0000000000f, -0.1913417162f, +0.0947343455f, -0.5924659585f, -+0.0000000000f, +0.5924659585f, -0.0947343455f, +0.1913417162f, +1.0000000000f, +0.4174197128f, +0.3535533906f, +1.2552931065f, -+0.8660254038f, +0.4619397663f, +1.3194792169f, +1.1827865776f, +0.5000000000f, +1.1827865776f, +1.3194792169f, +0.4619397663f, -+0.8660254038f, +1.2552931065f, +0.3535533906f, +0.4174197128f, +1.0000000000f, +0.1913417162f, -0.0947343455f, +0.5924659585f, -+0.0000000000f, -0.5924659585f, +0.0947343455f, -0.1913417162f, -1.0000000000f, -0.4174197128f, -0.3535533906f, -1.2552931065f, --0.8660254038f, -0.4619397663f, -1.3194792169f, -1.1827865776f, -0.5000000000f, -1.1827865776f, -1.3194792169f, -0.4619397663f, --0.8660254038f, -1.2552931065f, -0.3535533906f, -0.4174197128f, -1.0000000000f, -0.1913417162f, +0.0947343455f, -0.5924659585f, --0.0000000000f, +0.5924659585f, -0.0947343455f, +0.1913417162f, +1.0000000000f, +0.4174197128f, +0.3535533906f, +1.2552931065f, -+0.8660254038f, +0.4619397663f, +1.3194792169f, +1.1827865776f, +0.5000000000f, +1.1827865776f, +1.3194792169f, +0.4619397663f, -+0.8660254038f, +1.2552931065f, +0.3535533906f, +0.4174197128f, +1.0000000000f, +0.1913417162f, -0.0947343455f, +0.5924659585f, -+0.0000000000f, -0.5924659585f, +0.0947343455f, -0.1913417162f, -1.0000000000f, -0.4174197128f, -0.3535533906f, -1.2552931065f, --0.8660254038f, -0.4619397663f, -1.3194792169f, -1.1827865776f, -0.5000000000f, -1.1827865776f, -1.3194792169f, -0.4619397663f, --0.8660254038f, -1.2552931065f, -0.3535533906f, -0.4174197128f, -1.0000000000f, -0.1913417162f, +0.0947343455f, -0.5924659585f, --0.0000000000f, +0.5924659585f, -0.0947343455f, +0.1913417162f, +1.0000000000f, +0.4174197128f, +0.3535533906f, +1.2552931065f, -+0.8660254038f, +0.4619397663f, +1.3194792169f, +1.1827865776f, +0.5000000000f, +1.1827865776f, +1.3194792169f, +0.4619397663f, -+0.8660254038f, +1.2552931065f, +0.3535533906f, +0.4174197128f, +1.0000000000f, +0.1913417162f, -0.0947343455f, +0.5924659585f, -+0.0000000000f, -0.5924659585f, +0.0947343455f, -0.1913417162f, -1.0000000000f, -0.4174197128f, -0.3535533906f, -1.2552931065f, -}; - -float32_t refOutput[320] = -{ -+0.0000000000f, -0.0010797829f, -0.0007681386f, -0.0001982932f, +0.0000644313f, +0.0020854271f, +0.0036891871f, +0.0015855941f, --0.0026280805f, -0.0075907658f, -0.0119390538f, -0.0086665968f, +0.0088981202f, +0.0430539279f, +0.0974468742f, +0.1740405600f, -+0.2681416601f, +0.3747720089f, +0.4893362230f, +0.6024154672f, +0.7058740791f, +0.7968348987f, +0.8715901940f, +0.9277881093f, -+0.9682182661f, +0.9934674267f, +1.0012052245f, +0.9925859371f, +0.9681538347f, +0.9257026822f, +0.8679010068f, +0.7952493046f, -+0.7085021596f, +0.6100062330f, +0.5012752767f, +0.3834386057f, +0.2592435399f, +0.1309866321f, -0.0000000000f, -0.1309866321f, --0.2592435399f, -0.3834386057f, -0.5012752767f, -0.6100062330f, -0.7085021596f, -0.7952493046f, -0.8679010068f, -0.9257026822f, --0.9681538347f, -0.9936657199f, -1.0019733630f, -0.9936657199f, -0.9681538347f, -0.9257026822f, -0.8679010068f, -0.7952493046f, --0.7085021596f, -0.6100062330f, -0.5012752767f, -0.3834386057f, -0.2592435399f, -0.1309866321f, +0.0000000000f, +0.1309866321f, -+0.2592435399f, +0.3834386057f, +0.5012752767f, +0.6100062330f, +0.7085021596f, +0.7952493046f, +0.8679010068f, +0.9257026822f, -+0.9681538347f, +0.9936657199f, +1.0019733630f, +0.9936657199f, +0.9681538347f, +0.9257026822f, +0.8679010068f, +0.7952493046f, -+0.7085021596f, +0.6100062330f, +0.5012752767f, +0.3834386057f, +0.2592435399f, +0.1309866321f, -0.0000000000f, -0.1309866321f, --0.2592435399f, -0.3834386057f, -0.5012752767f, -0.6100062330f, -0.7085021596f, -0.7952493046f, -0.8679010068f, -0.9257026822f, --0.9681538347f, -0.9936657199f, -1.0019733630f, -0.9936657199f, -0.9681538347f, -0.9257026822f, -0.8679010068f, -0.7952493046f, --0.7085021596f, -0.6100062330f, -0.5012752767f, -0.3834386057f, -0.2592435399f, -0.1309866321f, +0.0000000000f, +0.1309866321f, -+0.2592435399f, +0.3834386057f, +0.5012752767f, +0.6100062330f, +0.7085021596f, +0.7952493046f, +0.8679010068f, +0.9257026822f, -+0.9681538347f, +0.9936657199f, +1.0019733630f, +0.9936657199f, +0.9681538347f, +0.9257026822f, +0.8679010068f, +0.7952493046f, -+0.7085021596f, +0.6100062330f, +0.5012752767f, +0.3834386057f, +0.2592435399f, +0.1309866321f, -0.0000000000f, -0.1309866321f, --0.2592435399f, -0.3834386057f, -0.5012752767f, -0.6100062330f, -0.7085021596f, -0.7952493046f, -0.8679010068f, -0.9257026822f, --0.9681538347f, -0.9936657199f, -1.0019733630f, -0.9936657199f, -0.9681538347f, -0.9257026822f, -0.8679010068f, -0.7952493046f, --0.7085021596f, -0.6100062330f, -0.5012752767f, -0.3834386057f, -0.2592435399f, -0.1309866321f, +0.0000000000f, +0.1309866321f, -+0.2592435399f, +0.3834386057f, +0.5012752767f, +0.6100062330f, +0.7085021596f, +0.7952493046f, +0.8679010068f, +0.9257026822f, -+0.9681538347f, +0.9936657199f, +1.0019733630f, +0.9936657199f, +0.9681538347f, +0.9257026822f, +0.8679010068f, +0.7952493046f, -+0.7085021596f, +0.6100062330f, +0.5012752767f, +0.3834386057f, +0.2592435399f, +0.1309866321f, +0.0000000000f, -0.1309866321f, --0.2592435399f, -0.3834386057f, -0.5012752767f, -0.6100062330f, -0.7085021596f, -0.7952493046f, -0.8679010068f, -0.9257026822f, --0.9681538347f, -0.9936657199f, -1.0019733630f, -0.9936657199f, -0.9681538347f, -0.9257026822f, -0.8679010068f, -0.7952493046f, --0.7085021596f, -0.6100062330f, -0.5012752767f, -0.3834386057f, -0.2592435399f, -0.1309866321f, +0.0000000000f, +0.1309866321f, -+0.2592435399f, +0.3834386057f, +0.5012752767f, +0.6100062330f, +0.7085021596f, +0.7952493046f, +0.8679010068f, +0.9257026822f, -+0.9681538347f, +0.9936657199f, +1.0019733630f, +0.9936657199f, +0.9681538347f, +0.9257026822f, +0.8679010068f, +0.7952493046f, -+0.7085021596f, +0.6100062330f, +0.5012752767f, +0.3834386057f, +0.2592435399f, +0.1309866321f, +0.0000000000f, -0.1309866321f, --0.2592435399f, -0.3834386057f, -0.5012752767f, -0.6100062330f, -0.7085021596f, -0.7952493046f, -0.8679010068f, -0.9257026822f, --0.9681538347f, -0.9936657199f, -1.0019733630f, -0.9936657199f, -0.9681538347f, -0.9257026822f, -0.8679010068f, -0.7952493046f, --0.7085021596f, -0.6100062330f, -0.5012752767f, -0.3834386057f, -0.2592435399f, -0.1309866321f, -0.0000000000f, +0.1309866321f, -+0.2592435399f, +0.3834386057f, +0.5012752767f, +0.6100062330f, +0.7085021596f, +0.7952493046f, +0.8679010068f, +0.9257026822f, -+0.9681538347f, +0.9936657199f, +1.0019733630f, +0.9936657199f, +0.9681538347f, +0.9257026822f, +0.8679010068f, +0.7952493046f, -+0.7085021596f, +0.6100062330f, +0.5012752767f, +0.3834386057f, +0.2592435399f, +0.1309866321f, +0.0000000000f, -0.1309866321f, --0.2592435399f, -0.3834386057f, -0.5012752767f, -0.6100062330f, -0.7085021596f, -0.7952493046f, -0.8679010068f, -0.9257026822f, --0.9681538347f, -0.9936657199f, -1.0019733630f, -0.9936657199f, -0.9681538347f, -0.9257026822f, -0.8679010068f, -0.7952493046f, --0.7085021596f, -0.6100062330f, -0.5012752767f, -0.3834386057f, -0.2592435399f, -0.1309866321f, +0.0000000000f, +0.1309866321f, -+0.2592435399f, +0.3834386057f, +0.5012752767f, +0.6100062330f, +0.7085021596f, +0.7952493046f, +0.8679010068f, +0.9257026822f, -+0.9681538347f, +0.9936657199f, +1.0019733630f, +0.9936657199f, +0.9681538347f, +0.9257026822f, +0.8679010068f, +0.7952493046f -}; - diff --git a/examples/mbed-dsp/src/main.cpp b/examples/mbed-dsp/src/main.cpp deleted file mode 100644 index f6bdb4b7..00000000 --- a/examples/mbed-dsp/src/main.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "arm_math.h" -#include "math_helper.h" -#include - -#define BLOCK_SIZE 32 -#define NUM_BLOCKS 10 - -#define TEST_LENGTH_SAMPLES (BLOCK_SIZE * NUM_BLOCKS) - -#define SNR_THRESHOLD_F32 140.0f -#define NUM_TAPS 29 - -/* ------------------------------------------------------------------- - * The input signal and reference output (computed with MATLAB) - * are defined externally in arm_fir_lpf_data.c. - * ------------------------------------------------------------------- */ -extern float32_t testInput_f32_1kHz_15kHz[TEST_LENGTH_SAMPLES]; -extern float32_t refOutput[TEST_LENGTH_SAMPLES]; - -/* ------------------------------------------------------------------- - * Declare State buffer of size (numTaps + blockSize - 1) - * ------------------------------------------------------------------- */ -static float32_t firStateF32[BLOCK_SIZE + NUM_TAPS - 1]; - -/* ---------------------------------------------------------------------- - * FIR Coefficients buffer generated using fir1() MATLAB function. - * fir1(28, 6/24) - * ------------------------------------------------------------------- */ -const float32_t firCoeffs32[NUM_TAPS] = { - -0.0018225230f, -0.0015879294f, +0.0000000000f, +0.0036977508f, +0.0080754303f, - +0.0085302217f, -0.0000000000f, -0.0173976984f, -0.0341458607f, -0.0333591565f, - +0.0000000000f, +0.0676308395f, +0.1522061835f, +0.2229246956f, +0.2504960933f, - +0.2229246956f, +0.1522061835f, +0.0676308395f, +0.0000000000f, -0.0333591565f, - -0.0341458607f, -0.0173976984f, -0.0000000000f, +0.0085302217f, +0.0080754303f, - +0.0036977508f, +0.0000000000f, -0.0015879294f, -0.0018225230f -}; - -/* ---------------------------------------------------------------------- - * FIR LPF Example - * ------------------------------------------------------------------- */ -int main(void) { - /* Call FIR init function to initialize the instance structure. */ - arm_fir_instance_f32 S; - arm_fir_init_f32(&S, NUM_TAPS, (float32_t *)&firCoeffs32[0], &firStateF32[0], BLOCK_SIZE); - - /* ---------------------------------------------------------------------- - * Call the FIR process function for every blockSize samples - * ------------------------------------------------------------------- */ - for (uint32_t i=0; i < NUM_BLOCKS; i++) { - float32_t* signal = testInput_f32_1kHz_15kHz + (i * BLOCK_SIZE); - arm_fir_f32(&S, signal, signal, BLOCK_SIZE); - } - - /* ---------------------------------------------------------------------- - * Compare the generated output against the reference output computed - * in MATLAB. - * ------------------------------------------------------------------- */ - float32_t snr = arm_snr_f32(refOutput, testInput_f32_1kHz_15kHz, TEST_LENGTH_SAMPLES); - printf("snr: %f\n\r", snr); - if (snr < SNR_THRESHOLD_F32) { - printf("Failed\n\r"); - } else { - printf("Success\n\r"); - } -} diff --git a/examples/mbed-dsp/test/README b/examples/mbed-dsp/test/README deleted file mode 100644 index df5066e6..00000000 --- a/examples/mbed-dsp/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PIO Unit Testing and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PIO Unit Testing: -- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/examples/mbed-events/.gitignore b/examples/mbed-events/.gitignore deleted file mode 100644 index aeaebb2b..00000000 --- a/examples/mbed-events/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio \ No newline at end of file diff --git a/examples/mbed-events/.skiptest b/examples/mbed-events/.skiptest deleted file mode 100644 index e69de29b..00000000 diff --git a/examples/mbed-events/README.md b/examples/mbed-events/README.md deleted file mode 100644 index 41116637..00000000 --- a/examples/mbed-events/README.md +++ /dev/null @@ -1,27 +0,0 @@ -How to build PlatformIO based project -===================================== - -1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html) -2. Download [development platform with examples](https://github.com/platformio/platform-atmelsam/archive/develop.zip) -3. Extract ZIP archive -4. Run these commands: - -```shell -# Change directory to example -$ cd platform-atmelsam/examples/mbed-events - -# Build project -$ pio run - -# Upload firmware -$ pio run --target upload - -# Build specific environment -$ pio run -e samd21_xpro - -# Upload firmware for the specific environment -$ pio run -e samd21_xpro --target upload - -# Clean build files -$ pio run --target clean -``` diff --git a/examples/mbed-events/include/README b/examples/mbed-events/include/README deleted file mode 100644 index 194dcd43..00000000 --- a/examples/mbed-events/include/README +++ /dev/null @@ -1,39 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the usual convention is to give header files names that end with `.h'. -It is most portable to use only letters, digits, dashes, and underscores in -header file names, and at most one dot. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/examples/mbed-events/lib/README b/examples/mbed-events/lib/README deleted file mode 100644 index 6debab1e..00000000 --- a/examples/mbed-events/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into executable file. - -The source code of each library should be placed in a an own separate directory -("lib/your_library_name/[here are source files]"). - -For example, see a structure of the following two libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -and a contents of `src/main.c`: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -PlatformIO Library Dependency Finder will find automatically dependent -libraries scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/examples/mbed-events/platformio.ini b/examples/mbed-events/platformio.ini deleted file mode 100644 index b6944d6f..00000000 --- a/examples/mbed-events/platformio.ini +++ /dev/null @@ -1,30 +0,0 @@ -; PlatformIO Project Configuration File -; -; Build options: build flags, source filter, extra scripting -; Upload options: custom port, speed and extra flags -; Library options: dependencies, extra library storages -; -; Please visit documentation for the other options and examples -; https://docs.platformio.org/page/projectconf.html - -[env:samd21_xpro] -platform = atmelsam -framework = mbed -board = samd21_xpro - -[env:saml21_xpro_b] -platform = atmelsam -framework = mbed -board = saml21_xpro_b - -[env:samr21_xpro] -platform = atmelsam -framework = mbed -board = samr21_xpro -build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT - -[env:samd21g18a] -platform = atmelsam -framework = mbed -board = samd21g18a -build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT diff --git a/examples/mbed-events/src/main.cpp b/examples/mbed-events/src/main.cpp deleted file mode 100644 index 8762cd47..00000000 --- a/examples/mbed-events/src/main.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "mbed_events.h" -#include - -int main() { - // creates a queue with the default size - EventQueue queue; - - // events are simple callbacks - queue.call(printf, "called immediately\n"); - queue.call_in(2000, printf, "called in 2 seconds\n"); - queue.call_every(1000, printf, "called every 1 seconds\n"); - - // events are executed by the dispatch method - queue.dispatch(); -} diff --git a/examples/mbed-events/test/README b/examples/mbed-events/test/README deleted file mode 100644 index df5066e6..00000000 --- a/examples/mbed-events/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PIO Unit Testing and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PIO Unit Testing: -- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/examples/mbed-serial/.gitignore b/examples/mbed-serial/.gitignore deleted file mode 100644 index aeaebb2b..00000000 --- a/examples/mbed-serial/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio \ No newline at end of file diff --git a/examples/mbed-serial/README.md b/examples/mbed-serial/README.md deleted file mode 100644 index ed542016..00000000 --- a/examples/mbed-serial/README.md +++ /dev/null @@ -1,27 +0,0 @@ -How to build PlatformIO based project -===================================== - -1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html) -2. Download [development platform with examples](https://github.com/platformio/platform-atmelsam/archive/develop.zip) -3. Extract ZIP archive -4. Run these commands: - -```shell -# Change directory to example -$ cd platform-atmelsam/examples/mbed-serial - -# Build project -$ pio run - -# Upload firmware -$ pio run --target upload - -# Build specific environment -$ pio run -e samd21_xpro - -# Upload firmware for the specific environment -$ pio run -e samd21_xpro --target upload - -# Clean build files -$ pio run --target clean -``` diff --git a/examples/mbed-serial/include/README b/examples/mbed-serial/include/README deleted file mode 100644 index 194dcd43..00000000 --- a/examples/mbed-serial/include/README +++ /dev/null @@ -1,39 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the usual convention is to give header files names that end with `.h'. -It is most portable to use only letters, digits, dashes, and underscores in -header file names, and at most one dot. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/examples/mbed-serial/lib/README b/examples/mbed-serial/lib/README deleted file mode 100644 index 6debab1e..00000000 --- a/examples/mbed-serial/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into executable file. - -The source code of each library should be placed in a an own separate directory -("lib/your_library_name/[here are source files]"). - -For example, see a structure of the following two libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -and a contents of `src/main.c`: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -PlatformIO Library Dependency Finder will find automatically dependent -libraries scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/examples/mbed-serial/platformio.ini b/examples/mbed-serial/platformio.ini deleted file mode 100644 index 7925f215..00000000 --- a/examples/mbed-serial/platformio.ini +++ /dev/null @@ -1,28 +0,0 @@ -; PlatformIO Project Configuration File -; -; Build options: build flags, source filter, extra scripting -; Upload options: custom port, speed and extra flags -; Library options: dependencies, extra library storages -; -; Please visit documentation for the other options and examples -; https://docs.platformio.org/page/projectconf.html - -[env:samd21_xpro] -platform = atmelsam -framework = mbed -board = samd21_xpro - -[env:saml21_xpro_b] -platform = atmelsam -framework = mbed -board = saml21_xpro_b - -[env:samr21_xpro] -platform = atmelsam -framework = mbed -board = samr21_xpro - -[env:samd21g18a] -platform = atmelsam -framework = mbed -board = samd21g18a diff --git a/examples/mbed-serial/src/main.cpp b/examples/mbed-serial/src/main.cpp deleted file mode 100644 index 132ba174..00000000 --- a/examples/mbed-serial/src/main.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "mbed.h" - -Serial pc(USBTX, USBRX); // tx, rx - -int main() { - pc.printf("Hello World!\n\r"); - while(1) { - pc.putc(pc.getc() + 1); // echo input back to terminal - } -} \ No newline at end of file diff --git a/examples/mbed-serial/test/README b/examples/mbed-serial/test/README deleted file mode 100644 index df5066e6..00000000 --- a/examples/mbed-serial/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PIO Unit Testing and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PIO Unit Testing: -- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/platform.json b/platform.json index f3a20122..e2e8bf3a 100644 --- a/platform.json +++ b/platform.json @@ -20,16 +20,12 @@ "type": "git", "url": "https://github.com/platformio/platform-atmelsam.git" }, - "version": "7.1.0", + "version": "8.0.0-beta.1", "frameworks": { "arduino": { "package": "framework-arduino-sam", "script": "builder/frameworks/arduino.py" }, - "mbed": { - "package": "framework-mbed", - "script": "builder/frameworks/mbed/mbed.py" - }, "zephyr": { "package": "framework-zephyr", "script": "builder/frameworks/zephyr.py" @@ -125,12 +121,6 @@ "owner": "meteca", "version": ">=2.1.1" }, - "framework-mbed": { - "type": "framework", - "optional": true, - "owner": "platformio", - "version": "~4.151.0" - }, "framework-zephyr": { "type": "framework", "optional": true, From a6b22ed76e00d88b931a106fea472d82f1db54c6 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 30 May 2022 15:05:01 +0300 Subject: [PATCH 13/14] Drop support for mbed framework (cleanup) --- .github/workflows/examples.yml | 3 --- boards/samd21_xpro.json | 3 +-- boards/samd21g18a.json | 5 ++--- boards/saml21_xpro_b.json | 33 --------------------------------- boards/samr21_xpro.json | 3 +-- platform.py | 4 ---- 6 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 boards/saml21_xpro_b.json diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index d3ca3d39..317a4e27 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -14,9 +14,6 @@ jobs: - "examples/arduino-external-libs" - "examples/arduino-internal-libs" - "examples/arduino-web-thing-led" - - "examples/mbed-blink" - - "examples/mbed-dsp" - - "examples/mbed-serial" - "examples/zephyr-blink" - "examples/zephyr-drivers-lcd-hd44780" - "examples/zephyr-subsys-logger" diff --git a/boards/samd21_xpro.json b/boards/samd21_xpro.json index 75195ac0..4fd36de2 100644 --- a/boards/samd21_xpro.json +++ b/boards/samd21_xpro.json @@ -17,7 +17,6 @@ "svd_path": "ATSAMD21J18A.svd" }, "frameworks": [ - "mbed", "zephyr" ], "name": "Atmel SAMD21-XPRO", @@ -32,6 +31,6 @@ "atmel-ice" ] }, - "url": "https://developer.mbed.org/platforms/SAMD21-XPRO/", + "url": "https://www.microchip.com/en-us/development-tool/atsamd21-xpro", "vendor": "Atmel" } diff --git a/boards/samd21g18a.json b/boards/samd21g18a.json index c6d4fd76..8e475c24 100644 --- a/boards/samd21g18a.json +++ b/boards/samd21g18a.json @@ -30,8 +30,7 @@ "svd_path": "ATSAMD21G18A.svd" }, "frameworks": [ - "arduino", - "mbed" + "arduino" ], "name": "Atmel ATSAMW25-XPRO", "upload": { @@ -45,6 +44,6 @@ "atmel-ice" ] }, - "url": "https://developer.mbed.org/platforms/SAMW25-XPRO/", + "url": "https://www.microchip.com/en-us/development-tool/atsamw25-xpro", "vendor": "Atmel" } diff --git a/boards/saml21_xpro_b.json b/boards/saml21_xpro_b.json deleted file mode 100644 index 887e0e6c..00000000 --- a/boards/saml21_xpro_b.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "build": { - "cpu": "cortex-m0plus", - "f_cpu": "48000000L", - "mcu": "saml21j18b" - }, - "debug": { - "jlink_device": "ATSAML21J18", - "onboard_tools": [ - "cmsis-dap" - ], - "openocd_chipname": "at91saml21j18", - "openocd_target": "at91samdXX", - "svd_path": "ATSAML21J18B.svd" - }, - "frameworks": [ - "mbed" - ], - "name": "Atmel SAML21-XPRO-B", - "upload": { - "maximum_ram_size": 32768, - "maximum_size": 262144, - "protocol": "cmsis-dap", - "protocols": [ - "cmsis-dap", - "blackmagic", - "jlink", - "atmel-ice" - ] - }, - "url": "https://developer.mbed.org/platforms/SAML21-XPRO/", - "vendor": "Atmel" -} diff --git a/boards/samr21_xpro.json b/boards/samr21_xpro.json index 656c5fe6..a092ee62 100644 --- a/boards/samr21_xpro.json +++ b/boards/samr21_xpro.json @@ -17,7 +17,6 @@ "svd_path": "ATSAMR21G18A.svd" }, "frameworks": [ - "mbed", "zephyr" ], "name": "Atmel ATSAMR21-XPRO", @@ -32,6 +31,6 @@ "atmel-ice" ] }, - "url": "https://developer.mbed.org/platforms/SAMR21-XPRO/", + "url": "https://www.microchip.com/en-us/development-tool/ATSAMR21-XPRO", "vendor": "Atmel" } diff --git a/platform.py b/platform.py index 3edacc2b..98459e33 100644 --- a/platform.py +++ b/platform.py @@ -76,10 +76,6 @@ def configure_default_packages(self, variables, targets): if build_core in ("adafruit", "seeed"): self.packages["framework-cmsis"]["version"] = "~2.50400.0" - if "mbed" in variables.get("pioframework", []): - self.packages["toolchain-gccarmnoneeabi"][ - "version" - ] = ">=1.60301.0,<1.80000.0" if ( board.get("build.core", "") in ("adafruit", "seeed", "sparkfun") and "tool-bossac" in self.packages From 491af82316ab065a2115e01962b8c8a38396c8ba Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Mon, 30 May 2022 18:26:40 +0300 Subject: [PATCH 14/14] Bump version to 8.0.0 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index e2e8bf3a..187dffab 100644 --- a/platform.json +++ b/platform.json @@ -20,7 +20,7 @@ "type": "git", "url": "https://github.com/platformio/platform-atmelsam.git" }, - "version": "8.0.0-beta.1", + "version": "8.0.0", "frameworks": { "arduino": { "package": "framework-arduino-sam",