Skip to content

Commit e011341

Browse files
sg-sg-
authored
Merge pull request #3176 from RidaJichi/master
Modifying micro:bit pin names to mirror micro:bit edge connector
2 parents 89da16e + ac17fb7 commit e011341

File tree

5 files changed

+157
-133
lines changed

5 files changed

+157
-133
lines changed

‎targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,43 @@ typedef enum {
6464
p30 = 30,
6565
p31 = 31,
6666

67+
//NORMAL PINS...
68+
P0_0 = p0,
69+
P0_1 = p1,
70+
P0_2 = p2,
71+
P0_3 = p3,
72+
P0_4 = p4,
73+
P0_5 = p5,
74+
P0_6 = p6,
75+
P0_7 = p7,
76+
77+
P0_8 = p8,
78+
P0_9 = p9,
79+
P0_10 = p10,
80+
P0_11 = p11,
81+
P0_12 = p12,
82+
P0_13 = p13,
83+
P0_14 = p14,
84+
P0_15 = p15,
85+
86+
P0_16 = p16,
87+
P0_17 = p17,
88+
P0_18 = p18,
89+
P0_19 = p19,
90+
P0_20 = p20,
91+
P0_21 = p21,
92+
P0_22 = p22,
93+
P0_23 = p23,
94+
95+
P0_24 = p24,
96+
P0_25 = p25,
97+
P0_26 = p26,
98+
P0_27 = p27,
99+
P0_28 = p28,
100+
P0_29 = p29,
101+
P0_30 = p30,
102+
P0_31 = p31,
103+
67104
LED1 = p4,
68105
LED2 = p5,
69106
LED3 = p6,

‎targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_DONGLE/PinNames.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ typedef enum {
9191
P0_25 = p25,
9292
P0_28 = p28,
9393
P0_29 = p29,
94+
P0_30 = p30,
9495

9596
LED1 = p21,
9697
LED2 = p22,

‎targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/PinNames.h

Lines changed: 82 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -30,134 +30,120 @@ typedef enum {
3030
#define PORT_SHIFT 3
3131

3232
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-
//NORMAL PINS...
66-
P0_0 = p0,
67-
P0_1 = p1,
68-
P0_2 = p2,
69-
P0_3 = p3,
70-
P0_4 = p4,
71-
P0_5 = p5,
72-
P0_6 = p6,
73-
P0_7 = p7,
74-
75-
P0_8 = p8,
76-
P0_9 = p9,
77-
P0_10 = p10,
78-
P0_11 = p11,
79-
P0_12 = p12,
80-
P0_13 = p13,
81-
P0_14 = p14,
82-
P0_15 = p15,
83-
84-
P0_16 = p16,
85-
P0_17 = p17,
86-
P0_18 = p18,
87-
P0_19 = p19,
88-
P0_20 = p20,
89-
P0_21 = p21,
90-
P0_22 = p22,
91-
P0_23 = p23,
92-
93-
P0_24 = p24,
94-
P0_25 = p25,
95-
P0_26 = p26,
96-
P0_27 = p27,
97-
P0_28 = p28,
98-
P0_29 = p29,
99-
P0_30 = p30,
100-
33+
//MCU PINS
34+
P0_0 = 0,
35+
P0_1 = 1,
36+
P0_2 = 2,
37+
P0_3 = 3,
38+
P0_4 = 4,
39+
P0_5 = 5,
40+
P0_6 = 6,
41+
P0_7 = 7,
42+
P0_8 = 8,
43+
P0_9 = 9,
44+
P0_10 = 10,
45+
P0_11 = 11,
46+
P0_12 = 12,
47+
P0_13 = 13,
48+
P0_14 = 14,
49+
P0_15 = 15,
50+
P0_16 = 16,
51+
P0_17 = 17,
52+
P0_18 = 18,
53+
P0_19 = 19,
54+
P0_20 = 20,
55+
P0_21 = 21,
56+
P0_22 = 22,
57+
P0_23 = 23,
58+
P0_24 = 24,
59+
P0_25 = 25,
60+
P0_26 = 26,
61+
P0_27 = 27,
62+
P0_28 = 28,
63+
P0_29 = 29,
64+
P0_30 = 30,
65+
66+
//MICROBIT EDGE CONNECTOR PINS
67+
P0 = P0_3,
68+
P1 = P0_2,
69+
P2 = P0_1,
70+
P3 = P0_4,
71+
P4 = P0_5,
72+
P5 = P0_17,
73+
P6 = P0_12,
74+
P7 = P0_11,
75+
P8 = P0_18,
76+
P9 = P0_10,
77+
P10 = P0_6,
78+
P11 = P0_26,
79+
P12 = P0_20,
80+
P13 = P0_23,
81+
P14 = P0_22,
82+
P15 = P0_21,
83+
P16 = P0_16,
84+
P19 = P0_0,
85+
P20 = P0_30,
86+
10187
//PADS
102-
PAD3 = p1,
103-
PAD2 = p2,
104-
PAD1 = p3,
88+
PAD3 = P0_1,
89+
PAD2 = P0_2,
90+
PAD1 = P0_3,
10591

10692

10793
//LED MATRIX COLS
108-
COL1 = p4,
109-
COL2 = p5,
110-
COL3 = p6,
111-
COL4 = p7,
112-
COL5 = p8,
113-
COL6 = p9,
114-
COL7 = p10,
115-
COL8 = p11,
116-
COL9 = p12,
94+
COL1 = P0_4,
95+
COL2 = P0_5,
96+
COL3 = P0_6,
97+
COL4 = P0_7,
98+
COL5 = P0_8,
99+
COL6 = P0_9,
100+
COL7 = P0_10,
101+
COL8 = P0_11,
102+
COL9 = P0_12,
117103

118104
//LED MATRIX ROWS
119-
ROW1 = p13,
120-
ROW2 = p14,
121-
ROW3 = p15,
105+
ROW1 = P0_13,
106+
ROW2 = P0_14,
107+
ROW3 = P0_15,
122108

123109
//NORMAL PIN (NO SPECIFIED FUNCTIONALITY)
124110
//PIN_16
125111

126112
// BUTTON A
127-
BUTTON_A = p17,
113+
BUTTON_A = P0_17,
128114

129115

130116
//NORMAL PIN (NO SPECIFIED FUNCTIONALITY)
131117
//PIN_18
132118

133119
//TARGET RESET
134-
TGT_NRESET = p19,
120+
TGT_NRESET = P0_19,
135121

136122
//NORMAL PIN (NO SPECIFIED FUNCTIONALITY)
137123
//PIN_20
138124

139125
//MASTER OUT SLAVE IN
140-
MOSI = p21,
126+
MOSI = P0_21,
141127

142128
//MASTER IN SLAVE OUT
143-
MISO = p22,
129+
MISO = P0_22,
144130

145131
//SERIAL CLOCK
146-
SCK = p23,
132+
SCK = P0_23,
147133

148134
// RX AND TX PINS
149-
TGT_TX = p24,
150-
TGT_RX = p25,
135+
TGT_TX = P0_24,
136+
TGT_RX = P0_25,
151137

152138
//BUTTON B
153-
BUTTON_B = p26,
139+
BUTTON_B = P0_26,
154140

155141
//ACCEL INTERRUPT PINS (MMA8653FC)
156-
ACCEL_INT2 = p27,
157-
ACCEL_INT1 = p28,
142+
ACCEL_INT2 = P0_27,
143+
ACCEL_INT1 = P0_28,
158144

159145
//MAGENETOMETER INTERRUPT PIN (MAG3110)
160-
MAG_INT1 = p29,
146+
MAG_INT1 = P0_29,
161147

162148
// Not connected
163149
NC = (int)0xFFFFFFFF,
@@ -177,10 +163,10 @@ typedef enum {
177163
LED4 = P0_16,
178164

179165
//SDA (SERIAL DATA LINE)
180-
I2C_SDA0 = p30,
166+
I2C_SDA0 = P0_30,
181167

182168
//SCL (SERIAL CLOCK LINE)
183-
I2C_SCL0 = p0
169+
I2C_SCL0 = P0_0
184170

185171
} PinName;
186172

‎targets/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
#define ADC_RANGE ADC_10BIT_RANGE
2424

2525
static const PinMap PinMap_ADC[] = {
26-
{p1, ADC0_0, 4},
27-
{p2, ADC0_0, 8},
28-
{p3, ADC0_0, 16},
29-
{p4, ADC0_0, 32},
30-
{p5, ADC0_0, 64},
31-
{p6, ADC0_0, 128},
26+
{P0_1, ADC0_0, 4},
27+
{P0_2, ADC0_0, 8},
28+
{P0_3, ADC0_0, 16},
29+
{P0_4, ADC0_0, 32},
30+
{P0_5, ADC0_0, 64},
31+
{P0_6, ADC0_0, 128},
3232
#ifndef TARGET_NRF51_DONGLE
33-
{p26, ADC0_0, 1},
34-
{p27, ADC0_0, 2},
33+
{P0_26, ADC0_0, 1},
34+
{P0_27, ADC0_0, 2},
3535
#endif
3636
{NC, NC, 0}
3737
};

‎targets/TARGET_NORDIC/TARGET_MCU_NRF51822/pwmout_api.c

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,35 @@
2323
#define TIMER_PRECISION 4 //4us ticks
2424
#define TIMER_PRESCALER 6 //4us ticks = 16Mhz/(2**6)
2525
static const PinMap PinMap_PWM[] = {
26-
{p0, PWM_1, 1},
27-
{p1, PWM_1, 1},
28-
{p2, PWM_1, 1},
29-
{p3, PWM_1, 1},
30-
{p4, PWM_1, 1},
31-
{p5, PWM_1, 1},
32-
{p6, PWM_1, 1},
33-
{p7, PWM_1, 1},
34-
{p8, PWM_1, 1},
35-
{p9, PWM_1, 1},
36-
{p10, PWM_1, 1},
37-
{p11, PWM_1, 1},
38-
{p12, PWM_1, 1},
39-
{p13, PWM_1, 1},
40-
{p14, PWM_1, 1},
41-
{p15, PWM_1, 1},
42-
{p16, PWM_1, 1},
43-
{p17, PWM_1, 1},
44-
{p18, PWM_1, 1},
45-
{p19, PWM_1, 1},
46-
{p20, PWM_1, 1},
47-
{p21, PWM_1, 1},
48-
{p22, PWM_1, 1},
49-
{p23, PWM_1, 1},
50-
{p24, PWM_1, 1},
51-
{p25, PWM_1, 1},
52-
{p28, PWM_1, 1},
53-
{p29, PWM_1, 1},
54-
{p30, PWM_1, 1},
26+
{P0_0, PWM_1, 1},
27+
{P0_1, PWM_1, 1},
28+
{P0_2, PWM_1, 1},
29+
{P0_3, PWM_1, 1},
30+
{P0_4, PWM_1, 1},
31+
{P0_5, PWM_1, 1},
32+
{P0_6, PWM_1, 1},
33+
{P0_7, PWM_1, 1},
34+
{P0_8, PWM_1, 1},
35+
{P0_9, PWM_1, 1},
36+
{P0_10, PWM_1, 1},
37+
{P0_11, PWM_1, 1},
38+
{P0_12, PWM_1, 1},
39+
{P0_13, PWM_1, 1},
40+
{P0_14, PWM_1, 1},
41+
{P0_15, PWM_1, 1},
42+
{P0_16, PWM_1, 1},
43+
{P0_17, PWM_1, 1},
44+
{P0_18, PWM_1, 1},
45+
{P0_19, PWM_1, 1},
46+
{P0_20, PWM_1, 1},
47+
{P0_21, PWM_1, 1},
48+
{P0_22, PWM_1, 1},
49+
{P0_23, PWM_1, 1},
50+
{P0_24, PWM_1, 1},
51+
{P0_25, PWM_1, 1},
52+
{P0_28, PWM_1, 1},
53+
{P0_29, PWM_1, 1},
54+
{P0_30, PWM_1, 1},
5555
{NC, NC, 0}
5656
};
5757

0 commit comments

Comments
 (0)