Skip to content

Commit e3dfd9b

Browse files
hjjeon0608hjjeon0608
committed
Merge pull request #1 from Wiznet/mbed_dev3
Change PinName
2 parents cb9d835 + daf4eef commit e3dfd9b

File tree

2 files changed

+93
-55
lines changed

2 files changed

+93
-55
lines changed

‎libraries/mbed/targets/hal/TARGET_WIZNET/TARGET_W7500x/TARGET_WIZwiki_W7500/PeripheralPins.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ const PinMap PinMap_ADC[] = {
4141
{PC_12, ADC_0, WIZ_PIN_DATA(WIZ_MODE_AF, WIZ_GPIO_PULLUP, Px_AFSR_AF3)}, // ADC0_IN3
4242
{PC_11, ADC_0, WIZ_PIN_DATA(WIZ_MODE_AF, WIZ_GPIO_PULLUP, Px_AFSR_AF3)}, // ADC0_IN4
4343
{PC_10, ADC_0, WIZ_PIN_DATA(WIZ_MODE_AF, WIZ_GPIO_PULLUP, Px_AFSR_AF3)}, // ADC0_IN5
44+
{PC_9 , ADC_0, WIZ_PIN_DATA(WIZ_MODE_AF, WIZ_GPIO_PULLUP, Px_AFSR_AF3)}, // ADC0_IN6
45+
{PC_8 , ADC_0, WIZ_PIN_DATA(WIZ_MODE_AF, WIZ_GPIO_PULLUP, Px_AFSR_AF3)}, // ADC0_IN7
4446
{NC, NC, 0}
4547
};
4648

‎libraries/mbed/targets/hal/TARGET_WIZNET/TARGET_W7500x/TARGET_WIZwiki_W7500/PinNames.h

Lines changed: 91 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ typedef enum {
8383
PA_14 = 0x00E,
8484
PA_15 = 0x00F,
8585

86-
PB_0 = 0x010, //SSEL1/SD_SEL
87-
PB_1 = 0x011, //SCLK1/SD_CLK
88-
PB_2 = 0x012, //MISO1/SD_MISO
89-
PB_3 = 0x013, //MOSI1/SD_MOSI
86+
PB_0 = 0x010,
87+
PB_1 = 0x011,
88+
PB_2 = 0x012,
89+
PB_3 = 0x013,
9090
PB_4 = 0x014,
9191
PB_5 = 0x015,
9292
PB_6 = 0x016,
@@ -100,81 +100,117 @@ typedef enum {
100100
PB_14 = 0x01E,
101101
PB_15 = 0x01F,
102102

103-
PC_0 = 0x020, // 0xx:U_CTS1, 1xx:GPIOC_0, 2xx:PWM0
104-
PC_1 = 0x021, // 0xx:U_RTS1, 1xx:GPIOC_1, 2xx:PWM1
103+
PC_0 = 0x020,
104+
PC_1 = 0x021,
105105
PC_2 = 0x022,
106106
PC_3 = 0x023,
107-
PC_4 = 0x024, // 0xx:SDA1, 1xx:GPIOC_4, 2xx:PWM4
107+
PC_4 = 0x024,
108108
PC_5 = 0x025,
109109
PC_6 = 0x026,
110110
PC_7 = 0x027,
111-
PC_8 = 0x028, // 0xx:PWM0, 1xx:GPIOC_8, 2xx:SCL0, 3xx:AIN7
112-
PC_9 = 0x029, // 0xx:PWM1, 1xx:GPIOC_9, 2xx:SDA0, 3xx:AIN6
111+
PC_8 = 0x028,
112+
PC_9 = 0x029,
113113

114-
PC_10 = 0x02A, // 0xx:U_TXD2, 1xx:GPIOC_10, 2xx:PWM2, 3xx:AIN5
115-
PC_11 = 0x02B, // 0xx:U_RXD2, 1xx:GPIOC_11, 2xx:PWM3, 3xx:AIN4
116-
PC_12 = 0x02C, // 0xx:AIN3, 1xx:GPIOC_12, 2xx:SSEL0, 3xx:AIN3
117-
PC_13 = 0x02D, // 0xx:AIN2, 1xx:GPIOC_13, 2xx:SCLK0, 3xx:AIN2
118-
PC_14 = 0x02E, // 0xx:AIN1, 1xx:GPIOC_14, 2xx:MISO0, 3xx:AIN1
119-
PC_15 = 0x02F, // 0xx:AIN0, 1xx:GPIOC_15, 2xx:MOSI0, 3xx:AIN0
114+
PC_10 = 0x02A,
115+
PC_11 = 0x02B,
116+
PC_12 = 0x02C,
117+
PC_13 = 0x02D,
118+
PC_14 = 0x02E,
119+
PC_15 = 0x02F,
120120

121121
PD_0 = 0x030,
122122
PD_1 = 0x031,
123123
PD_2 = 0x032,
124124
PD_3 = 0x033,
125125
PD_4 = 0x034,
126126

127-
127+
PA_00 = PA_0,
128+
PA_01 = PA_1,
129+
PA_02 = PA_2,
130+
PA_03 = PA_3,
131+
PA_04 = PA_4,
132+
PA_05 = PA_5,
133+
PA_06 = PA_6,
134+
PA_07 = PA_7,
135+
PA_08 = PA_8,
136+
PA_09 = PA_9,
137+
138+
PB_00 = PB_0,
139+
PB_01 = PB_1,
140+
PB_02 = PB_2,
141+
PB_03 = PB_3,
142+
PB_04 = PB_4,
143+
PB_05 = PB_5,
144+
PB_06 = PB_6,
145+
PB_07 = PB_7,
146+
PB_08 = PB_8,
147+
PB_09 = PB_9,
148+
149+
PC_00 = PC_0,
150+
PC_01 = PC_1,
151+
PC_02 = PC_2,
152+
PC_03 = PC_3,
153+
PC_04 = PC_4,
154+
PC_05 = PC_5,
155+
PC_06 = PC_6,
156+
PC_07 = PC_7,
157+
PC_08 = PC_8,
158+
PC_09 = PC_9,
159+
160+
PD_00 = PD_0,
161+
PD_01 = PD_1,
162+
PD_02 = PD_2,
163+
PD_03 = PD_3,
164+
PD_04 = PD_4,
165+
128166
// Arduino connector namings
129-
A0 = PC_15, // AIN0
130-
A1 = PC_14, // AIN1
131-
A2 = PC_13, // AIN2
132-
A3 = PC_12, // AIN3
133-
A4 = PC_11, // AIN4
134-
A5 = PC_10, // AIN5
135-
D0 = PA_14, // U_TXD0
136-
D1 = PA_13, // U_RXD0
137-
D2 = PC_1, // GPIOC_1, EXTI
138-
D3 = PC_0, // GPIOC_0, EXTI
139-
D4 = PA_2, // GPIOA_2,
140-
D5 = PA_1, // GPIOA_1,
141-
D6 = PA_0, // GPIOA_0,
142-
D7 = PC_6, // GPIOC_6, EXTI
143-
D8 = PC_7, // GPIOC_7, EXTI
144-
D9 = PC_4, // GPIOC_4, EXTI
145-
D10 = PA_5, // SSEL0
146-
D11 = PA_8, // MOSI0
147-
D12 = PA_7, // MISO0
148-
D13 = PA_6, // SCLK0
149-
D14 = PA_10, // SDA0
150-
D15 = PA_9, // SCL0
167+
A0 = PC_15, // AIN0
168+
A1 = PC_14, // AIN1
169+
A2 = PC_13, // AIN2
170+
A3 = PC_12, // AIN3
171+
A4 = PC_11, // AIN4
172+
A5 = PC_10, // AIN5
173+
A6 = PC_9, // AIN6
174+
A7 = PC_8, // AIN7
175+
D0 = PA_14,
176+
D1 = PA_13,
177+
D2 = PC_1,
178+
D3 = PC_0,
179+
D4 = PA_2,
180+
D5 = PA_1,
181+
D6 = PA_0,
182+
D7 = PC_6,
183+
D8 = PC_7,
184+
D9 = PC_4,
185+
D10 = PA_5,
186+
D11 = PA_8,
187+
D12 = PA_7,
188+
D13 = PA_6,
189+
D14 = PA_10,
190+
D15 = PA_9,
151191

152192
// Generic signals namings
153-
LED_RED = PC_8,
154-
LED_GREEN = PC_9,
155-
LED_BLUE = PC_5,
193+
LED_RED = PC_8,
194+
LED_GREEN = PC_9,
195+
LED_BLUE = PC_5,
156196

157197
LED1 = LED_RED,
158198
LED2 = LED_GREEN,
159199
LED3 = LED_BLUE,
160200
LED4 = LED_BLUE,
161201

162-
// USER_BUTTON = PC_13,
163-
SERIAL_TX = PC_2, // U_TXD1
164-
SERIAL_RX = PC_3, // U_RXD1
165-
USBTX = SERIAL_TX,
166-
USBRX = SERIAL_RX,
167-
I2C_SCL = PA_9, // SCL0
168-
I2C_SDA = PA_10, // SDA0
169-
SPI_MOSI = PA_8, // MISO0
170-
SPI_MISO = PA_7, // MOSI0
171-
SPI_SCK = PA_9, // SCL0
172-
SPI_CS = PA_5, // SSEL0
173-
SD_SEL = PB_0, // SSEL1
174-
SD_CLK = PB_1, // SCL1
202+
LEDR = LED_RED,
203+
LEDG = LED_GREEN,
204+
LEDB = LED_BLUE,
205+
206+
USBTX = PC_2,
207+
USBRX = PC_3,
208+
209+
//Use SPI1
210+
SD_SEL = PB_0, // SPI1_CS
211+
SD_CLK = PB_1, // SPI1_CLK
175212
SD_MISO = PB_2, // MOSI1
176213
SD_MOSI = PB_3, // MISO1
177-
// PWM_OUT = PC_7,
178214

179215
// Not connected
180216
NC = (int)0xFFFFFFFF

0 commit comments

Comments
 (0)