Skip to content

Commit 17a88a8

Browse files
theotherjimmytheotherjimmy
authored
Merge pull request #4557 from mmorenobarm/master
Enable I2C and Analogin drivers for CM3DS_MPS2 target
2 parents 72bdeef + 6b04bb3 commit 17a88a8

File tree

14 files changed

+860
-607
lines changed

14 files changed

+860
-607
lines changed

‎targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/PinNames.h

Lines changed: 193 additions & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -30,201 +30,204 @@ typedef enum {
3030
#define PORT_SHIFT 5
3131

3232
typedef enum {
33-
// MPS2 EXP Pin Names
34-
EXP0 = 0 ,
35-
EXP1 = 4 ,
36-
EXP2 = 2 ,
37-
EXP3 = 3 ,
38-
EXP4 = 1 ,
39-
EXP5 = 15,
40-
EXP6 = 5 ,
41-
EXP7 = 6 ,
42-
EXP8 = 7 ,
43-
EXP9 = 8 ,
44-
EXP10 =9 ,
45-
EXP11 =13,
46-
EXP12 =10,
47-
EXP13 =11,
48-
EXP14 =12,
49-
EXP15 =14,
50-
EXP16 =18,
51-
EXP17 =19,
52-
EXP18 =20,
53-
EXP19 =21,
54-
EXP20 =52,
55-
EXP21 =53,
56-
EXP22 =54,
57-
EXP23 =55,
58-
EXP24 =56,
59-
EXP25 =57,
60-
61-
EXP26 =16,
62-
EXP27 =25,
63-
EXP28 =24,
64-
EXP29 =31,
65-
EXP30 =17,
66-
EXP31 =23,
67-
EXP32 =27,
68-
EXP33 =30,
69-
EXP34 =26,
70-
EXP35 =28,
71-
EXP36 =29,
72-
EXP37 =58,
73-
EXP38 =48,
74-
EXP39 =49,
75-
EXP40 =50,
76-
EXP41 =22,
77-
EXP42 =59,
78-
EXP43 =60,
79-
EXP44 =51,
80-
EXP45 =61,
81-
EXP46 =62,
82-
EXP47 =63,
83-
EXP48 =64,
84-
EXP49 =65,
85-
EXP50 =66,
86-
EXP51 =67,
33+
/* MPS2 EXP Pin Names */
34+
EXP0 = 0,
35+
EXP1 = 1,
36+
EXP2 = 2,
37+
EXP3 = 3,
38+
EXP4 = 4,
39+
EXP5 = 5,
40+
EXP6 = 6,
41+
EXP7 = 7,
42+
EXP8 = 8,
43+
EXP9 = 9,
44+
EXP10 = 10,
45+
EXP11 = 11,
46+
EXP12 = 12,
47+
EXP13 = 13,
48+
EXP14 = 14,
49+
EXP15 = 15,
50+
EXP16 = 16,
51+
EXP17 = 17,
52+
EXP18 = 18,
53+
EXP19 = 19,
54+
EXP20 = 20,
55+
EXP21 = 21,
56+
EXP22 = 22,
57+
EXP23 = 23,
58+
EXP24 = 24,
59+
EXP25 = 25,
60+
EXP26 = 26,
61+
EXP27 = 27,
62+
EXP28 = 28,
63+
EXP29 = 29,
64+
EXP30 = 30,
65+
EXP31 = 31,
66+
EXP32 = 32,
67+
EXP33 = 33,
68+
EXP34 = 34,
69+
EXP35 = 35,
70+
EXP36 = 36,
71+
EXP37 = 37,
72+
EXP38 = 38,
73+
EXP39 = 39,
74+
EXP40 = 40,
75+
EXP41 = 41,
76+
EXP42 = 42,
77+
EXP43 = 43,
78+
EXP44 = 44,
79+
EXP45 = 45,
80+
EXP46 = 46,
81+
EXP47 = 47,
82+
EXP48 = 48,
83+
EXP49 = 49,
84+
EXP50 = 50,
85+
EXP51 = 51,
8786

8887
// Other mbed Pin Names
8988

90-
//LEDs on mps2
91-
//user leds
92-
USERLED1 = 100,
93-
USERLED2 = 101,
94-
//user switches
95-
USERSW1 = 110,
96-
USERSW2 = 111,
97-
98-
//mcc leds
99-
LED1 = 200,
100-
LED2 = 201,
101-
LED3 = 202,
102-
LED4 = 203,
103-
LED5 = 204,
104-
LED6 = 205,
105-
LED7 = 206,
106-
LED8 = 207,
107-
108-
//MCC Switches
109-
SW1 = 210,
110-
SW2 = 211,
111-
SW3 = 212,
112-
SW4 = 213,
113-
SW5 = 214,
114-
SW6 = 215,
115-
SW7 = 216,
116-
SW8 = 217,
117-
118-
//MPS2 SPI header pins j21
119-
SPI_MOSI = 300,
120-
SPI_MISO = 301,
121-
SPI_SCLK = 302,
122-
SPI_SSEL = 303,
123-
124-
//MPS2 CLCD SPI
125-
CLCD_MOSI = 304,
126-
CLCD_MISO = 305,
127-
CLCD_SCLK = 306,
128-
CLCD_SSEL = 307,
129-
CLCD_RESET = 308,
130-
CLCD_RS = 309,
131-
CLCD_RD = 310,
132-
CLCD_BL_CTRL = 311,
133-
134-
//MPS2 shield 0 SPI
135-
SHIELD_0_SPI_SCK = 320,
136-
SHIELD_0_SPI_MOSI = 321,
137-
SHIELD_0_SPI_MISO = 322,
138-
SHIELD_0_SPI_nCS = 323,
139-
140-
//MPS2 shield 1 SPI
141-
SHIELD_1_SPI_SCK = 331,
142-
SHIELD_1_SPI_MOSI = 332,
143-
SHIELD_1_SPI_MISO = 333,
144-
SHIELD_1_SPI_nCS = 334,
145-
146-
//MPS2 shield ADC SPI
147-
ADC_MOSI = 650,
148-
ADC_MISO = 651,
149-
ADC_SCLK = 652,
150-
ADC_SSEL = 653,
151-
152-
//MPS2 Uart
153-
USBTX = 400,
154-
USBRX = 401,
155-
XB_TX = 402,
156-
XB_RX = 403,
157-
SH0_TX = 404,
158-
SH0_RX = 405,
159-
SH1_TX = 406,
160-
SH1_RX = 407,
161-
MCC_TX = 408,
162-
MCC_RX = 409,
163-
164-
//MPS2 I2C touchscreen and audio
165-
TSC_SDA = 500,
166-
TSC_SCL = 501,
167-
AUD_SDA = 502,
168-
AUD_SCL = 503,
169-
170-
//MPS2 I2C for shield
171-
SHIELD_0_SDA = 504,
172-
SHIELD_0_SCL = 505,
173-
SHIELD_1_SDA = 506,
174-
SHIELD_1_SCL = 507,
175-
176-
//MPS2 shield Analog pins
177-
A0_0 = 600,
178-
A0_1 = 601,
179-
A0_2 = 602,
180-
A0_3 = 603,
181-
A0_4 = 604,
182-
A0_5 = 605,
183-
A1_0 = 606,
184-
A1_1 = 607,
185-
A1_2 = 608,
186-
A1_3 = 609,
187-
A1_4 = 610,
188-
A1_5 = 611,
189-
//MPS2 Shield Digital pins
190-
D0_0 = EXP0,
191-
D0_1 = EXP4,
192-
D0_2 = EXP2,
193-
D0_3 = EXP3,
194-
D0_4 = EXP1,
195-
D0_5 = EXP6,
196-
D0_6 = EXP7,
197-
D0_7 = EXP8,
198-
D0_8 = EXP9,
199-
D0_9 = EXP10,
200-
D0_10 = EXP12,
201-
D0_11 = EXP13,
202-
D0_12 = EXP14,
203-
D0_13 = EXP11,
204-
D0_14 = EXP15,
205-
D0_15 = EXP5,
206-
207-
D1_0 = EXP26,
208-
D1_1 = EXP30,
209-
D1_2 = EXP28,
210-
D1_3 = EXP29,
211-
D1_4 = EXP27,
212-
D1_5 = EXP32,
213-
D1_6 = EXP33,
214-
D1_7 = EXP34,
215-
D1_8 = EXP35,
216-
D1_9 = EXP36,
217-
D1_10 = EXP38,
218-
D1_11 = EXP39,
219-
D1_12 = EXP40,
220-
D1_13 = EXP44,
221-
D1_14 = EXP41,
222-
D1_15 = EXP31,
223-
224-
// Not connected
225-
NC = (int)0xFFFFFFFF,
89+
/* User leds */
90+
USERLED1 = 100,
91+
USERLED2 = 101,
92+
/* User switches */
93+
USERSW1 = 110,
94+
USERSW2 = 111,
95+
96+
/* MCC leds */
97+
LED1 = 200,
98+
LED2 = 201,
99+
LED3 = 202,
100+
LED4 = 203,
101+
LED5 = 204,
102+
LED6 = 205,
103+
LED7 = 206,
104+
LED8 = 207,
105+
106+
/* MCC Switches */
107+
SW1 = 210,
108+
SW2 = 211,
109+
SW3 = 212,
110+
SW4 = 213,
111+
SW5 = 214,
112+
SW6 = 215,
113+
SW7 = 216,
114+
SW8 = 217,
115+
116+
/* MPS2 SPI header pins J21 */
117+
SPI_MOSI = 300,
118+
SPI_MISO = 301,
119+
SPI_SCLK = 302,
120+
SPI_SSEL = 303,
121+
122+
/* MPS2 CLCD SPI */
123+
CLCD_MOSI = 304,
124+
CLCD_MISO = 305,
125+
CLCD_SCLK = 306,
126+
CLCD_SSEL = 307,
127+
CLCD_RESET = 308,
128+
CLCD_RS = 309,
129+
CLCD_RD = 310,
130+
CLCD_BL_CTRL = 311,
131+
132+
/* MPS2 shield 0 SPI */
133+
SHIELD_0_SPI_MOSI = EXP13,
134+
SHIELD_0_SPI_MISO = EXP14,
135+
SHIELD_0_SPI_SCK = EXP11,
136+
SHIELD_0_SPI_nCS = EXP12,
137+
138+
/* MPS2 shield 1 SPI */
139+
SHIELD_1_SPI_MOSI = EXP39,
140+
SHIELD_1_SPI_MISO = EXP40,
141+
SHIELD_1_SPI_SCK = EXP44,
142+
SHIELD_1_SPI_nCS = EXP38,
143+
144+
/* MPS2 shield ADC SPI */
145+
ADC_MOSI = EXP18,
146+
ADC_MISO = EXP17,
147+
ADC_SCLK = EXP19,
148+
ADC_SSEL = EXP16,
149+
150+
/* MPS2 UART */
151+
MCC_TX = 400,
152+
MCC_RX = 401,
153+
USBTX = 402,
154+
USBRX = 403,
155+
XB_TX = EXP24,
156+
XB_RX = EXP23,
157+
SH0_TX = EXP4,
158+
SH0_RX = EXP0,
159+
SH1_TX = EXP30,
160+
SH1_RX = EXP26,
161+
162+
/* MPS2 I2C touchscreen and audio */
163+
TSC_SDA = 500,
164+
TSC_SCL = 501,
165+
AUD_SDA = 502,
166+
AUD_SCL = 503,
167+
168+
/* MPS2 I2C for shield */
169+
SHIELD_0_SDA = EXP15,
170+
SHIELD_0_SCL = EXP5,
171+
SHIELD_1_SDA = EXP41,
172+
SHIELD_1_SCL = EXP31,
173+
174+
/* MPS2 shield Analog pins */
175+
A0_0 = 600,
176+
A0_1 = 601,
177+
A0_2 = 602,
178+
A0_3 = 603,
179+
A0_4 = 604,
180+
A0_5 = 605,
181+
A1_0 = 606,
182+
A1_1 = 607,
183+
A1_2 = 608,
184+
A1_3 = 609,
185+
A1_4 = 610,
186+
A1_5 = 611,
187+
/* MPS2 Shield Digital pins */
188+
D0_0 = EXP0,
189+
D0_1 = EXP4,
190+
D0_2 = EXP2,
191+
D0_3 = EXP3,
192+
D0_4 = EXP1,
193+
D0_5 = EXP6,
194+
D0_6 = EXP7,
195+
D0_7 = EXP8,
196+
D0_8 = EXP9,
197+
D0_9 = EXP10,
198+
D0_10 = EXP12,
199+
D0_11 = EXP13,
200+
D0_12 = EXP14,
201+
D0_13 = EXP11,
202+
D0_14 = EXP15,
203+
D0_15 = EXP5,
204+
205+
D1_0 = EXP26,
206+
D1_1 = EXP30,
207+
D1_2 = EXP28,
208+
D1_3 = EXP29,
209+
D1_4 = EXP27,
210+
D1_5 = EXP32,
211+
D1_6 = EXP33,
212+
D1_7 = EXP34,
213+
D1_8 = EXP35,
214+
D1_9 = EXP36,
215+
D1_10 = EXP38,
216+
D1_11 = EXP39,
217+
D1_12 = EXP40,
218+
D1_13 = EXP44,
219+
D1_14 = EXP41,
220+
D1_15 = EXP31,
221+
222+
/* Not connected */
223+
NC = (int)0xFFFFFFFF,
226224
} PinName;
227225

226+
typedef enum {
227+
ALTERNATE_FUNC = 0, /* The pin is used for alternative function */
228+
GPIO_FUNC = 1 /* The pin is used for GPIO function */
229+
} PinFunction;
230+
228231
typedef enum {
229232
PullUp = 2,
230233
PullDown = 1,

0 commit comments

Comments
 (0)