Align CAN definition

For some serie:
- CAN is defined and not CAN1
- CAN is not defined and CAN1 is
- CAN and CAN1 are defined

CAN1 should now be used. Genpinmap script will be updated accordiling.

Signed-off-by: Frederic.Pillon <[email protected]>

Author: fpistm

cores/arduino/stm32/stm32_def.h

@@ -74,6 +74,10 @@
 #elif defined(STM32L4xx)
 #endif
 
+#ifndef CAN1
+#define CAN1 CAN
+#endif
+
 // weaked functions declaration
 void SystemClock_Config(void);
 

variants/NUCLEO_F091RC/PeripheralPins.c

@@ -240,13 +240,13 @@ const PinMap PinMap_SPI_SSEL[] = {
 //*** CAN ***
 
 const PinMap PinMap_CAN_RD[] = {
-    {PA_11,  CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
-    {PB_8,   CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)}, // D15
+    {PA_11,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
+    {PB_8,   CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)}, // D15
     {NC,    NP,    0}
 };
 
 const PinMap PinMap_CAN_TD[] = {
-    {PA_12,  CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
-    {PB_9,   CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)}, // D14
+    {PA_12,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
+    {PB_9,   CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)}, // D14
     {NC,    NP,    0}
 };

variants/NUCLEO_F103RB/PeripheralPins.c

@@ -240,16 +240,16 @@ const PinMap PinMap_SPI_SSEL[] = {
 
 #ifdef HAL_CAN_MODULE_ENABLED
 const PinMap PinMap_CAN_RD[] = {
-    {PA_11, CAN, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
-    {PB_8,  CAN, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
+    {PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
+    {PB_8,  CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
     {NC,    NP,    0}
 };
 #endif
 
 #ifdef HAL_CAN_MODULE_ENABLED
 const PinMap PinMap_CAN_TD[] = {
-    {PA_12, CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
-    {PB_9,  CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
+    {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
+    {PB_9,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
     {NC,    NP,    0}
 };
 #endif

variants/NUCLEO_F303RE/PeripheralPins.c

@@ -280,13 +280,13 @@ const PinMap PinMap_SPI_SSEL[] = {
 //*** CAN ***
 
 const PinMap PinMap_CAN_RD[] = {
-    {PA_11,  CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
-    {PB_8,   CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
+    {PA_11,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
+    {PB_8,   CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
     {NC,    NP,    0}
 };
 
 const PinMap PinMap_CAN_TD[] = {
-    {PA_12,  CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
-    {PB_9,   CAN, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
+    {PA_12,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
+    {PB_9,   CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
     {NC,    NP,    0}
 };