Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Commit 7b23d50

Browse files
committed
Merge branch 'release/v1.5.0'
2 parents 8ef971e + 78396d7 commit 7b23d50

31 files changed

+47
-524
lines changed

.github/workflows/examples.yml

+7-9
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
os: [ubuntu-18.04, windows-latest, macos-latest]
11-
python-version: [3.7]
10+
os: [ubuntu-latest, windows-latest, macos-latest]
1211
example:
1312
- "examples/arduino-adc"
1413
- "examples/arduino-blink"
@@ -19,18 +18,17 @@ jobs:
1918
- "examples/LoRa/LoRaWAN/LoRaWAN_Interrupt"
2019
runs-on: ${{ matrix.os }}
2120
steps:
22-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2322
with:
2423
submodules: "recursive"
25-
- name: Set up Python ${{ matrix.python-version }}
26-
uses: actions/setup-python@v1
24+
- name: Set up Python
25+
uses: actions/setup-python@v3
2726
with:
28-
python-version: ${{ matrix.python-version }}
27+
python-version: "3.9"
2928
- name: Install dependencies
3029
run: |
31-
python -m pip install --upgrade pip
3230
pip install -U https://github.com/platformio/platformio/archive/develop.zip
33-
platformio platform install file://.
31+
pio pkg install --global --platform symlink://.
3432
- name: Build examples
3533
run: |
36-
platformio run -d ${{ matrix.example }}
34+
pio run -d ${{ matrix.example }}

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# ASR Microelectronics ASR605x (ASR6501, ASR6502): development platform for [PlatformIO](http://platformio.org)
1+
# ASR Microelectronics ASR605x (ASR6501, ASR6502): development platform for [PlatformIO](https://platformio.org)
22

33
[![Build Status](https://github.com/HelTecAutomation/platform-asrmicro650x/workflows/Examples/badge.svg)](https://github.com/HelTecAutomation/platform-asrmicro650x/actions)
44

55
ASR Microelectronics ASR605x series is highly integrated and ultra low power SoC based on the PSoC 4000 series MCU (ARM Cortex M0+ Core) and Semtech SX1262 transceiver.
66

7-
* [Home](http://platformio.org/platforms/asrmicro650x) (home page in PlatformIO Platform Registry)
8-
* [Documentation](http://docs.platformio.org/page/platforms/asrmicro650x.html) (advanced usage, packages, boards, frameworks, etc.)
7+
* [Home](https://registry.platformio.org/platforms/heltecautomation/asrmicro650x) (home page in the PlatformIO Registry)
8+
* [Documentation](https://docs.platformio.org/page/platforms/asrmicro650x.html) (advanced usage, packages, boards, frameworks, etc.)
99

1010
# Usage
1111

12-
1. [Install PlatformIO](http://platformio.org)
13-
2. Create PlatformIO project and configure a platform option in [platformio.ini](http://docs.platformio.org/page/projectconf.html) file:
12+
1. [Install PlatformIO](https://platformio.org)
13+
2. Create PlatformIO project and configure a platform option in [platformio.ini](https://docs.platformio.org/page/projectconf.html) file:
1414

1515
## Stable version
1616

@@ -32,4 +32,4 @@ board = ...
3232

3333
# Configuration
3434

35-
Please navigate to [documentation](http://docs.platformio.org/page/platforms/asrmicro650x.html).
35+
Please navigate to [documentation](https://docs.platformio.org/page/platforms/asrmicro650x.html).

builder/frameworks/arduino.py

+14-10
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,19 @@
3939
CORE_DIR = os.path.join(FRAMEWORK_DIR, "cores", core)
4040
assert os.path.isdir(FRAMEWORK_DIR)
4141

42+
machine_flags = [
43+
"-mcpu=%s" % board.get("build.cpu"),
44+
"-mthumb",
45+
"-mthumb-interwork",
46+
"-mapcs-frame",
47+
]
48+
4249
env.Append(
50+
ASFLAGS=machine_flags,
51+
ASPPFLAGS=[
52+
"-x", "assembler-with-cpp",
53+
],
54+
4355
CPPDEFINES=[
4456
("ARDUINO", 10815),
4557
"ARDUINO_ARCH_%s" % arch.upper(),
@@ -53,14 +65,10 @@
5365
("F_CPU", "$BOARD_F_CPU"),
5466
"SOFT_SE",
5567
],
56-
CCFLAGS=[
68+
CCFLAGS=machine_flags + [
5769
"-w",
5870
"-Wall",
5971
"-Os",
60-
"-mcpu=%s" % board.get("build.cpu"),
61-
"-mthumb",
62-
"-mthumb-interwork",
63-
"-mapcs-frame",
6472
"-ffunction-sections",
6573
"-fdata-sections",
6674
"-ffat-lto-objects",
@@ -75,16 +83,13 @@
7583
"-fno-exceptions",
7684
"-fno-rtti",
7785
],
78-
LINKFLAGS=[
86+
LINKFLAGS=machine_flags + [
7987
"-Os",
8088
"-Wl,--gc-sections",
81-
"-mcpu=%s" % board.get("build.cpu"),
8289
"-Wl,--wrap=printf",
8390
"-Wl,--wrap=fflush",
8491
"-Wl,--wrap=sprintf",
8592
"-Wl,--wrap=snprintf",
86-
"-mthumb",
87-
"-mthumb-interwork",
8893
"-specs=nano.specs",
8994
"-specs=nosys.specs",
9095
"-ffat-lto-objects",
@@ -94,7 +99,6 @@
9499
)
95100

96101
env.Prepend(
97-
ASFLAGS=env.get("CCFLAGS", [])[:],
98102
_LIBFLAGS='"%s" '
99103
% (
100104
os.path.join(CORE_DIR, "asr6601.a")

builder/main.py

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
join("$BUILD_DIR", "${PROGNAME}"), [target_elf, target_hex]
109109
)
110110
)
111+
env.Depends(target_firm, "checkprogsize")
111112

112113
AlwaysBuild(env.Alias("nobuild", target_firm))
113114
target_buildprog = env.Alias("buildprog", target_firm, target_firm)
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
.pio
2-
pio.map
3-
.vscode
4-
.piolibdeps

examples/LoRa/LoRaBasic/PingPong/.travis.yml

-67
This file was deleted.

examples/LoRa/LoRaBasic/PingPong/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
How to build PlatformIO based project
22
=====================================
33

4-
1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
4+
1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
55
2. Download [development platform with examples](https://github.com/platformio/platform-asrmicro650x/archive/develop.zip)
66
3. Extract ZIP archive
77
4. Run these commands:
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio

examples/LoRa/LoRaWAN/LoRaWAN/.travis.yml

-67
This file was deleted.

examples/LoRa/LoRaWAN/LoRaWAN/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
How to build PlatformIO based project
22
=====================================
33

4-
1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
4+
1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
55
2. Download [development platform with examples](https://github.com/platformio/platform-asrmicro650x/archive/develop.zip)
66
3. Extract ZIP archive
77
4. Run these commands:

examples/LoRa/LoRaWAN/LoRaWAN/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
; Library options: dependencies, extra library storages
66
;
77
; Please visit documentation for the other options and examples
8-
; http://docs.platformio.org/page/projectconf.html
8+
; https://docs.platformio.org/page/projectconf.html
99

1010
[env:cubecell_board]
1111
platform = asrmicro650x
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
.pio
2-
pio.map
3-
.vscode
4-
.piolibdeps

examples/LoRa/LoRaWAN/LoRaWAN_Interrupt/.travis.yml

-67
This file was deleted.

examples/LoRa/LoRaWAN/LoRaWAN_Interrupt/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
How to build PlatformIO based project
22
=====================================
33

4-
1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
4+
1. [Install PlatformIO Core](https://docs.platformio.org/page/core.html)
55
2. Download [development platform with examples](https://github.com/platformio/platform-asrmicro650x/archive/develop.zip)
66
3. Extract ZIP archive
77
4. Run these commands:

examples/arduino-adc/.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
.pioenvs
2-
.piolibdeps
1+
.pio

0 commit comments

Comments
 (0)