Skip to content

Commit 2776dd7

Browse files
0xc01700xc0170
authored
Merge pull request ARMmbed#2447 from ytsuboi/master
[TY51822r3] Add support for mbed OS 5
2 parents b396436 + 38f626c commit 2776dd7

File tree

4 files changed

+242
-3
lines changed

4 files changed

+242
-3
lines changed

‎hal/targets.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -1517,11 +1517,13 @@
15171517
"extra_labels_add": ["NRF51_MICROBIT"],
15181518
"macros_add": ["TARGET_NRF51_MICROBIT", "TARGET_NRF_LFCLK_RC"]
15191519
},
1520+
15201521
"TY51822R3": {
1521-
"inherits": ["MCU_NRF51_32K"],
1522+
"inherits": ["MCU_NRF51_32K_UNIFIED"],
15221523
"macros_add": ["TARGET_NRF_32MHZ_XTAL"],
1523-
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"],
1524-
"release_versions": ["2"]
1524+
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
1525+
"detect_code": ["1019"],
1526+
"release_versions": ["2", "5"]
15251527
},
15261528
"TY51822R3_BOOT": {
15271529
"inherits": ["MCU_NRF51_32K_BOOT"],

‎hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/system_nrf51.c

+21
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,27 @@ void SystemCoreClockUpdate(void)
7171

7272
void SystemInit(void)
7373
{
74+
#if defined(TARGET_NRF_32MHZ_XTAL)
75+
/* For 32MHz HFCLK XTAL such as Taiyo Yuden
76+
Physically, tiny footprint XTAL oscillate higher freq. To make BLE modules smaller, some modules
77+
are using 32MHz XTAL.
78+
This code wriging the value 0xFFFFFF00 to the UICR (User Information Configuration Register)
79+
at address 0x10001008, to make nRF51 works with 32MHz system clock. This register will be overwritten
80+
by SoftDevice to 0xFFFFFFFF, the default value. Each hex files built with mbed classic online compiler
81+
contain SoftDevice, so that, this code run once just after the hex file will be flashed onto nRF51.
82+
After changing the value, nRF51 need to reboot. */
83+
if (*(uint32_t *)0x10001008 == 0xFFFFFFFF)
84+
{
85+
NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos;
86+
while (NRF_NVMC->READY == NVMC_READY_READY_Busy){}
87+
*(uint32_t *)0x10001008 = 0xFFFFFF00;
88+
NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos;
89+
while (NRF_NVMC->READY == NVMC_READY_READY_Busy){}
90+
NVIC_SystemReset();
91+
while (true){}
92+
}
93+
#endif
94+
7495
/* If desired, switch off the unused RAM to lower consumption by the use of RAMON register.
7596
It can also be done in the application main() function. */
7697

‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_TY51822R3/PinNames.h

+178
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
/* mbed Microcontroller Library
2+
* Copyright (c) 2015 Nordic Semiconductor
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 3
31+
32+
typedef enum {
33+
p0 = 0,
34+
p1 = 1,
35+
p2 = 2,
36+
p3 = 3,
37+
p4 = 4,
38+
p5 = 5,
39+
p6 = 6,
40+
p7 = 7,
41+
p8 = 8,
42+
p9 = 9,
43+
p10 = 10,
44+
p11 = 11,
45+
p12 = 12,
46+
p13 = 13,
47+
p14 = 14,
48+
p15 = 15,
49+
p16 = 16,
50+
p17 = 17,
51+
p18 = 18,
52+
p19 = 19,
53+
p20 = 20,
54+
p21 = 21,
55+
p22 = 22,
56+
p23 = 23,
57+
p24 = 24,
58+
p25 = 25,
59+
p26 = 26,
60+
p27 = 27,
61+
p28 = 28,
62+
p29 = 29,
63+
p30 = 30,
64+
65+
P0_0 = p0,
66+
P0_1 = p1,
67+
P0_2 = p2,
68+
P0_3 = p3,
69+
P0_4 = p4,
70+
P0_5 = p5,
71+
P0_6 = p6,
72+
P0_7 = p7,
73+
74+
P0_8 = p8,
75+
P0_9 = p9,
76+
P0_10 = p10,
77+
P0_11 = p11,
78+
P0_12 = p12,
79+
P0_13 = p13,
80+
P0_14 = p14,
81+
P0_15 = p15,
82+
83+
P0_16 = p16,
84+
P0_17 = p17,
85+
P0_18 = p18,
86+
P0_19 = p19,
87+
P0_20 = p20,
88+
P0_21 = p21,
89+
P0_22 = p22,
90+
P0_23 = p23,
91+
92+
P0_24 = p24,
93+
P0_25 = p25,
94+
P0_26 = p26,
95+
P0_27 = p27,
96+
P0_28 = p28,
97+
P0_29 = p29,
98+
P0_30 = p30,
99+
100+
LED1 = p21,
101+
LED2 = p22,
102+
LED3 = p23,
103+
LED4 = p24,
104+
105+
BUTTON1 = p17,
106+
BUTTON2 = p18,
107+
BUTTON3 = p19,
108+
BUTTON4 = p20,
109+
110+
RX_PIN_NUMBER = p11,
111+
TX_PIN_NUMBER = p9,
112+
CTS_PIN_NUMBER = p10,
113+
RTS_PIN_NUMBER = p8,
114+
115+
// mBed interface Pins
116+
USBTX = TX_PIN_NUMBER,
117+
USBRX = RX_PIN_NUMBER,
118+
119+
SPI_PSELMOSI0 = p25,
120+
SPI_PSELMISO0 = p28,
121+
SPI_PSELSS0 = p24,
122+
SPI_PSELSCK0 = p29,
123+
124+
SPI_PSELMOSI1 = p13,
125+
SPI_PSELMISO1 = p14,
126+
SPI_PSELSS1 = p12,
127+
SPI_PSELSCK1 = p15,
128+
129+
SPIS_PSELMOSI = p13,
130+
SPIS_PSELMISO = p14,
131+
SPIS_PSELSS = p12,
132+
SPIS_PSELSCK = p15,
133+
134+
I2C_SDA0 = p30,
135+
I2C_SCL0 = p7,
136+
137+
D0 = p12,
138+
D1 = p13,
139+
D2 = p14,
140+
D3 = p15,
141+
D4 = p16,
142+
D5 = p17,
143+
D6 = p18,
144+
D7 = p19,
145+
146+
D8 = p20,
147+
D9 = p23,
148+
D10 = p24,
149+
D11 = p25,
150+
D12 = p28,
151+
D13 = p29,
152+
153+
D14 = p30,
154+
D15 = p7,
155+
156+
A0 = p1,
157+
A1 = p2,
158+
A2 = p3,
159+
A3 = p4,
160+
A4 = p5,
161+
A5 = p6,
162+
163+
// Not connected
164+
NC = (int)0xFFFFFFFF
165+
} PinName;
166+
167+
typedef enum {
168+
PullNone = 0,
169+
PullDown = 1,
170+
PullUp = 3,
171+
PullDefault = PullUp
172+
} PinMode;
173+
174+
#ifdef __cplusplus
175+
}
176+
#endif
177+
178+
#endif

‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_TY51822R3/device.h

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// The 'features' section in 'target.json' is now used to create the device's hardware preprocessor switches.
2+
// Check the 'features' section of the target description in 'targets.json' for more details.
3+
/* mbed Microcontroller Library
4+
* Copyright (c) 2006-2015 ARM Limited
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
#ifndef MBED_DEVICE_H
19+
#define MBED_DEVICE_H
20+
21+
22+
23+
24+
25+
26+
27+
28+
29+
30+
31+
32+
33+
34+
35+
36+
#include "objects.h"
37+
38+
#endif

0 commit comments

Comments
 (0)