Skip to content

Commit 46a6415

Browse files
committed
Merge branch 'release/v1.1.0'
2 parents c305708 + 5a28b46 commit 46a6415

File tree

7 files changed

+115
-102
lines changed

7 files changed

+115
-102
lines changed

.github/workflows/examples.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Examples
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
strategy:
8+
fail-fast: false
9+
matrix:
10+
os: [ubuntu-16.04, windows-latest, macos-latest]
11+
python-version: [2.7, 3.7]
12+
example:
13+
- "examples/mbed-blink"
14+
- "examples/mbed-rtos-ethernet"
15+
- "examples/zephyr-blink"
16+
- "examples/zephyr-synchronization"
17+
exclude:
18+
- {python-version: 2.7, example: "examples/zephyr-blink"}
19+
- {python-version: 2.7, example: "examples/zephyr-synchronization"}
20+
runs-on: ${{ matrix.os }}
21+
steps:
22+
- uses: actions/checkout@v2
23+
with:
24+
submodules: "recursive"
25+
- name: Set up Python ${{ matrix.python-version }}
26+
uses: actions/setup-python@v1
27+
with:
28+
python-version: ${{ matrix.python-version }}
29+
- name: Install dependencies
30+
run: |
31+
python -m pip install --upgrade pip
32+
pip install -U https://github.com/platformio/platformio/archive/develop.zip
33+
platformio platform install file://.
34+
- name: Build examples
35+
run: |
36+
platformio run -d ${{ matrix.example }}

.travis.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NXP i.MX RT: development platform for [PlatformIO](https://platformio.org)
2-
[![Build Status](https://travis-ci.org/platformio/platform-nxpimxrt.svg?branch=develop)](https://travis-ci.org/platformio/platform-nxpimxrt)
3-
[![Build status](https://ci.appveyor.com/api/projects/status/c1ulif3vke3uo3rm/branch/develop?svg=true)](https://ci.appveyor.com/project/ivankravets/platform-nxpimxrt/branch/develop)
2+
3+
[![Build Status](https://github.com/platformio/platform-nxpimxrt/workflows/Examples/badge.svg)](https://github.com/platformio/platform-nxpimxrt/actions)
44

55
The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price. Combining high performance with real-time functionality, the i.MX RT series of crossover processors are designed to support next-generation IoT applications with a high level of integration and security balanced with MCU-level usability.
66

appveyor.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

examples/zephyr-blink/src/main.c

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,52 @@
66

77
#include <zephyr.h>
88
#include <device.h>
9+
#include <devicetree.h>
910
#include <drivers/gpio.h>
1011

11-
#define LED_PORT DT_ALIAS_LED0_GPIOS_CONTROLLER
12-
#define LED DT_ALIAS_LED0_GPIOS_PIN
1312

1413
/* 1000 msec = 1 sec */
15-
#define SLEEP_TIME 1000
14+
#define SLEEP_TIME_MS 1000
15+
16+
/* The devicetree node identifier for the "led0" alias. */
17+
#define LED0_NODE DT_ALIAS(led0)
18+
19+
#if DT_NODE_HAS_STATUS(LED0_NODE, okay)
20+
#define LED0 DT_GPIO_LABEL(LED0_NODE, gpios)
21+
#define PIN DT_GPIO_PIN(LED0_NODE, gpios)
22+
#if DT_PHA_HAS_CELL(LED0_NODE, gpios, flags)
23+
#define FLAGS DT_GPIO_FLAGS(LED0_NODE, gpios)
24+
#endif
25+
#else
26+
/* A build error here means your board isn't set up to blink an LED. */
27+
#error "Unsupported board: led0 devicetree alias is not defined"
28+
#define LED0 ""
29+
#define PIN 0
30+
#endif
31+
32+
#ifndef FLAGS
33+
#define FLAGS 0
34+
#endif
1635

1736
void main(void)
1837
{
19-
u32_t cnt = 0;
2038
struct device *dev;
39+
bool led_is_on = true;
40+
int ret = 0;
2141

22-
dev = device_get_binding(LED_PORT);
23-
/* Set LED pin as output */
24-
gpio_pin_configure(dev, LED, GPIO_DIR_OUT);
42+
dev = device_get_binding(LED0);
43+
if (dev == NULL) {
44+
return;
45+
}
46+
47+
ret = gpio_pin_configure(dev, PIN, GPIO_OUTPUT_ACTIVE | FLAGS);
48+
if (ret < 0) {
49+
return;
50+
}
2551

2652
while (1) {
27-
/* Set pin to HIGH/LOW every 1 second */
28-
gpio_pin_write(dev, LED, cnt % 2);
29-
cnt++;
30-
k_sleep(SLEEP_TIME);
53+
gpio_pin_set(dev, PIN, (int)led_is_on);
54+
led_is_on = !led_is_on;
55+
k_msleep(SLEEP_TIME_MS);
3156
}
3257
}

examples/zephyr-synchronization/src/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void helloLoop(const char *my_name,
5252
}
5353

5454
/* wait a while, then let other thread have a turn */
55-
k_sleep(SLEEPTIME);
55+
k_msleep(SLEEPTIME);
5656
k_sem_give(other_sem);
5757
}
5858
}
@@ -98,4 +98,4 @@ void threadA(void *dummy1, void *dummy2, void *dummy3)
9898
}
9999

100100
K_THREAD_DEFINE(thread_a, STACKSIZE, threadA, NULL, NULL, NULL,
101-
PRIORITY, 0, K_NO_WAIT);
101+
PRIORITY, 0, 0);

platform.json

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"name": "nxpimxrt",
33
"title": "NXP i.MX RT",
44
"description": "The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price.",
5-
"url": "https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/i.mx-rt-crossover-mcus:IMX-RT-SERIES",
6-
"homepage": "http://platformio.org/platforms/nxpimxrt",
5+
"homepage": "https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/i.mx-rt-crossover-mcus:IMX-RT-SERIES",
76
"license": "Apache-2.0",
87
"engines": {
98
"platformio": "<5"
@@ -12,7 +11,7 @@
1211
"type": "git",
1312
"url": "https://github.com/platformio/platform-nxpimxrt.git"
1413
},
15-
"version": "1.0.0",
14+
"version": "1.1.0",
1615
"packageRepositories": [
1716
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1817
"http://dl.platformio.org/packages/manifest.json"
@@ -40,71 +39,83 @@
4039
"framework-zephyr": {
4140
"type": "framework",
4241
"optional": true,
43-
"version": "~2.20200.0"
42+
"version": "~2.20300.0"
4443
},
45-
"framework-zephyr-hal-nxp": {
44+
"framework-zephyr-canopennode": {
4645
"optional": true,
47-
"version": "~0.20200.200130"
46+
"version": "0.0.0-alpha+sha.5c6b0566d5"
4847
},
4948
"framework-zephyr-civetweb": {
5049
"optional": true,
51-
"version": "~0.20200.190807"
50+
"version": "0.0.0-alpha+sha.99129c5efc"
51+
},
52+
"framework-zephyr-cmsis": {
53+
"optional": true,
54+
"version": "0.0.0-alpha+sha.542b2296e6"
5255
},
5356
"framework-zephyr-fatfs": {
5457
"optional": true,
55-
"version": "~0.20200.191125"
58+
"version": "0.0.0-alpha+sha.9ee6b9b951"
59+
},
60+
"framework-zephyr-hal-nxp": {
61+
"optional": true,
62+
"version": "0.0.0-alpha+sha.80a337dc4c"
5663
},
5764
"framework-zephyr-libmetal": {
5865
"optional": true,
59-
"version": "~0.20200.190530"
66+
"version": "0.0.0-alpha+sha.3c3c9ec83b"
6067
},
6168
"framework-zephyr-lvgl": {
6269
"optional": true,
63-
"version": "~0.20200.191207"
70+
"version": "0.0.0-alpha+sha.74fc2e753a"
6471
},
6572
"framework-zephyr-mbedtls": {
6673
"optional": true,
67-
"version": "~0.20200.200206"
74+
"version": "0.0.0-alpha+sha.4bf099f125"
75+
},
76+
"framework-zephyr-mcuboot": {
77+
"optional": true,
78+
"version": "0.0.0-alpha+sha.e88113bbeb"
6879
},
6980
"framework-zephyr-mcumgr": {
7081
"optional": true,
71-
"version": "~0.20200.200117"
82+
"version": "0.0.0-alpha+sha.5885efb7ca"
7283
},
7384
"framework-zephyr-open-amp": {
7485
"optional": true,
75-
"version": "~0.20200.190612"
86+
"version": "0.0.0-alpha+sha.724f7e2a45"
87+
},
88+
"framework-zephyr-loramac-node": {
89+
"optional": true,
90+
"version": "0.0.0-alpha+sha.29e516ec58"
7691
},
7792
"framework-zephyr-openthread": {
7893
"optional": true,
79-
"version": "~0.20200.191014"
94+
"version": "0.0.0-alpha+sha.a83d18cf18"
8095
},
8196
"framework-zephyr-segger": {
8297
"optional": true,
83-
"version": "~0.20200.190421"
98+
"version": "0.0.0-alpha+sha.6fcf61606d"
8499
},
85100
"framework-zephyr-tinycbor": {
86101
"optional": true,
87-
"version": "~0.20200.191016"
88-
},
89-
"framework-zephyr-littlefs": {
90-
"optional": true,
91-
"version": "~0.20200.190811"
102+
"version": "0.0.0-alpha+sha.40daca97b4"
92103
},
93-
"framework-zephyr-mipi-sys-t": {
104+
"framework-zephyr-tinycrypt": {
94105
"optional": true,
95-
"version": "~0.20200.191024"
106+
"version": "0.0.0-alpha+sha.3e9a49d267"
96107
},
97-
"framework-zephyr-canopennode": {
108+
"framework-zephyr-littlefs": {
98109
"optional": true,
99-
"version": "~0.20200.200115"
110+
"version": "0.0.0-alpha+sha.0aefdda69d"
100111
},
101-
"framework-zephyr-loramac-node": {
112+
"framework-zephyr-mipi-sys-t": {
102113
"optional": true,
103-
"version": "~0.20200.191220"
114+
"version": "0.0.0-alpha+sha.957d46bc3c"
104115
},
105-
"framework-zephyr-mcuboot": {
116+
"framework-zephyr-trusted-firmware-m": {
106117
"optional": true,
107-
"version": "~0.20200.200219"
118+
"version": "0.0.0-alpha+sha.7de2daa196"
108119
},
109120
"tool-openocd": {
110121
"type": "debugger",

0 commit comments

Comments
 (0)