Skip to content

Commit

Permalink
Merge branch 'release/v1.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed May 30, 2022
2 parents fbb7cc8 + c4349b1 commit 228b3d2
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 26 deletions.
16 changes: 7 additions & 9 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,23 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-18.04, windows-latest, macos-latest]
python-version: [3.7]
os: [ubuntu-latest, windows-latest, macos-latest]
example:
- "examples/arduino-blink"
- "examples/arduino-external-libs"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: "recursive"
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
python-version: "3.9"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U https://github.com/platformio/platformio/archive/develop.zip
platformio platform install file://.
pio pkg install --global --platform symlink://.
- name: Build examples
run: |
platformio run -d ${{ matrix.example }}
pio run -d ${{ matrix.example }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RP2040 is a low-cost, high-performance microcontroller device with a large on-ch

# 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
Expand Down
13 changes: 9 additions & 4 deletions builder/frameworks/_bare.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@
env = DefaultEnvironment()

env.Append(
ASFLAGS=["-x", "assembler-with-cpp"],
ASFLAGS=[
"-mthumb",
],
ASPPFLAGS=[
"-x", "assembler-with-cpp",
],

CCFLAGS=[
"-Os", # optimize for size
Expand Down Expand Up @@ -54,13 +59,13 @@

if "BOARD" in env:
env.Append(
ASFLAGS=[
"-mcpu=%s" % env.BoardConfig().get("build.cpu")
],
CCFLAGS=[
"-mcpu=%s" % env.BoardConfig().get("build.cpu")
],
LINKFLAGS=[
"-mcpu=%s" % env.BoardConfig().get("build.cpu")
]
)

# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
2 changes: 1 addition & 1 deletion builder/frameworks/arduino/mbed-core
Submodule mbed-core updated 1 files
+12 −11 arduino-core-mbed.py
4 changes: 2 additions & 2 deletions builder/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from os import makedirs
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,
Builder, Default, DefaultEnvironment)
Expand All @@ -29,7 +29,7 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
upload_options = env.BoardConfig().get("upload", {})

env.AutodetectUploadPort()
before_ports = get_serial_ports()
before_ports = list_serial_ports()

if upload_options.get("use_1200bps_touch", False):
env.TouchSerialPort("$UPLOAD_PORT", 1200)
Expand Down
6 changes: 3 additions & 3 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"RP2040"
],
"engines": {
"platformio": "^5"
"platformio": "^6"
},
"repository": {
"type": "git",
"url": "https://github.com/platformio/platform-raspberrypi.git"
},
"version": "1.6.0",
"version": "1.7.0",
"frameworks": {
"arduino": {
"package": "framework-arduino-mbed",
Expand All @@ -35,7 +35,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~3.0.1"
"version": "~3.1.1"
},
"tool-rp2040tools": {
"type": "uploader",
Expand Down
10 changes: 4 additions & 6 deletions platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import copy
import platform

from platformio.managers.platform import PlatformBase
from platformio.public import PlatformBase


class RaspberrypiPlatform(PlatformBase):
Expand All @@ -39,16 +38,16 @@ def configure_default_packages(self, variables, targets):
if not any(jlink_conds) and jlink_pkgname in self.packages:
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):
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

Expand Down Expand Up @@ -102,7 +101,6 @@ def _add_default_debug_tools(self, board):

def configure_debug_session(self, debug_config):
adapter_speed = debug_config.speed or "5000"

server_options = debug_config.server or {}
server_arguments = server_options.get("arguments", [])
if "interface/cmsis-dap.cfg" in server_arguments:
Expand Down

0 comments on commit 228b3d2

Please sign in to comment.