From 9811f13f6620d02977ca2bad9694dbf66aa77fa9 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Dec 2021 16:02:30 +0100 Subject: [PATCH] Merge upstream --- .github/workflows/examples.yml | 2 +- builder/frameworks/arduino/mbed-core | 2 +- builder/main.py | 4 +-- examples/arduino-blink/README.md | 21 +++++++++++++ examples/arduino-blink/README.rst | 32 ------------------- examples/arduino-external-libs/README.md | 27 ++++++++++++++++ examples/arduino-external-libs/README.rst | 38 ----------------------- platform.json | 4 +-- 8 files changed, 54 insertions(+), 76 deletions(-) create mode 100644 examples/arduino-blink/README.md delete mode 100644 examples/arduino-blink/README.rst create mode 100644 examples/arduino-external-libs/README.md delete mode 100644 examples/arduino-external-libs/README.rst diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 94e8130..9d03bd2 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-16.04, windows-latest, macos-latest] + os: [ubuntu-18.04, windows-latest, macos-latest] python-version: [3.7] example: - "examples/arduino-blink" diff --git a/builder/frameworks/arduino/mbed-core b/builder/frameworks/arduino/mbed-core index ceb4f60..36ee4ff 160000 --- a/builder/frameworks/arduino/mbed-core +++ b/builder/frameworks/arduino/mbed-core @@ -1 +1 @@ -Subproject commit ceb4f608f9b4834ac4fa5472e1db2a2c2f9d216e +Subproject commit 36ee4ff8adb0d80d6ff15e03b34e7b10a147b4d0 diff --git a/builder/main.py b/builder/main.py index 7cf8a7f..c3550af 100644 --- a/builder/main.py +++ b/builder/main.py @@ -284,9 +284,9 @@ if upload_protocol == "mbed": ] elif upload_protocol == "picotool": env.Replace( - UPLOADER='"%s"' % join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"), + UPLOADER=join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"), UPLOADERFLAGS=["-v", "-D"], - UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES" + UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES' ) if "uploadfs" in COMMAND_LINE_TARGETS: diff --git a/examples/arduino-blink/README.md b/examples/arduino-blink/README.md new file mode 100644 index 0000000..1e354e0 --- /dev/null +++ b/examples/arduino-blink/README.md @@ -0,0 +1,21 @@ +How to build PlatformIO based project +===================================== + +1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html) +2. Download [development platform with examples](https://github.com/platformio/platform-raspberrypi/archive/develop.zip) +3. Extract ZIP archive +4. Run these commands: + +```shell +# Change directory to example +$ cd platform-raspberrypi/examples/arduino-blink + +# Build project +$ pio run + +# Upload firmware +$ pio run --target upload + +# Clean build files +$ pio run --target clean +``` diff --git a/examples/arduino-blink/README.rst b/examples/arduino-blink/README.rst deleted file mode 100644 index e84aaaf..0000000 --- a/examples/arduino-blink/README.rst +++ /dev/null @@ -1,32 +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. - -How to build PlatformIO based project -===================================== - -1. `Install PlatformIO Core `_ -2. Download `development platform with examples `_ -3. Extract ZIP archive -4. Run these commands: - -.. code-block:: bash - - # Change directory to example - > cd platform-raspberrypi/examples/arduino-blink - - # Build project - > platformio run - - # Upload firmware - > platformio run --target upload - - # Clean build files - > platformio run --target clean diff --git a/examples/arduino-external-libs/README.md b/examples/arduino-external-libs/README.md new file mode 100644 index 0000000..8aa6a5f --- /dev/null +++ b/examples/arduino-external-libs/README.md @@ -0,0 +1,27 @@ +How to build PlatformIO based project +===================================== + +1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html) +2. Download [development platform with examples](https://github.com/platformio/platform-raspberrypi/archive/develop.zip) +3. Extract ZIP archive +4. Run these commands: + +```shell +# Change directory to example +$ cd platform-raspberrypi/examples/arduino-external-libs + +# Build project +$ pio run + +# Upload firmware +$ pio run --target upload + +# Build specific environment +$ pio run -e pico + +# Upload firmware for the specific environment +$ pio run -e pico --target upload + +# Clean build files +$ pio run --target clean +``` diff --git a/examples/arduino-external-libs/README.rst b/examples/arduino-external-libs/README.rst deleted file mode 100644 index 0207a56..0000000 --- a/examples/arduino-external-libs/README.rst +++ /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. - -How to build PlatformIO based project -===================================== - -1. `Install PlatformIO Core `_ -2. Download `development platform with examples `_ -3. Extract ZIP archive -4. Run these commands: - -.. code-block:: bash - - # Change directory to example - > cd platform-raspberrypi/examples/arduino-external-libs - - # Build project - > platformio run - - # Upload firmware - > platformio run --target upload - - # Build specific environment - > platformio run -e pico - - # Upload firmware for the specific environment - > platformio run -e pico --target upload - - # Clean build files - > platformio run --target clean diff --git a/platform.json b/platform.json index 3085d95..baf9865 100644 --- a/platform.json +++ b/platform.json @@ -18,7 +18,7 @@ "type": "git", "url": "https://github.com/platformio/platform-raspberrypi.git" }, - "version": "1.2.0", + "version": "1.5.0", "frameworks": { "arduino": { "package": "framework-arduino-mbed", @@ -41,7 +41,7 @@ "type": "framework", "optional": true, "owner": "platformio", - "version": "~2.4.0" + "version": "~2.6.0" }, "framework-arduinopico": { "type": "framework",