Merge upstream

This commit is contained in:
unknown 2021-12-29 16:02:30 +01:00
parent 673d327f62
commit 9811f13f66
8 changed files with 54 additions and 76 deletions

View File

@ -7,7 +7,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-16.04, windows-latest, macos-latest] os: [ubuntu-18.04, windows-latest, macos-latest]
python-version: [3.7] python-version: [3.7]
example: example:
- "examples/arduino-blink" - "examples/arduino-blink"

@ -1 +1 @@
Subproject commit ceb4f608f9b4834ac4fa5472e1db2a2c2f9d216e Subproject commit 36ee4ff8adb0d80d6ff15e03b34e7b10a147b4d0

View File

@ -284,9 +284,9 @@ if upload_protocol == "mbed":
] ]
elif upload_protocol == "picotool": elif upload_protocol == "picotool":
env.Replace( 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"], UPLOADERFLAGS=["-v", "-D"],
UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES" UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'
) )
if "uploadfs" in COMMAND_LINE_TARGETS: if "uploadfs" in COMMAND_LINE_TARGETS:

View File

@ -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
```

View File

@ -1,32 +0,0 @@
.. Copyright 2014-present PlatformIO <contact@platformio.org>
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 <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:
.. 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

View File

@ -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
```

View File

@ -1,38 +0,0 @@
.. Copyright 2014-present PlatformIO <contact@platformio.org>
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 <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:
.. 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

View File

@ -18,7 +18,7 @@
"type": "git", "type": "git",
"url": "https://github.com/platformio/platform-raspberrypi.git" "url": "https://github.com/platformio/platform-raspberrypi.git"
}, },
"version": "1.2.0", "version": "1.5.0",
"frameworks": { "frameworks": {
"arduino": { "arduino": {
"package": "framework-arduino-mbed", "package": "framework-arduino-mbed",
@ -41,7 +41,7 @@
"type": "framework", "type": "framework",
"optional": true, "optional": true,
"owner": "platformio", "owner": "platformio",
"version": "~2.4.0" "version": "~2.6.0"
}, },
"framework-arduinopico": { "framework-arduinopico": {
"type": "framework", "type": "framework",