Skip to content

Commit 2bd968e

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v4.0.0'
2 parents 1a4df4d + 57758f7 commit 2bd968e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2100
-36
lines changed

‎.travis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,28 @@ env:
1717
- PLATFORMIO_PROJECT_DIR=examples/arduino-ble-led
1818
- PLATFORMIO_PROJECT_DIR=examples/arduino-bluefruit-bleuart
1919
- PLATFORMIO_PROJECT_DIR=examples/arduino-nina-b1-generic-example PLATFORMIO_BUILD_FLAGS="-DNRF52_S132"
20+
- PLATFORMIO_PROJECT_DIR=examples/arduino-serial-plotter
2021
- PLATFORMIO_PROJECT_DIR=examples/mbed-ble-thermometer
2122
- PLATFORMIO_PROJECT_DIR=examples/mbed-blink
2223
- PLATFORMIO_PROJECT_DIR=examples/mbed-dsp
2324
- PLATFORMIO_PROJECT_DIR=examples/mbed-events
2425
- PLATFORMIO_PROJECT_DIR=examples/mbed-nfc
2526
- PLATFORMIO_PROJECT_DIR=examples/mbed-rtos
2627
- PLATFORMIO_PROJECT_DIR=examples/mbed-serial
28+
- PLATFORMIO_PROJECT_DIR=examples/zephyr-ble-beacon
29+
- PLATFORMIO_PROJECT_DIR=examples/zephyr-blink
30+
- PLATFORMIO_PROJECT_DIR=examples/zephyr-subsys-nvs
2731

32+
# Zephyr framework doesn't support python 2
33+
jobs:
34+
exclude:
35+
- python: "2.7"
36+
env: PLATFORMIO_PROJECT_DIR=examples/zephyr-ble-beacon
37+
- python: "2.7"
38+
env: PLATFORMIO_PROJECT_DIR=examples/zephyr-blink
39+
- python: "2.7"
40+
env: PLATFORMIO_PROJECT_DIR=examples/zephyr-subsys-nvs
41+
2842
install:
2943
- pip install -U https://github.com/platformio/platformio/archive/develop.zip
3044
- platformio platform install file://.

‎appveyor.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,21 @@ environment:
55
- PLATFORMIO_PROJECT_DIR: "examples/arduino-blink"
66
- PLATFORMIO_PROJECT_DIR: "examples/arduino-ble-led"
77
- PLATFORMIO_PROJECT_DIR: "examples/arduino-bluefruit-bleuart"
8+
- PLATFORMIO_PROJECT_DIR: "examples/arduino-serial-plotter"
89
- PLATFORMIO_PROJECT_DIR: "examples/mbed-ble-thermometer"
910
- PLATFORMIO_PROJECT_DIR: "examples/mbed-blink"
1011
- PLATFORMIO_PROJECT_DIR: "examples/mbed-dsp"
1112
- PLATFORMIO_PROJECT_DIR: "examples/mbed-events"
1213
- PLATFORMIO_PROJECT_DIR: "examples/mbed-nfc"
1314
- PLATFORMIO_PROJECT_DIR: "examples/mbed-rtos"
1415
- PLATFORMIO_PROJECT_DIR: "examples/mbed-serial"
16+
- PLATFORMIO_PROJECT_DIR: "examples/zephyr-ble-beacon"
17+
- PLATFORMIO_PROJECT_DIR: "examples/zephyr-blink"
18+
- PLATFORMIO_PROJECT_DIR: "examples/zephyr-subsys-nvs"
1519

1620
install:
1721
- cmd: git submodule update --init --recursive
18-
- cmd: SET PATH=%PATH%;C:\Python36\Scripts
22+
- cmd: SET PATH=C:\Python36\Scripts;%PATH%
1923
- cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
2024
- cmd: platformio platform install file://.
2125
- cmd: SET PLATFORMIO_PACKAGES_DIR=C:\PIOTMP

‎boards/96b_nitrogen.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"build": {
3+
"cpu": "cortex-m4",
4+
"f_cpu": "64000000L",
5+
"mcu": "nrf52832"
6+
},
7+
"connectivity": [
8+
"bluetooth"
9+
],
10+
"debug": {
11+
"jlink_device": "nRF52832_xxAA",
12+
"svd_path": "nrf52.svd"
13+
},
14+
"frameworks": [
15+
"zephyr"
16+
],
17+
"name": "96Boards Nitrogen",
18+
"upload": {
19+
"maximum_ram_size": 65536,
20+
"maximum_size": 524288,
21+
"protocol": "jlink",
22+
"protocols": [
23+
"jlink",
24+
"nrfjprog",
25+
"stlink",
26+
"blackmagic"
27+
]
28+
},
29+
"url": "https://www.96boards.org/product/nitrogen/",
30+
"vendor": "96Boards"
31+
}

‎boards/adafruit_cplaynrf52840.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,17 @@
5353
"upload": {
5454
"maximum_ram_size": 248832,
5555
"maximum_size": 815104,
56-
"require_upload_port": true,
5756
"speed": 115200,
5857
"protocol": "nrfutil",
5958
"protocols": [
6059
"jlink",
6160
"nrfjprog",
62-
"nrfutil"
63-
]
61+
"nrfutil",
62+
"stlink"
63+
],
64+
"use_1200bps_touch": true,
65+
"require_upload_port": true,
66+
"wait_for_upload_port": true
6467
},
6568
"url": "https://www.adafruit.com/product/4333",
6669
"vendor": "Adafruit"

‎boards/adafruit_feather_nrf52832.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
"sd_name": "s132",
3535
"sd_version": "6.1.1",
3636
"sd_fwid": "0x00B7"
37+
},
38+
"zephyr": {
39+
"variant": "nrf52_adafruit_feather"
3740
}
3841
},
3942
"connectivity": [
@@ -44,7 +47,8 @@
4447
"svd_path": "nrf52.svd"
4548
},
4649
"frameworks": [
47-
"arduino"
50+
"arduino",
51+
"zephyr"
4852
],
4953
"name": "Adafruit Bluefruit nRF52832 Feather",
5054
"upload": {
@@ -56,9 +60,10 @@
5660
"protocols": [
5761
"jlink",
5862
"nrfjprog",
59-
"nrfutil"
63+
"nrfutil",
64+
"stlink"
6065
]
6166
},
6267
"url": "https://www.adafruit.com/product/3406",
6368
"vendor": "Adafruit"
64-
}
69+
}

‎boards/adafruit_feather_nrf52840.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,18 @@
5353
"upload": {
5454
"maximum_ram_size": 248832,
5555
"maximum_size": 815104,
56-
"require_upload_port": true,
5756
"speed": 115200,
5857
"protocol": "nrfutil",
5958
"protocols": [
6059
"jlink",
6160
"nrfjprog",
62-
"nrfutil"
63-
]
61+
"nrfutil",
62+
"stlink"
63+
],
64+
"use_1200bps_touch": true,
65+
"require_upload_port": true,
66+
"wait_for_upload_port": true
6467
},
6568
"url": "https://www.adafruit.com/product/4062",
6669
"vendor": "Adafruit"
67-
}
70+
}

‎boards/adafruit_itsybitsy_nrf52840.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,17 @@
5656
"upload": {
5757
"maximum_ram_size": 248832,
5858
"maximum_size": 815104,
59-
"require_upload_port": true,
60-
"use_1200bps_touch": true,
6159
"speed": 115200,
6260
"protocol": "nrfutil",
6361
"protocols": [
6462
"jlink",
6563
"nrfjprog",
66-
"nrfutil"
67-
]
64+
"nrfutil",
65+
"stlink"
66+
],
67+
"use_1200bps_touch": true,
68+
"require_upload_port": true,
69+
"wait_for_upload_port": true
6870
},
6971
"url": "https://www.adafruit.com/product/4062",
7072
"vendor": "Adafruit"

‎boards/adafruit_metro_nrf52840.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,18 @@
5353
"upload": {
5454
"maximum_ram_size": 248832,
5555
"maximum_size": 815104,
56-
"require_upload_port": true,
5756
"speed": 115200,
5857
"protocol": "nrfutil",
5958
"protocols": [
6059
"jlink",
6160
"nrfjprog",
62-
"nrfutil"
63-
]
61+
"nrfutil",
62+
"stlink"
63+
],
64+
"use_1200bps_touch": true,
65+
"require_upload_port": true,
66+
"wait_for_upload_port": true
6467
},
6568
"url": "https://www.adafruit.com/product/4062",
6669
"vendor": "Adafruit"
67-
}
70+
}

‎boards/electronut_blip.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"build": {
3+
"cpu": "cortex-m4",
4+
"f_cpu": "64000000L",
5+
"mcu": "nrf52840",
6+
"zephyr": {
7+
"variant": "nrf52840_blip"
8+
}
9+
},
10+
"connectivity": [
11+
"bluetooth"
12+
],
13+
"debug": {
14+
"default_tools": [
15+
"blackmagic"
16+
],
17+
"jlink_device": "nRF52840_xxAA",
18+
"onboard_tools": [
19+
"blackmagic"
20+
],
21+
"svd_path": "nrf52.svd"
22+
},
23+
"frameworks": [
24+
"zephyr"
25+
],
26+
"name": "ElectronutLabs Blip",
27+
"upload": {
28+
"maximum_ram_size": 262144,
29+
"maximum_size": 1048576,
30+
"protocol": "blackmagic",
31+
"protocols": [
32+
"jlink",
33+
"nrfjprog",
34+
"stlink",
35+
"blackmagic",
36+
"cmsis-dap"
37+
]
38+
},
39+
"url": "https://github.com/electronut/ElectronutLabs-blip",
40+
"vendor": "ElectronutLabs"
41+
}

‎boards/electronut_papyr.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"build": {
3+
"cpu": "cortex-m4",
4+
"f_cpu": "64000000L",
5+
"mcu": "nrf52840",
6+
"zephyr": {
7+
"variant": "nrf52840_papyr"
8+
}
9+
},
10+
"connectivity": [
11+
"bluetooth"
12+
],
13+
"debug": {
14+
"default_tools": [
15+
"blackmagic"
16+
],
17+
"jlink_device": "nRF52840_xxAA",
18+
"onboard_tools": [
19+
"blackmagic"
20+
],
21+
"svd_path": "nrf52.svd"
22+
},
23+
"frameworks": [
24+
"zephyr"
25+
],
26+
"name": "ElectronutLabs Papyr",
27+
"upload": {
28+
"maximum_ram_size": 262144,
29+
"maximum_size": 1048576,
30+
"protocol": "blackmagic",
31+
"protocols": [
32+
"jlink",
33+
"nrfjprog",
34+
"stlink",
35+
"blackmagic",
36+
"cmsis-dap"
37+
]
38+
},
39+
"url": "https://docs.electronut.in/papyr",
40+
"vendor": "ElectronutLabs"
41+
}

‎boards/holyiot_yj16019.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"build": {
3+
"cpu": "cortex-m4",
4+
"f_cpu": "64000000L",
5+
"mcu": "nrf52832"
6+
},
7+
"connectivity": [
8+
"bluetooth"
9+
],
10+
"debug": {
11+
"jlink_device": "nRF52832_xxAA",
12+
"svd_path": "nrf52.svd"
13+
},
14+
"frameworks": [
15+
"zephyr"
16+
],
17+
"name": "Holyiot YJ-16019",
18+
"upload": {
19+
"maximum_ram_size": 65536,
20+
"maximum_size": 524288,
21+
"protocol": "jlink",
22+
"protocols": [
23+
"jlink",
24+
"nrfjprog",
25+
"stlink",
26+
"blackmagic",
27+
"cmsis-dap"
28+
]
29+
},
30+
"url": "http://www.holyiot.com/eacp_view.asp?id=306",
31+
"vendor": "Holyiot"
32+
}

‎boards/laird_bl652_dvk.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"build": {
3+
"cpu": "cortex-m4",
4+
"f_cpu": "64000000L",
5+
"mcu": "nrf52832",
6+
"zephyr": {
7+
"variant": "bl652_dvk"
8+
}
9+
},
10+
"connectivity": [
11+
"bluetooth"
12+
],
13+
"debug": {
14+
"default_tools": [
15+
"jlink"
16+
],
17+
"jlink_device": "nRF52832_xxAA",
18+
"onboard_tools": [
19+
"cmsis-dap",
20+
"jlink"
21+
],
22+
"svd_path": "nrf52.svd"
23+
},
24+
"frameworks": [
25+
"zephyr"
26+
],
27+
"name": "BL652 Development Kit",
28+
"upload": {
29+
"maximum_ram_size": 65536,
30+
"maximum_size": 524288,
31+
"protocol": "jlink",
32+
"protocols": [
33+
"jlink",
34+
"nrfjprog",
35+
"stlink",
36+
"blackmagic",
37+
"cmsis-dap",
38+
"mbed"
39+
]
40+
},
41+
"url": "https://www.lairdconnect.com/wireless-modules/bluetooth-modules/bluetooth-5-modules/bl652-series-bluetooth-v5-nfc",
42+
"vendor": "Laird Connectivity"
43+
}

0 commit comments

Comments
 (0)