Skip to content

Commit 2fbfed0

Browse files
fpistmfpistm
committed
Fix compiler warning: initialization makes integer from pointer without a cast
Fix #44 Using a uint32_t was a legacy from mbed pinmap feature. This allow to be compatible with high leve api common to all mbed target. There is not reason to keep it for Arduino. Peripheral(SPIx, DACx, TIMx,...) is a pointer so manage it as it is to avoid cast. system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h:1245:29: warning: initialization makes integer from pointer without a cast [-Wint-conversion] #define ADC1 ((ADC_TypeDef *) ADC1_BASE) ^ /local/data/work/stm32/stm32duino/arduino-1.8.3/hardware/STM32/stm32/variants/NUCLEO_F429ZI/PeripheralPins.c:41:13: note: in expansion of macro 'ADC1' {PA0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0 - PA0/WKUP ^~~~ ... Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>
1 parent c62250c commit 2fbfed0

File tree

15 files changed

+170
-168
lines changed

15 files changed

+170
-168
lines changed

‎cores/arduino/stm32/analog.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ void dac_write_value(PinName pin, uint32_t value, uint8_t do_init)
292292
uint32_t dacChannel;
293293

294294
DacHandle.Instance = pinmap_peripheral(pin, PinMap_DAC);
295-
if (DacHandle.Instance == NC) return;
295+
if (DacHandle.Instance == NP) return;
296296
dacChannel = get_dac_channel(pin);
297297
if (!IS_DAC_CHANNEL(dacChannel)) return;
298298
if(do_init == 1) {
@@ -362,7 +362,7 @@ void dac_stop(PinName pin)
362362
uint32_t dacChannel;
363363

364364
DacHandle.Instance = pinmap_peripheral(pin, PinMap_DAC);
365-
if (DacHandle.Instance == NC) return;
365+
if (DacHandle.Instance == NP) return;
366366
dacChannel = get_dac_channel(pin);
367367
if (!IS_DAC_CHANNEL(dacChannel)) return;
368368

@@ -553,7 +553,7 @@ uint16_t adc_read_value(PinName pin)
553553

554554
AdcHandle.Instance = pinmap_peripheral(pin, PinMap_ADC);
555555

556-
if (AdcHandle.Instance == NC) return 0;
556+
if (AdcHandle.Instance == NP) return 0;
557557

558558
AdcHandle.Init.ClockPrescaler = ADC_CLOCK_DIV; /* Asynchronous clock mode, input ADC clock divided */
559559
AdcHandle.Init.Resolution = ADC_RESOLUTION_12B; /* 12-bit resolution for converted data */
@@ -720,7 +720,7 @@ void pwm_start(PinName pin, uint32_t clock_freq,
720720

721721
/* Compute the prescaler value to have TIM counter clock equal to clock_freq Hz */
722722
timHandle.Instance = pinmap_peripheral(pin, PinMap_PWM);
723-
if (timHandle.Instance == NC) return;
723+
if (timHandle.Instance == NP) return;
724724
timHandle.Init.Prescaler = (uint32_t)(getTimerClkFreq(timHandle.Instance) / clock_freq) - 1;
725725
timHandle.Init.Period = period -1;
726726
timHandle.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
@@ -781,7 +781,7 @@ void pwm_stop(PinName pin)
781781
uint32_t timChannel;
782782

783783
timHandle.Instance = pinmap_peripheral(pin, PinMap_PWM);
784-
if (timHandle.Instance == NC) return;
784+
if (timHandle.Instance == NP) return;
785785
timChannel = get_pwm_channel(pin);
786786
if (!IS_TIM_CHANNELS(timChannel)) return;
787787

‎cores/arduino/stm32/pinmap.c‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,22 @@
1717

1818
#include "pinmap.h"
1919

20-
uint32_t pinmap_find_peripheral(PinName pin, const PinMap* map) {
20+
void* pinmap_find_peripheral(PinName pin, const PinMap* map) {
2121
while (map->pin != NC) {
2222
if (map->pin == pin)
2323
return map->peripheral;
2424
map++;
2525
}
26-
return (uint32_t)NC;
26+
return NP;
2727
}
2828

29-
uint32_t pinmap_peripheral(PinName pin, const PinMap* map) {
30-
uint32_t peripheral = (uint32_t)NC;
29+
void* pinmap_peripheral(PinName pin, const PinMap* map) {
30+
void* peripheral = NP;
3131

32-
if (pin == (PinName)NC)
33-
return (uint32_t)NC;
34-
peripheral = pinmap_find_peripheral(pin, map);
35-
//if ((uint32_t)NC == peripheral) // no mapping available
36-
// error("pinmap not found for peripheral");
32+
if (pin != (PinName)NC) {
33+
peripheral = pinmap_find_peripheral(pin, map);
34+
}
35+
// else error("pinmap not found for peripheral");
3736
return peripheral;
3837
}
3938

@@ -49,11 +48,10 @@ uint32_t pinmap_find_function(PinName pin, const PinMap* map) {
4948
uint32_t pinmap_function(PinName pin, const PinMap* map) {
5049
uint32_t function = (uint32_t)NC;
5150

52-
if (pin == (PinName)NC)
53-
return (uint32_t)NC;
54-
function = pinmap_find_function(pin, map);
55-
//if ((uint32_t)NC == function) // no mapping available
56-
// error("pinmap not found for function");
51+
if (pin != (PinName)NC) {
52+
function = pinmap_find_function(pin, map);
53+
}
54+
// else error("pinmap not found for function");
5755
return function;
5856
}
5957

@@ -68,18 +66,19 @@ bool pin_in_pinmap(PinName pin, const PinMap* map) {
6866
return false;
6967
}
7068

71-
uint32_t pinmap_merge(uint32_t a, uint32_t b) {
72-
// both are the same (inc both NC)
69+
// Merge peripherals
70+
void* pinmap_merge_peripheral(void* a, void* b) {
71+
// both are the same (inc both NP)
7372
if (a == b)
7473
return a;
7574

76-
// one (or both) is not connected
77-
if (a == (uint32_t)NC)
75+
// one (or both) is not set
76+
if (a == NP)
7877
return b;
79-
if (b == (uint32_t)NC)
78+
if (b == NP)
8079
return a;
8180

8281
// mis-match error case
8382
// error("pinmap mis-match");
84-
return (uint32_t)NC;
83+
return NP;
8584
}

‎cores/arduino/stm32/pinmap.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,23 @@
2727
extern "C" {
2828
#endif
2929

30+
// No peripheral
31+
#define NP 0U
32+
3033
typedef struct {
3134
PinName pin;
32-
int peripheral;
35+
void* peripheral;
3336
int function;
3437
} PinMap;
3538

3639
bool pin_in_pinmap(PinName pin, const PinMap* map);
3740
void pin_function(PinName pin, int function);
3841

39-
uint32_t pinmap_peripheral(PinName pin, const PinMap* map);
42+
void* pinmap_peripheral(PinName pin, const PinMap* map);
4043
uint32_t pinmap_function(PinName pin, const PinMap* map);
41-
uint32_t pinmap_find_peripheral(PinName pin, const PinMap* map);
44+
void* pinmap_find_peripheral(PinName pin, const PinMap* map);
4245
uint32_t pinmap_find_function(PinName pin, const PinMap* map);
43-
uint32_t pinmap_merge(uint32_t a, uint32_t b);
46+
void* pinmap_merge_peripheral(void* a, void* b);
4447

4548
#ifdef __cplusplus
4649
}

‎cores/arduino/stm32/spi_com.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ uint32_t spi_getClkFreqInst(SPI_TypeDef * spi_inst)
114114
/* SPIx source CLK is PCKL1 */
115115
spi_freq = HAL_RCC_GetPCLK1Freq();
116116
#else
117-
if(spi_inst != (SPI_TypeDef *)NC) {
117+
if(spi_inst != NP) {
118118
/* Get source clock depending on SPI instance */
119119
switch ((uint32_t)spi_inst) {
120120
case (uint32_t)SPI1:
@@ -153,13 +153,13 @@ uint32_t spi_getClkFreqInst(SPI_TypeDef * spi_inst)
153153
*/
154154
uint32_t spi_getClkFreq(spi_t *obj)
155155
{
156-
uint32_t spi_inst = NC;
156+
SPI_TypeDef *spi_inst = NP;
157157
uint32_t spi_freq = SystemCoreClock;
158158

159159
if(obj != NULL) {
160160
spi_inst = pinmap_peripheral(obj->pin_sclk, PinMap_SPI_SCLK);
161161

162-
if(spi_inst != NC) {
162+
if(spi_inst != NP) {
163163
spi_freq = spi_getClkFreqInst(spi_inst);
164164
}
165165
}
@@ -185,23 +185,23 @@ void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb)
185185
uint32_t spi_freq = 0;
186186

187187
// Determine the SPI to use
188-
uint32_t spi_mosi = pinmap_peripheral(obj->pin_mosi, PinMap_SPI_MOSI);
189-
uint32_t spi_miso = pinmap_peripheral(obj->pin_miso, PinMap_SPI_MISO);
190-
uint32_t spi_sclk = pinmap_peripheral(obj->pin_sclk, PinMap_SPI_SCLK);
191-
uint32_t spi_ssel = pinmap_peripheral(obj->pin_ssel, PinMap_SPI_SSEL);
188+
SPI_TypeDef *spi_mosi = pinmap_peripheral(obj->pin_mosi, PinMap_SPI_MOSI);
189+
SPI_TypeDef *spi_miso = pinmap_peripheral(obj->pin_miso, PinMap_SPI_MISO);
190+
SPI_TypeDef *spi_sclk = pinmap_peripheral(obj->pin_sclk, PinMap_SPI_SCLK);
191+
SPI_TypeDef *spi_ssel = pinmap_peripheral(obj->pin_ssel, PinMap_SPI_SSEL);
192192

193-
/* Pins MOSI/MISO/SCLK must not be NC. ssel can be NC. */
194-
if(spi_mosi == NC || spi_miso == NC || spi_sclk == NC) {
193+
/* Pins MOSI/MISO/SCLK must not be NP. ssel can be NP. */
194+
if(spi_mosi == NP || spi_miso == NP || spi_sclk == NP) {
195195
return;
196196
}
197197

198-
uint32_t spi_data = pinmap_merge(spi_mosi, spi_miso);
199-
uint32_t spi_cntl = pinmap_merge(spi_sclk, spi_ssel);
198+
SPI_TypeDef *spi_data = pinmap_merge_peripheral(spi_mosi, spi_miso);
199+
SPI_TypeDef *spi_cntl = pinmap_merge_peripheral(spi_sclk, spi_ssel);
200200

201-
obj->spi = (SPI_TypeDef *)pinmap_merge(spi_data, spi_cntl);
201+
obj->spi = pinmap_merge_peripheral(spi_data, spi_cntl);
202202

203203
// Are all pins connected to the same SPI instance?
204-
if(obj->spi == (SPI_TypeDef *)NC) {
204+
if(obj->spi == NP) {
205205
printf("ERROR: SPI pins mismatch\n");
206206
return;
207207
}

‎cores/arduino/stm32/twi.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
151151
I2C_HandleTypeDef *handle = &(obj->handle);
152152

153153
// Determine the I2C to use
154-
uint32_t i2c_sda = pinmap_peripheral(obj->sda, PinMap_I2C_SDA);
155-
uint32_t i2c_scl = pinmap_peripheral(obj->scl, PinMap_I2C_SCL);
154+
I2C_TypeDef *i2c_sda = pinmap_peripheral(obj->sda, PinMap_I2C_SDA);
155+
I2C_TypeDef *i2c_scl = pinmap_peripheral(obj->scl, PinMap_I2C_SCL);
156156

157-
obj->i2c = (I2C_TypeDef *)pinmap_merge(i2c_sda, i2c_scl);
157+
obj->i2c = pinmap_merge_peripheral(i2c_sda, i2c_scl);
158158

159-
if(obj->i2c == (I2C_TypeDef *)NC) {
159+
if(obj->i2c == NP) {
160160
printf("ERROR: I2C pins mismatch\n");
161161
return;
162162
}

‎cores/arduino/stm32/uart.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@ void uart_init(serial_t *obj)
128128
GPIO_TypeDef *port;
129129

130130
// Determine the UART to use (UART_1, UART_2, ...)
131-
uint32_t uart_tx = (uint32_t)pinmap_peripheral(obj->pin_tx, PinMap_UART_TX);
132-
uint32_t uart_rx = (uint32_t)pinmap_peripheral(obj->pin_rx, PinMap_UART_RX);
131+
USART_TypeDef *uart_tx = pinmap_peripheral(obj->pin_tx, PinMap_UART_TX);
132+
USART_TypeDef *uart_rx = pinmap_peripheral(obj->pin_rx, PinMap_UART_RX);
133133

134134
// Get the peripheral name (UART_1, UART_2, ...) from the pin and assign it to the object
135-
obj->uart = (USART_TypeDef *)pinmap_merge(uart_tx, uart_rx);
135+
obj->uart = pinmap_merge_peripheral(uart_tx, uart_rx);
136136

137-
if(obj->uart == (USART_TypeDef *)NC) {
137+
if(obj->uart == NP) {
138138
printf("ERROR: UART pins mismatch\n");
139139
return;
140140
}

‎cores/arduino/stm32/uart_emul.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,10 +390,10 @@ void HAL_UART_Emul_RxCpltCallback(UART_Emul_HandleTypeDef *huart)
390390

391391
if(g_uartEmul_config[UART1_EMUL_E].uart_rx_irqHandle != NULL) {
392392
if(uart_emul_available(UART1_EMUL_E) < (UART_RCV_SIZE / 2)) {
393-
setTimerCounter(g_uartEmul_config[UART1_EMUL_E]._timer->timer, 0);
393+
setTimerCounter((stimer_t *)g_uartEmul_config[UART1_EMUL_E]._timer->timer, 0);
394394
}
395395
else if(uart_emul_available(UART1_EMUL_E) < (UART_RCV_SIZE/4*3)) {
396-
setTimerCounter(g_uartEmul_config[UART1_EMUL_E]._timer->timer, EMUL_TIMER_PERIOD - 1);
396+
setTimerCounter((stimer_t *)g_uartEmul_config[UART1_EMUL_E]._timer->timer, EMUL_TIMER_PERIOD - 1);
397397
}
398398
else {
399399
g_uartEmul_config[UART1_EMUL_E].uart_rx_irqHandle();

‎variants/DISCO_F407VG/PeripheralPins.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ const PinMap PinMap_ADC[] = {
7878
{PC4, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
7979
{PC5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
8080
// {PC5, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
81-
{NC, NC, 0}
81+
{NC, NP, 0}
8282
};
8383

8484
//*** DAC ***
8585

8686
const PinMap PinMap_DAC[] = {
8787
// {PA4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1 - I2S3_WS
8888
{PA5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2
89-
{NC, NC, 0}
89+
{NC, NP, 0}
9090
};
9191

9292
//*** I2C ***
@@ -96,15 +96,15 @@ const PinMap PinMap_I2C_SDA[] = {
9696
// {PB9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // Audio_SDA
9797
{PB11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
9898
{PC9, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
99-
{NC, NC, 0}
99+
{NC, NP, 0}
100100
};
101101

102102
const PinMap PinMap_I2C_SCL[] = {
103103
{PA8, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
104104
// {PB6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // Audio_SCL
105105
{PB8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
106106
// {PB10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, // Mic CLK
107-
{NC, NC, 0}
107+
{NC, NP, 0}
108108
};
109109

110110
//*** PWM ***
@@ -178,7 +178,7 @@ const PinMap PinMap_PWM[] = {
178178
{PE12, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
179179
{PE13, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
180180
{PE14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
181-
{NC, NC, 0}
181+
{NC, NP, 0}
182182
};
183183

184184
//*** SERIAL ***
@@ -195,7 +195,7 @@ const PinMap PinMap_UART_TX[] = {
195195
// {PC12, UART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)}, // I2S3_SD
196196
// {PD5, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // USB
197197
{PD8, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
198-
{NC, NC, 0}
198+
{NC, NP, 0}
199199
};
200200

201201
const PinMap PinMap_UART_RX[] = {
@@ -210,7 +210,7 @@ const PinMap PinMap_UART_RX[] = {
210210
{PD2, UART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
211211
{PD6, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
212212
{PD9, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
213-
{NC, NC, 0}
213+
{NC, NP, 0}
214214
};
215215

216216
const PinMap PinMap_UART_RTS[] = {
@@ -219,7 +219,7 @@ const PinMap PinMap_UART_RTS[] = {
219219
{PB14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
220220
// {PD4, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // Audio_RST
221221
// {PD12, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // LED4 Blue
222-
{NC, NC, 0}
222+
{NC, NP, 0}
223223
};
224224

225225
const PinMap PinMap_UART_CTS[] = {
@@ -228,7 +228,7 @@ const PinMap PinMap_UART_CTS[] = {
228228
{PB13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
229229
{PD3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
230230
{PD11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
231-
{NC, NC, 0}
231+
{NC, NP, 0}
232232
};
233233

234234
//*** SPI ***
@@ -240,7 +240,7 @@ const PinMap PinMap_SPI_MOSI[] = {
240240
{PB15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
241241
{PC3, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
242242
// {PC12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, // I2S3_SD
243-
{NC, NC, 0}
243+
{NC, NP, 0}
244244
};
245245

246246
const PinMap PinMap_SPI_MISO[] = {
@@ -250,7 +250,7 @@ const PinMap PinMap_SPI_MISO[] = {
250250
{PB14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
251251
{PC2, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
252252
// {PC11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
253-
{NC, NC, 0}
253+
{NC, NP, 0}
254254
};
255255

256256
const PinMap PinMap_SPI_SCLK[] = {
@@ -261,7 +261,7 @@ const PinMap PinMap_SPI_SCLK[] = {
261261
{PB13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
262262
// {PC10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, // I2S3_SCK
263263

264-
{NC, NC, 0}
264+
{NC, NP, 0}
265265
};
266266

267267
const PinMap PinMap_SPI_SSEL[] = {
@@ -271,7 +271,7 @@ const PinMap PinMap_SPI_SSEL[] = {
271271
// {PA15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
272272
// {PB9, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, // Audio_SDA
273273
{PB12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
274-
{NC, NC, 0}
274+
{NC, NP, 0}
275275
};
276276

277277
//*** CAN ***
@@ -282,7 +282,7 @@ const PinMap PinMap_CAN_RD[] = {
282282
{PB8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
283283
{PB12, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
284284
{PD0, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
285-
{NC, NC, 0}
285+
{NC, NP, 0}
286286
};
287287

288288
const PinMap PinMap_CAN_TD[] = {
@@ -291,5 +291,5 @@ const PinMap PinMap_CAN_TD[] = {
291291
// {PB9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // Audio_SDA
292292
{PB13, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
293293
{PD1, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
294-
{NC, NC, 0}
294+
{NC, NP, 0}
295295
};

0 commit comments

Comments
 (0)