Skip to content

Commit b40d92c

Browse files
committed
Merge branch 'release/v2.3.0'
2 parents b0e2fb6 + 3699695 commit b40d92c

6 files changed

Lines changed: 11 additions & 8 deletions

File tree

builder/frameworks/arduino

Submodule arduino updated 1 file

builder/frameworks/mbed

builder/main.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@
5959

6060
LIBS=["c", "gcc", "m"],
6161

62+
SIZEPROGREGEXP=r"^(?:\.text|\.data|\.rodata|\.text.align|\.ARM.exidx)\s+(\d+).*",
63+
SIZEDATAREGEXP=r"^(?:\.data|\.bss|\.noinit)\s+(\d+).*",
64+
SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
6265
SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',
6366

6467
PROGSUFFIX=".elf"

examples/arduino-blink/platformio.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
platform = nordicnrf52
1212
framework = arduino
1313
board = nrf52_dk
14-
14+
1515
[env:delta_dfbm_nq620]
1616
platform = nordicnrf52
1717
framework = arduino
@@ -21,14 +21,14 @@ board = delta_dfbm_nq620
2121
platform = nordicnrf52
2222
framework = arduino
2323
board = redbear_blenano2
24-
24+
2525
[env:redbear_blend2]
2626
platform = nordicnrf52
2727
framework = arduino
2828
board = redbear_blend2
2929
build_flags = -DNRF52_S132
3030

31-
[env:stct_nrf52_minidev]
31+
[env:stct nrf52 minidev]
3232
platform = nordicnrf52
3333
framework = arduino
3434
board = stct_nrf52_minidev

examples/mbed-blink/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ platform = nordicnrf52
1212
framework = mbed
1313
board = nrf52_dk
1414

15-
[env:delta_dfbm_nq620]
15+
[env:delta dfbm nq620]
1616
platform = nordicnrf52
1717
framework = mbed
1818
board = delta_dfbm_nq620

platform.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-nordicnrf52.git"
1414
},
15-
"version": "2.2.1",
15+
"version": "2.3.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json"
@@ -35,7 +35,7 @@
3535
"framework-mbed": {
3636
"type": "framework",
3737
"optional": true,
38-
"version": "~4.50802.0"
38+
"version": "~4.50806.0"
3939
},
4040
"framework-arduinonordicnrf5": {
4141
"type": "framework",

0 commit comments

Comments
 (0)