Add compatibility with PIO Core 6.0
This commit is contained in:
parent
6caac4d451
commit
c97b377c3e
12
.github/workflows/examples.yml
vendored
12
.github/workflows/examples.yml
vendored
@ -8,24 +8,22 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, windows-latest, macos-latest]
|
os: [ubuntu-latest, windows-latest, macos-latest]
|
||||||
python-version: [3.7]
|
|
||||||
example:
|
example:
|
||||||
- "examples/arduino-blink"
|
- "examples/arduino-blink"
|
||||||
- "examples/arduino-external-libs"
|
- "examples/arduino-external-libs"
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
submodules: "recursive"
|
submodules: "recursive"
|
||||||
- name: Set up Python ${{ matrix.python-version }}
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v1
|
uses: actions/setup-python@v3
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: "3.9"
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install -U https://github.com/platformio/platformio/archive/develop.zip
|
pip install -U https://github.com/platformio/platformio/archive/develop.zip
|
||||||
pio pkg install --global --platform symlink://.
|
pio pkg install --global --platform symlink://.
|
||||||
- name: Build examples
|
- name: Build examples
|
||||||
run: |
|
run: |
|
||||||
platformio run -d ${{ matrix.example }}
|
pio run -d ${{ matrix.example }}
|
||||||
|
@ -9,7 +9,7 @@ RP2040 is a low-cost, high-performance microcontroller device with a large on-ch
|
|||||||
|
|
||||||
# Usage
|
# 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:
|
2. Create PlatformIO project and configure a platform option in [platformio.ini](https://docs.platformio.org/page/projectconf.html) file:
|
||||||
|
|
||||||
## Stable version
|
## Stable version
|
||||||
|
@ -17,7 +17,7 @@ from platform import system
|
|||||||
from os import makedirs
|
from os import makedirs
|
||||||
from os.path import isdir, join
|
from os.path import isdir, join
|
||||||
|
|
||||||
from platformio.util import get_serial_ports
|
from platformio.public import list_serial_ports
|
||||||
|
|
||||||
from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild,
|
from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild,
|
||||||
Builder, Default, DefaultEnvironment)
|
Builder, Default, DefaultEnvironment)
|
||||||
@ -29,7 +29,7 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
|
|||||||
upload_options = env.BoardConfig().get("upload", {})
|
upload_options = env.BoardConfig().get("upload", {})
|
||||||
|
|
||||||
env.AutodetectUploadPort()
|
env.AutodetectUploadPort()
|
||||||
before_ports = get_serial_ports()
|
before_ports = list_serial_ports()
|
||||||
|
|
||||||
if upload_options.get("use_1200bps_touch", False):
|
if upload_options.get("use_1200bps_touch", False):
|
||||||
env.TouchSerialPort("$UPLOAD_PORT", 1200)
|
env.TouchSerialPort("$UPLOAD_PORT", 1200)
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
"RP2040"
|
"RP2040"
|
||||||
],
|
],
|
||||||
"engines": {
|
"engines": {
|
||||||
"platformio": "^5"
|
"platformio": "^6"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
import platform
|
import platform
|
||||||
|
|
||||||
from platformio.managers.platform import PlatformBase
|
from platformio.public import PlatformBase
|
||||||
|
|
||||||
|
|
||||||
class RaspberrypiPlatform(PlatformBase):
|
class RaspberrypiPlatform(PlatformBase):
|
||||||
@ -38,16 +38,16 @@ class RaspberrypiPlatform(PlatformBase):
|
|||||||
if not any(jlink_conds) and jlink_pkgname in self.packages:
|
if not any(jlink_conds) and jlink_pkgname in self.packages:
|
||||||
del self.packages[jlink_pkgname]
|
del self.packages[jlink_pkgname]
|
||||||
|
|
||||||
return PlatformBase.configure_default_packages(self, variables, targets)
|
return super().configure_default_packages(variables, targets)
|
||||||
|
|
||||||
def get_boards(self, id_=None):
|
def get_boards(self, id_=None):
|
||||||
result = PlatformBase.get_boards(self, id_)
|
result = super().get_boards(id_)
|
||||||
if not result:
|
if not result:
|
||||||
return result
|
return result
|
||||||
if id_:
|
if id_:
|
||||||
return self._add_default_debug_tools(result)
|
return self._add_default_debug_tools(result)
|
||||||
else:
|
else:
|
||||||
for key, value in result.items():
|
for key in result:
|
||||||
result[key] = self._add_default_debug_tools(result[key])
|
result[key] = self._add_default_debug_tools(result[key])
|
||||||
return result
|
return result
|
||||||
|
|
||||||
@ -101,7 +101,6 @@ class RaspberrypiPlatform(PlatformBase):
|
|||||||
|
|
||||||
def configure_debug_session(self, debug_config):
|
def configure_debug_session(self, debug_config):
|
||||||
adapter_speed = debug_config.speed or "5000"
|
adapter_speed = debug_config.speed or "5000"
|
||||||
|
|
||||||
server_options = debug_config.server or {}
|
server_options = debug_config.server or {}
|
||||||
server_arguments = server_options.get("arguments", [])
|
server_arguments = server_options.get("arguments", [])
|
||||||
if "interface/cmsis-dap.cfg" in server_arguments:
|
if "interface/cmsis-dap.cfg" in server_arguments:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user