Skip to content

Commit 6e82b54

Browse files
author
Bogdan Marinescu
committed
Merge branch 'c027_lpc1768_refactor' of git://github.com/sg-/mbed into sg--c027_lpc1768_refactor
Conflicts: workspace_tools/export/uvision4.py
2 parents dc331e6 + 28f0cf7 commit 6e82b54

File tree

13 files changed

+922
-10
lines changed

13 files changed

+922
-10
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Supported Microcontrollers
2424
--------------------------
2525
NXP:
2626
* [LPC1768](http://mbed.org/platforms/mbed-LPC1768/) (Cortex-M3)
27+
* [LPC1768](http://mbed.org/platforms/u-blox-C027/) (Cortex-M3)
2728
* [LPC11U24](http://mbed.org/platforms/mbed-LPC11U24/) (Cortex-M0)
2829
* LPC2368 (ARM7TDMI-S)
2930
* LPC810 (Cortex-M0+)

‎libraries/mbed/common/board.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,41 @@
1919

2020
WEAK void mbed_die(void);
2121
WEAK void mbed_die(void) {
22-
#if defined(DEVICE_ERROR_RED)
22+
__disable_irq(); // dont allow interrupts to disturb the flash pattern
23+
24+
#if (DEVICE_ERROR_RED == 1)
2325
gpio_t led_red; gpio_init(&led_red, LED_RED, PIN_OUTPUT);
2426

25-
#elif defined(DEVICE_ERROR_PATTERN)
27+
#elif (DEVICE_ERROR_PATTERN == 1)
2628
gpio_t led_1; gpio_init(&led_1, LED1, PIN_OUTPUT);
2729
gpio_t led_2; gpio_init(&led_2, LED2, PIN_OUTPUT);
2830
gpio_t led_3; gpio_init(&led_3, LED3, PIN_OUTPUT);
2931
gpio_t led_4; gpio_init(&led_4, LED4, PIN_OUTPUT);
3032
#endif
3133

3234
while (1) {
33-
#if defined(DEVICE_ERROR_RED)
35+
#if (DEVICE_ERROR_RED == 1)
3436
gpio_write(&led_red, 1);
3537

36-
#elif defined(DEVICE_ERROR_PATTERN)
38+
#elif (DEVICE_ERROR_PATTERN == 1)
3739
gpio_write(&led_1, 1);
3840
gpio_write(&led_2, 0);
3941
gpio_write(&led_3, 0);
4042
gpio_write(&led_4, 1);
4143
#endif
44+
4245
wait_ms(150);
4346

44-
#if defined(DEVICE_ERROR_RED)
47+
#if (DEVICE_ERROR_RED == 1)
4548
gpio_write(&led_red, 0);
4649

47-
#elif defined(DEVICE_ERROR_PATTERN)
50+
#elif (DEVICE_ERROR_PATTERN == 1)
4851
gpio_write(&led_1, 0);
4952
gpio_write(&led_2, 1);
5053
gpio_write(&led_3, 1);
5154
gpio_write(&led_4, 0);
5255
#endif
56+
5357
wait_ms(150);
5458
}
5559
}

‎libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/PinNames.h renamed to ‎libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/TARGET_MBED_LPC1768/PinNames.h

File renamed without changes.

‎libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/device.h renamed to ‎libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/TARGET_MBED_LPC1768/device.h

File renamed without changes.

‎libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/TARGET_MBED_LPC1768/reserved_pins.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// List of reserved pins for MBED LPC1768
2+
3+
#ifndef RESERVED_PINS_H
4+
#define RESERVED_PINS_H
5+
6+
#define TARGET_RESERVED_PINS {}
7+
8+
#endif

‎libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/TARGET_UBLOX_C027/PinNames.h

Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
1+
/* mbed Microcontroller Library
2+
* Copyright (c) 2006-2013 ARM Limited
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
#ifndef MBED_PINNAMES_H
17+
#define MBED_PINNAMES_H
18+
19+
#include "cmsis.h"
20+
21+
#ifdef __cplusplus
22+
extern "C" {
23+
#endif
24+
25+
typedef enum {
26+
PIN_INPUT,
27+
PIN_OUTPUT
28+
} PinDirection;
29+
30+
#define PORT_SHIFT 5
31+
32+
typedef enum {
33+
// LPC Pin Names
34+
P0_0 = LPC_GPIO0_BASE,
35+
P0_1, P0_2, P0_3, P0_4, P0_5, P0_6, P0_7, P0_8, P0_9, P0_10, P0_11, P0_12, P0_13, P0_14, P0_15, P0_16, P0_17, P0_18, P0_19, P0_20, P0_21, P0_22, P0_23, P0_24, P0_25, P0_26, P0_27, P0_28, P0_29, P0_30, P0_31,
36+
P1_0, P1_1, P1_2, P1_3, P1_4, P1_5, P1_6, P1_7, P1_8, P1_9, P1_10, P1_11, P1_12, P1_13, P1_14, P1_15, P1_16, P1_17, P1_18, P1_19, P1_20, P1_21, P1_22, P1_23, P1_24, P1_25, P1_26, P1_27, P1_28, P1_29, P1_30, P1_31,
37+
P2_0, P2_1, P2_2, P2_3, P2_4, P2_5, P2_6, P2_7, P2_8, P2_9, P2_10, P2_11, P2_12, P2_13, P2_14, P2_15, P2_16, P2_17, P2_18, P2_19, P2_20, P2_21, P2_22, P2_23, P2_24, P2_25, P2_26, P2_27, P2_28, P2_29, P2_30, P2_31,
38+
P3_0, P3_1, P3_2, P3_3, P3_4, P3_5, P3_6, P3_7, P3_8, P3_9, P3_10, P3_11, P3_12, P3_13, P3_14, P3_15, P3_16, P3_17, P3_18, P3_19, P3_20, P3_21, P3_22, P3_23, P3_24, P3_25, P3_26, P3_27, P3_28, P3_29, P3_30, P3_31,
39+
P4_0, P4_1, P4_2, P4_3, P4_4, P4_5, P4_6, P4_7, P4_8, P4_9, P4_10, P4_11, P4_12, P4_13, P4_14, P4_15, P4_16, P4_17, P4_18, P4_19, P4_20, P4_21, P4_22, P4_23, P4_24, P4_25, P4_26, P4_27, P4_28, P4_29, P4_30, P4_31,
40+
41+
// Arduino Pin Names
42+
43+
// PIN header connector
44+
// for standard-based form factor with expansion board
45+
// -----------------------------------------------------------
46+
// PMW = Pulswidth Modulator
47+
// EINT = External Interrupt
48+
// AOUT = Analog Output
49+
50+
// Analog Ports (A0-A5)
51+
A0 = P0_23, // I2S_CLK
52+
A1 = P0_24, // I2S_WS
53+
A2 = P0_25, // I2S_SDA
54+
A3 = P0_26, // AOUT
55+
A4 = P1_30, //
56+
A5 = P1_31, //
57+
// Digital Port (D0-D7)
58+
D0 = P4_29, // TXD
59+
D1 = P4_28, // RXD
60+
D2 = P2_13, // EINT
61+
D3 = P2_0, // PWM
62+
D4 = P2_12, // EINT
63+
D5 = P2_1, // PWM
64+
D6 = P2_2, // PWM
65+
D7 = P2_11, // EINT
66+
// Digital Port (D8-D13)
67+
D8 = P2_4, // PWM
68+
D9 = P2_3, // PWM
69+
D10 = P1_21, // PWM SSEL
70+
D11 = P1_24, // PWM MOSI
71+
D12 = P1_23, // PWM MISO
72+
D13 = P1_20, // PWM SCK
73+
// GND
74+
// AREF
75+
SDA = P0_0,
76+
D14 = SDA,
77+
SCL = P0_1,
78+
D15 = SCL,
79+
80+
// I2C (shared with LISA/SARA)
81+
GPSSDA = P0_27,
82+
GPSSCL = P0_28,
83+
// UART
84+
GPSTXD = P0_10,
85+
GPSRXD = P0_11,
86+
// Control
87+
GPSRST = P1_18, // Reset (input to GPS, active low)
88+
GPSPPS = P1_19, // 1PPS Timepulse (output from GPS)
89+
GPSINT = P1_22, // Interrupt (input to GPS)
90+
GPSEN = P1_29, // Supply Control (high = enabled)
91+
92+
// u-blox LISA/SARA cellular modem
93+
// http://www.u-blox.com/wireless-modules.html
94+
// -----------------------------------------------------------
95+
// UART (LPC1768 = DTE, LISA/SARA = DCE)
96+
MDMTXD = P0_15, // Transmit Data
97+
MDMRXD = P0_16, // Receive Data
98+
MDMCTS = P0_17, // Clear to Send
99+
MDMDCD = P0_18, // Data Carrier Detect
100+
MDMDSR = P0_19, // Data Set Ready
101+
MDMDTR = P0_20, // Data Terminal Ready (set high or use handshake)
102+
MDMRI = P0_21, // Ring Indicator
103+
MDMRTS = P0_22, // Request to Send (set high or use handshake)
104+
105+
// USB (not available on C27-G35)
106+
MDMUSBDP = P0_29, // USB D+
107+
MDMUSBDN = P0_30, // USB D-
108+
MDMUSBCON = P2_9, // USB Connect
109+
MDMUSBDET = P0_7, // USB Detect (n/a on REV.A board)
110+
// Control
111+
MDMEN = P2_5, // Supply Control (high = enabled)
112+
MDMPWRON = P2_6, //
113+
MDMGPIO1 = P2_7, // GPIO1, Network status
114+
MDMRST = P2_8, // Reset (active low, set as open drain!)
115+
MDMLVLOE = P0_9, // Serial/GPIO Level Shifter Output Enable (n/a on REV.A board)
116+
MDMILVLOE = P0_8, // I2C Level Shifter Output Enable (n/a on REV.A board)
117+
118+
// CAN (TJA1040)
119+
// -----------------------------------------------------------
120+
CANRD = P0_4,
121+
CANTD = P0_5,
122+
CANS = P0_6, // standby (low=normal, high=standby/rxonly)
123+
124+
// Ethernet (DP83848)
125+
// -----------------------------------------------------------
126+
ETHTXD0 = P1_0,
127+
ETHTXD1 = P1_1,
128+
ETHTXEN = P1_4,
129+
ETHCRS = P1_8,
130+
ETHRXD0 = P1_9,
131+
ETHRXD1 = P1_10,
132+
ETHRXEN = P1_14,
133+
ETHREFCLK = P1_15,
134+
ETHMDC = P1_16,
135+
ETHMDIO = P1_17,
136+
ETHOSCEN = P1_27,
137+
ETHRST = P1_28,
138+
ETHLINK = P1_25, // LED_LINK
139+
ETHSPEED = P1_26, // LED_SPEED
140+
141+
// ISP port
142+
// -----------------------------------------------------------
143+
ISP = P2_10,
144+
145+
// Other mbed Pin Names
146+
LED = P3_25,
147+
LED1 = LED,
148+
LED_RED = LED,
149+
150+
// mbed / debug IF (LPC11)
151+
// -----------------------------------------------------------
152+
// Serial Port
153+
USBTX = P0_2,
154+
USBRX = P0_3,
155+
USBTXD = USBTX, // identical USBTX
156+
USBRXD = USBRX, // identical USBRX
157+
158+
// Not connected
159+
NC = (int)0xFFFFFFFF
160+
} PinName;
161+
162+
typedef enum {
163+
PullUp = 0,
164+
PullDown = 3,
165+
PullNone = 2,
166+
OpenDrain = 4
167+
} PinMode;
168+
169+
// version of PINCON_TypeDef using register arrays
170+
typedef struct {
171+
__IO uint32_t PINSEL[11];
172+
uint32_t RESERVED0[5];
173+
__IO uint32_t PINMODE[10];
174+
__IO uint32_t PINMODE_OD[5];
175+
} PINCONARRAY_TypeDef;
176+
177+
#define PINCONARRAY ((PINCONARRAY_TypeDef *)LPC_PINCON_BASE)
178+
179+
//Additional C027 stuff
180+
#define GPSADR (66<<1) // GPS I2C Address
181+
#define GPSBAUD 9600 // Default GPS Baud Rate
182+
#define MDMBAUD 115200 // Default Modem Baud Rate
183+
184+
#ifdef __cplusplus
185+
}
186+
#endif
187+
188+
#endif

‎libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/TARGET_UBLOX_C027/device.h

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/* mbed Microcontroller Library
2+
* Copyright (c) 2006-2013 ARM Limited
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
#ifndef MBED_DEVICE_H
17+
#define MBED_DEVICE_H
18+
19+
#define DEVICE_PORTIN 1
20+
#define DEVICE_PORTOUT 1
21+
#define DEVICE_PORTINOUT 1
22+
23+
#define DEVICE_INTERRUPTIN 1
24+
25+
#define DEVICE_ANALOGIN 1
26+
#define DEVICE_ANALOGOUT 1
27+
28+
#define DEVICE_SERIAL 1
29+
#define DEVICE_SERIAL_FC 1
30+
31+
#define DEVICE_I2C 1
32+
#define DEVICE_I2CSLAVE 1
33+
34+
#define DEVICE_SPI 1
35+
#define DEVICE_SPISLAVE 1
36+
37+
#define DEVICE_CAN 1
38+
39+
#define DEVICE_RTC 1
40+
41+
#define DEVICE_ETHERNET 1
42+
43+
#define DEVICE_PWMOUT 1
44+
45+
#define DEVICE_SEMIHOST 0
46+
#define DEVICE_LOCALFILESYSTEM 0
47+
#define DEVICE_ID_LENGTH 0
48+
#define DEVICE_MAC_OFFSET 0
49+
50+
#define DEVICE_SLEEP 1
51+
52+
#define DEVICE_DEBUG_AWARENESS 1
53+
54+
#define DEVICE_STDIO_MESSAGES 1
55+
56+
// should only enable one or the other, not both
57+
#define DEVICE_ERROR_PATTERN 0
58+
#define DEVICE_ERROR_RED 1
59+
60+
#include "objects.h"
61+
62+
#endif

‎libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/TARGET_UBLOX_C027/reserved_pins.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// List of reserved pins for C027 LPC1768
2+
3+
#ifndef RESERVED_PINS_H
4+
#define RESERVED_PINS_H
5+
6+
#define TARGET_RESERVED_PINS {P3_26}
7+
8+
#endif

‎libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/sleep.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
#include "mbed_interface.h"
1919

2020
void sleep(void) {
21+
22+
#if (DEVICE_SEMIHOST == 1)
2123
// ensure debug is disconnected
2224
mbed_interface_disconnect();
23-
25+
#endif
26+
2427
// PCON[PD] set to sleep
2528
LPC_SC->PCON = 0x0;
2629

@@ -58,8 +61,11 @@ void sleep(void) {
5861
*/
5962

6063
void deepsleep(void) {
64+
65+
#if (DEVICE_SEMIHOST == 1)
6166
// ensure debug is disconnected
6267
mbed_interface_disconnect();
68+
#endif
6369

6470
// PCON[PD] set to deepsleep
6571
sleep();

‎workspace_tools/export/uvision4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class Uvision4(Exporter):
2222
NAME = 'uVision4'
2323

24-
TARGETS = ['LPC1768', 'LPC11U24', 'KL05Z', 'KL25Z', 'KL46Z', 'K20D5M', 'LPC1347', 'LPC1114', 'LPC11C24', 'LPC4088', 'LPC812', 'NUCLEO_F103RB', 'NUCLEO_L152RE', 'NUCLEO_F030R8']
24+
TARGETS = ['LPC1768', 'LPC11U24', 'KL05Z', 'KL25Z', 'KL46Z', 'K20D5M', 'LPC1347', 'LPC1114', 'LPC11C24', 'LPC4088', 'LPC812', 'NUCLEO_F103RB', 'NUCLEO_L152RE', 'NUCLEO_F030R8', 'C027']
2525

2626
USING_MICROLIB = ['LPC11U24', 'LPC1114', 'LPC11C24', 'LPC812', 'NUCLEO_F103RB', 'NUCLEO_L152RE', 'NUCLEO_F030R8']
2727

0 commit comments

Comments
 (0)