Skip to content

Commit e4590ca

Browse files
committed
Merge branch 'release/v3.5.0'
2 parents ade19a5 + 8b90574 commit e4590ca

File tree

6 files changed

+61
-28
lines changed

6 files changed

+61
-28
lines changed

.gitmodules

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

builder/frameworks/mbed

Lines changed: 0 additions & 1 deletion
This file was deleted.

builder/frameworks/mbed.py

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Copyright 2014-present PlatformIO <[email protected]>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
"""
15+
mbed
16+
17+
The mbed framework The mbed SDK has been designed to provide enough
18+
hardware abstraction to be intuitive and concise, yet powerful enough to
19+
build complex projects. It is built on the low-level ARM CMSIS APIs,
20+
allowing you to code down to the metal if needed. In addition to RTOS,
21+
USB and Networking libraries, a cookbook of hundreds of reusable
22+
peripheral and module libraries have been built on top of the SDK by
23+
the mbed Developer Community.
24+
25+
http://mbed.org/
26+
"""
27+
28+
from os.path import join
29+
30+
from SCons.Script import Import, SConscript
31+
32+
Import("env")
33+
34+
# https://github.com/platformio/builder-framework-mbed.git
35+
SConscript(
36+
join(env.PioPlatform().get_package_dir("framework-mbed"), "platformio",
37+
"platformio-build.py"))

examples/mbed-events/platformio.ini

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,34 +17,34 @@ platform = nxplpc
1717
framework = mbed
1818
board = lpc11u24
1919

20+
[env:lpc11u35]
21+
platform = nxplpc
22+
framework = mbed
23+
board = lpc11u35
24+
25+
[env:lpc1549]
26+
platform = nxplpc
27+
framework = mbed
28+
board = lpc1549
29+
2030
[env:lpc4088]
2131
platform = nxplpc
2232
framework = mbed
2333
board = lpc4088
34+
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
2435

2536
[env:seeedArchPro]
2637
platform = nxplpc
2738
framework = mbed
2839
board = seeedArchPro
40+
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
2941

3042
; [env:seeedArchGPRS]
3143
; platform = nxplpc
3244
; framework = mbed
3345
; board = seeedArchGPRS
3446
; build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
3547

36-
[env:lpc11u35]
37-
platform = nxplpc
38-
framework = mbed
39-
board = lpc11u35
40-
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
41-
42-
[env:lpc1549]
43-
platform = nxplpc
44-
framework = mbed
45-
board = lpc1549
46-
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
47-
4848
; [env:lpc11u35_y5_mbug]
4949
; platform = nxplpc
5050
; framework = mbed

examples/mbed-rtos/platformio.ini

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ framework = mbed
1313
board = lpc1768
1414
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
1515

16-
[env:lpc11u24]
17-
platform = nxplpc
18-
framework = mbed
19-
board = lpc11u24
20-
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
16+
; [env:lpc11u24]
17+
; platform = nxplpc
18+
; framework = mbed
19+
; board = lpc11u24
20+
; build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
2121

2222
[env:lpc4088]
2323
platform = nxplpc
@@ -31,14 +31,14 @@ framework = mbed
3131
board = seeedArchPro
3232
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
3333

34-
[env:lpc11u35]
34+
[env:lpc4330_m4]
3535
platform = nxplpc
3636
framework = mbed
37-
board = lpc11u35
37+
board = lpc4330_m4
3838
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
3939

40-
[env:lpc1549]
40+
[env:lpc54114]
4141
platform = nxplpc
4242
framework = mbed
43-
board = lpc1549
43+
board = lpc54114
4444
build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT

platform.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-nxplpc.git"
1414
},
15-
"version": "3.4.1",
15+
"version": "3.5.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json"
1919
],
2020
"frameworks": {
2121
"mbed": {
2222
"package": "framework-mbed",
23-
"script": "builder/frameworks/mbed/mbed.py"
23+
"script": "builder/frameworks/mbed.py"
2424
}
2525
},
2626
"packages": {
@@ -31,7 +31,7 @@
3131
"framework-mbed": {
3232
"type": "framework",
3333
"optional": true,
34-
"version": "~5.50904.0"
34+
"version": "~5.51001.1"
3535
},
3636
"tool-openocd": {
3737
"type": "debugger",

0 commit comments

Comments
 (0)