Skip to content

Commit 636114b

Browse files
bcostmbcostm
committed
Merge branch 'master' of https://github.com/mbedmicro/mbed 
2 parents 19b70d8 + b87dac9 commit 636114b

File tree

12 files changed

+138
-24
lines changed

12 files changed

+138
-24
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ NXP:
2626
* [LPC1768](http://mbed.org/platforms/mbed-LPC1768/) (Cortex-M3)
2727
* [LPC1768](http://mbed.org/platforms/u-blox-C027/) (Cortex-M3)
2828
* [LPC11U24](http://mbed.org/platforms/mbed-LPC11U24/) (Cortex-M0)
29+
* [LPC11U35](http://mbed.org/platforms/EA-LPC11U35/) (Cortex-M0)
2930
* LPC2368 (ARM7TDMI-S)
3031
* LPC810 (Cortex-M0+)
3132
* [LPC812](http://mbed.org/platforms/NXP-LPC800-MAX/) (Cortex-M0+)

‎libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/us_ticker.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#define TIM_MST_RCC RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE)
3737

3838
static int us_ticker_inited = 0;
39-
static uint32_t SlaveCounter = 0;
39+
static volatile uint32_t SlaveCounter = 0;
4040
static uint32_t oc_int_part = 0;
4141
static uint16_t oc_rem_part = 0;
4242

‎libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#define TIM_MST_RCC RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE)
3737

3838
static int us_ticker_inited = 0;
39-
static uint32_t SlaveCounter = 0;
39+
static volatile uint32_t SlaveCounter = 0;
4040
static uint32_t oc_int_part = 0;
4141
static uint16_t oc_rem_part = 0;
4242

‎libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/us_ticker.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
static TIM_HandleTypeDef TimMasterHandle;
4040

4141
static int us_ticker_inited = 0;
42-
static uint32_t SlaveCounter = 0;
42+
static volatile uint32_t SlaveCounter = 0;
4343
static uint32_t oc_int_part = 0;
4444
static uint16_t oc_rem_part = 0;
4545

‎libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/us_ticker.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define TIM_MST_RCC RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM9, ENABLE)
3636

3737
static int us_ticker_inited = 0;
38-
static uint32_t SlaveCounter = 0;
38+
static volatile uint32_t SlaveCounter = 0;
3939
static uint32_t oc_int_part = 0;
4040
static uint16_t oc_rem_part = 0;
4141

‎libraries/tests/mbed/pin_toggling/main.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#include "mbed.h"
2+
3+
DigitalOut out(p5);
4+
5+
int main() {
6+
while (true) {
7+
out = 1;
8+
out = 0;
9+
}
10+
}

‎workspace_tools/build_release.py

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,25 @@
2626
from workspace_tools.targets import TARGET_MAP
2727

2828
OFFICIAL_MBED_LIBRARY_BUILD = (
29+
('LPC11U24', ('ARM', 'uARM')),
30+
('LPC1768', ('ARM', 'GCC_ARM', 'GCC_CR', 'GCC_CS', 'IAR')),
31+
('UBLOX_C027', ('ARM', 'GCC_ARM', 'GCC_CR', 'GCC_CS', 'IAR')),
32+
('LPC2368', ('ARM',)),
33+
('LPC812', ('uARM',)),
34+
('LPC1347', ('ARM',)),
35+
('LPC4088', ('ARM', 'GCC_ARM', 'GCC_CR')),
36+
('LPC1114', ('uARM',)),
37+
('LPC11U35_401', ('ARM', 'uARM')),
38+
2939
('KL25Z', ('ARM', 'GCC_ARM')),
30-
('LPC11U24', ('ARM', 'uARM')),
31-
('LPC1768', ('ARM', 'GCC_ARM', 'GCC_CR', 'GCC_CS', 'IAR')),
32-
('LPC2368', ('ARM',)),
33-
('LPC812', ('uARM',)),
34-
('LPC1347', ('ARM',)),
35-
('LPC4088', ('ARM', 'GCC_ARM', 'GCC_CR')),
36-
('LPC1114', ('uARM',)),
3740
('KL46Z', ('ARM', 'GCC_ARM')),
38-
('LPC11U35_401', ('ARM', 'uARM')),
39-
('NUCLEO_F103RB', ('ARM',)),
40-
# ('NUCLEO_L152RE', ('ARM',)),
41-
# ('NUCLEO_F401RE', ('ARM',)),
42-
# ('NUCLEO_F030R8', ('ARM',)),
41+
42+
('NUCLEO_F103RB', ('ARM', 'uARM')),
43+
('NUCLEO_L152RE', ('ARM', 'uARM')),
44+
('NUCLEO_F401RE', ('ARM', 'uARM')),
45+
('NUCLEO_F030R8', ('ARM', 'uARM')),
46+
47+
# ('NRF51822', ('ARM', )),
4348
)
4449

4550

‎workspace_tools/export/README.md

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Exporter Toolchain/Platform Support
66
<th></th>
77
<th>Code Red</th>
88
<th>Code Sourcery</th>
9+
<th>CoIDE</th>
910
<th>DS-5</th>
1011
<th>GCC ARM</th>
1112
<th>IAR</th>
@@ -19,11 +20,13 @@ Exporter Toolchain/Platform Support
1920
<td>&#10003;</td>
2021
<td>&#10003;</td>
2122
<td>&#10003;</td>
23+
<td>&#10003;</td>
2224
</tr>
2325
<tr>
2426
<td>NXP LPC11U24</td>
2527
<td></td>
2628
<td></td>
29+
<td></td>
2730
<td>&#10003;</td>
2831
<td></td>
2932
<td></td>
@@ -33,6 +36,7 @@ Exporter Toolchain/Platform Support
3336
<td>NXP LPC812</td>
3437
<td></td>
3538
<td></td>
39+
<td></td>
3640
<td>&#10003;</td>
3741
<td></td>
3842
<td></td>
@@ -43,6 +47,7 @@ Exporter Toolchain/Platform Support
4347
<td>&#10003;</td>
4448
<td></td>
4549
<td></td>
50+
<td></td>
4651
<td>&#10003;</td>
4752
<td></td>
4853
<td>&#10003;</td>
@@ -54,6 +59,7 @@ Exporter Toolchain/Platform Support
5459
<td></td>
5560
<td></td>
5661
<td></td>
62+
<td></td>
5763
<td>&#10003;</td>
5864
</tr>
5965
<tr>
@@ -63,12 +69,34 @@ Exporter Toolchain/Platform Support
6369
<td></td>
6470
<td></td>
6571
<td></td>
72+
<td></td>
73+
<td>&#10003;</td>
74+
</tr>
75+
<tr>
76+
<td>Freescale KL05Z</td>
77+
<td></td>
78+
<td></td>
79+
<td>&#10003;</td>
80+
<td></td>
81+
<td>&#10003;</td>
82+
<td></td>
83+
<td>&#10003;</td>
84+
</tr>
85+
<tr>
86+
<td>Freescale KL20D5M</td>
87+
<td></td>
88+
<td></td>
89+
<td></td>
90+
<td></td>
91+
<td></td>
92+
<td></td>
6693
<td>&#10003;</td>
6794
</tr>
6895
<tr>
6996
<td>Freescale KL25Z</td>
7097
<td></td>
7198
<td></td>
99+
<td>&#10003;</td>
72100
<td></td>
73101
<td>&#10003;</td>
74102
<td></td>
@@ -79,7 +107,48 @@ Exporter Toolchain/Platform Support
79107
<td></td>
80108
<td></td>
81109
<td></td>
110+
<td></td>
111+
<td>&#10003;</td>
112+
<td></td>
113+
<td>&#10003;</td>
114+
</tr>
115+
<tr>
116+
<td>ST Nucleo F030R8</td>
117+
<td></td>
118+
<td></td>
119+
<td></td>
120+
<td></td>
121+
<td></td>
122+
<td></td>
123+
<td>&#10003;</td>
124+
</tr>
125+
<tr>
126+
<td>ST Nucleo F103RB</td>
127+
<td></td>
128+
<td></td>
129+
<td></td>
130+
<td></td>
131+
<td></td>
132+
<td></td>
82133
<td>&#10003;</td>
134+
</tr>
135+
<tr>
136+
<td>ST Nucleo F401RE</td>
137+
<td></td>
138+
<td></td>
139+
<td></td>
140+
<td></td>
141+
<td></td>
142+
<td>&#10003;</td>
143+
<td>&#10003;</td>
144+
</tr>
145+
<tr>
146+
<td>ST Nucleo L152RE</td>
147+
<td></td>
148+
<td></td>
149+
<td></td>
150+
<td></td>
151+
<td></td>
83152
<td></td>
84153
<td>&#10003;</td>
85154
</tr>

‎workspace_tools/make.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,20 +167,30 @@
167167
if options.disk:
168168
# Simple copy to the mbed disk
169169
copy(bin, options.disk)
170+
170171
if options.nrfjprog:
171172
#Convert bin to Hex and Program nrf chip via jlink
172-
call(["nrfjprog","-e","--program",bin.replace(".bin", ".hex"),"--verify","-p"])
173+
call(["nrfjprog","-e","--program",bin.replace(".bin", ".hex"),"--verify"])
174+
173175
if options.serial:
174176
# Import pyserial: https://pypi.python.org/pypi/pyserial
175177
from serial import Serial
176178

177179
sleep(target.program_cycle_s())
180+
178181
serial = Serial(options.serial, timeout = 1)
179182
if options.baud:
180183
serial.setBaudrate(options.baud)
184+
181185
serial.flushInput()
182186
serial.flushOutput()
183-
serial.sendBreak()
187+
188+
if options.nrfjprog:
189+
call(["nrfjprog", "-r"])
190+
elif mcu.startswith('NUCLEO'):
191+
call(["ST-LINK_CLI.exe", "-Rst"])
192+
else:
193+
serial.sendBreak()
184194

185195
while True:
186196
c = serial.read(512)

‎workspace_tools/targets.py

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ def __init__(self):
7777

7878

7979
class LPC11U24(Target):
80+
ONLINE_TOOLCHAIN = "uARM"
81+
8082
def __init__(self):
8183
Target.__init__(self)
8284

@@ -151,6 +153,8 @@ def __init__(self):
151153

152154

153155
class LPC812(Target):
156+
ONLINE_TOOLCHAIN = "uARM"
157+
154158
def __init__(self):
155159
Target.__init__(self)
156160

@@ -164,6 +168,8 @@ def __init__(self):
164168

165169

166170
class LPC810(Target):
171+
ONLINE_TOOLCHAIN = "uARM"
172+
167173
def __init__(self):
168174
Target.__init__(self)
169175

@@ -266,6 +272,7 @@ def __init__(self):
266272

267273

268274
class NUCLEO_F103RB(Target):
275+
ONLINE_TOOLCHAIN = "uARM"
269276
OUTPUT_NAMING = "8.3"
270277

271278
def __init__(self):
@@ -279,6 +286,7 @@ def __init__(self):
279286

280287

281288
class NUCLEO_L152RE(Target):
289+
ONLINE_TOOLCHAIN = "uARM"
282290
OUTPUT_NAMING = "8.3"
283291

284292
def __init__(self):
@@ -292,6 +300,7 @@ def __init__(self):
292300

293301

294302
class NUCLEO_F401RE(Target):
303+
ONLINE_TOOLCHAIN = "uARM"
295304
OUTPUT_NAMING = "8.3"
296305

297306
def __init__(self):
@@ -305,6 +314,7 @@ def __init__(self):
305314

306315

307316
class NUCLEO_F030R8(Target):
317+
ONLINE_TOOLCHAIN = "uARM"
308318
OUTPUT_NAMING = "8.3"
309319

310320
def __init__(self):
@@ -329,6 +339,8 @@ def __init__(self):
329339

330340

331341
class LPC1114(Target):
342+
ONLINE_TOOLCHAIN = "uARM"
343+
332344
def __init__(self):
333345
Target.__init__(self)
334346

@@ -351,6 +363,8 @@ def __init__(self):
351363

352364

353365
class LPC11U35_401(Target):
366+
ONLINE_TOOLCHAIN = "uARM"
367+
354368
def __init__(self):
355369
Target.__init__(self)
356370

@@ -367,18 +381,18 @@ def __init__(self):
367381

368382
self.core = "Cortex-M3"
369383

370-
self.extra_labels = ['NXP', 'LPC176X', 'UBLOX_C027']
384+
self.extra_labels = ['NXP', 'LPC176X']
371385

372-
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM", "GCC_CS", "GCC_CR", "IAR"]
386+
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM", "GCC_CS", "GCC_CR", "IAR"]
373387

374388

375389
class NRF51822(Target):
390+
OUTPUT_EXT = '.hex'
391+
376392
EXPECTED_SOFTDEVICE = 's110_nrf51822_6.0.0_softdevice.hex'
377393
UICR_START = 0x10001000
378394
APPCODE_OFFSET = 0x14000
379395

380-
OUTPUT_EXT = '.hex'
381-
382396
def __init__(self):
383397
Target.__init__(self)
384398

0 commit comments

Comments
 (0)