[NUCLEO_F302R8] Added CAN support

BartSX · BartSX · commit f1c42bfc6914 · 2016-05-23T15:55:00.000+02:00
Added CAN API support for NUCLEO_F302R8 target.

*stm32f302x8.h* file was changed to avoid compilation errors.

Change-Id: Ia4ee8a90fe3f0ad6955dde21e78ea4a6c05e4fcd
diff --git a/hal/targets/cmsis/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/stm32f302x8.h b/hal/targets/cmsis/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/stm32f302x8.h
@@ -792,7 +792,7 @@ typedef struct
 #define I2C1                ((I2C_TypeDef *) I2C1_BASE)
 #define I2C2                ((I2C_TypeDef *) I2C2_BASE)
 #define I2C3                ((I2C_TypeDef *) I2C3_BASE)
-#define CAN                 ((CAN_TypeDef *) CAN_BASE)
+#define CAN1                ((CAN_TypeDef *) CAN_BASE)
 #define PWR                 ((PWR_TypeDef *) PWR_BASE)
 #define DAC                 ((DAC_TypeDef *) DAC_BASE)
 #define DAC1                ((DAC_TypeDef *) DAC1_BASE)
diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/PeripheralNames.h b/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/PeripheralNames.h
@@ -73,6 +73,10 @@ typedef enum {
     PWM_17 = (int)TIM17_BASE
 } PWMName;
 
+typedef enum {
+    CAN_1 = (int)CAN_BASE
+} CANName;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/PeripheralPins.c b/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/PeripheralPins.c
@@ -204,3 +204,15 @@ const PinMap PinMap_SPI_SSEL[] = {
     {PF_0,  SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
     {NC,    NC,    0}
 };
+
+const PinMap PinMap_CAN_RD[] = {
+//  {PB_8 , CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)}, // Not available in 32 pins package
+    {PA_11, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
+    {NC,    NC,    0}
+};
+
+const PinMap PinMap_CAN_TD[] = {
+//  {PB_9 ,  CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)}, // Not available in 32 pins package
+    {PA_12,  CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
+    {NC,    NC,    0}
+};
diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/device.h b/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/device.h
@@ -54,6 +54,8 @@
 
 #define DEVICE_SLEEP            1
 
+#define DEVICE_CAN              1
+
 //=======================================
 
 #define DEVICE_SEMIHOST         0
diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/objects.h b/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/objects.h
@@ -106,6 +106,11 @@ struct pwmout_s {
     uint32_t inverted;
 };
 
+struct can_s {
+    CANName can;
+    int index;
+};
+
 #include "gpio_object.h"
 
 #ifdef __cplusplus
diff --git a/libraries/tests/mbed/can/main.cpp b/libraries/tests/mbed/can/main.cpp
@@ -16,7 +16,8 @@ CAN can1(D2, D3);
 CAN can1(PD_0, PD_1);
 #elif defined(TARGET_NUCLEO_F091RC) || defined(TARGET_NUCLEO_F072RB) || \
       defined(TARGET_NUCLEO_F042K6) || defined(TARGET_NUCLEO_F334R8) || \
-      defined(TARGET_NUCLEO_F303RE) || defined(TARGET_NUCLEO_F303K8)
+      defined(TARGET_NUCLEO_F303RE) || defined(TARGET_NUCLEO_F303K8) || \
+      defined(TARGET_NUCLEO_F302R8)
 CAN can1(PA_11, PA_12);
 #else
 CAN can1(p9, p10);
@@ -55,7 +56,8 @@ int main() {
 #if (!defined (TARGET_LPC1549) && !defined(TARGET_B96B_F446VE) && \
      !defined(TARGET_NUCLEO_F091RC) && !defined(TARGET_NUCLEO_F072RB) && \
      !defined(TARGET_NUCLEO_F042K6) && !defined(TARGET_NUCLEO_F334R8) && \
-     !defined(TARGET_NUCLEO_F303RE) && !defined(TARGET_NUCLEO_F303K8))
+     !defined(TARGET_NUCLEO_F303RE) && !defined(TARGET_NUCLEO_F303K8) && \
+     !defined(TARGET_NUCLEO_F302R8))
       printf("loop()\n");
         if(can2.read(msg)) {
             printmsg("Rx message:", &msg);
diff --git a/libraries/tests/mbed/can_interrupt/main.cpp b/libraries/tests/mbed/can_interrupt/main.cpp
@@ -16,7 +16,8 @@ CAN can1(D2, D3);
 CAN can1(PD_0, PD_1);
 #elif defined(TARGET_NUCLEO_F091RC) || defined(TARGET_NUCLEO_F072RB) || \
       defined(TARGET_NUCLEO_F042K6) || defined(TARGET_NUCLEO_F334R8) || \
-      defined(TARGET_NUCLEO_F303RE) || defined(TARGET_NUCLEO_F303K8)
+      defined(TARGET_NUCLEO_F303RE) || defined(TARGET_NUCLEO_F303K8) || \
+      defined(TARGET_NUCLEO_F302R8)
 CAN can1(PA_11, PA_12);
 #else
 CAN can1(p9, p10);
@@ -50,7 +51,8 @@ void send() {
 #if (!defined (TARGET_LPC1549) && !defined(TARGET_B96B_F446VE) && \
      !defined(TARGET_NUCLEO_F091RC) && !defined(TARGET_NUCLEO_F072RB) && \
      !defined(TARGET_NUCLEO_F042K6) && !defined(TARGET_NUCLEO_F334R8) && \
-     !defined(TARGET_NUCLEO_F303RE) && !defined(TARGET_NUCLEO_F303K8))
+     !defined(TARGET_NUCLEO_F303RE) && !defined(TARGET_NUCLEO_F303K8) && \
+     !defined(TARGET_NUCLEO_F302R8))
 void read() {
     CANMessage msg;
     printf("rx()\n");
@@ -67,7 +69,8 @@ int main() {
 #if (!defined (TARGET_LPC1549) && !defined(TARGET_B96B_F446VE) && \
      !defined(TARGET_NUCLEO_F091RC) && !defined(TARGET_NUCLEO_F072RB) && \
      !defined(TARGET_NUCLEO_F042K6) && !defined(TARGET_NUCLEO_F334R8) && \
-     !defined(TARGET_NUCLEO_F303RE) && !defined(TARGET_NUCLEO_F303K8))
+     !defined(TARGET_NUCLEO_F303RE) && !defined(TARGET_NUCLEO_F303K8) && \
+     !defined(TARGET_NUCLEO_F302R8))
     can2.attach(&read);
 #endif
     while(1) {
diff --git a/libraries/tests/mbed/can_loopback/main.cpp b/libraries/tests/mbed/can_loopback/main.cpp
@@ -15,7 +15,8 @@ CAN can1(PD_0, PD_1);
 CAN can1(P5_9, P5_10);
 #elif defined(TARGET_NUCLEO_F091RC) || defined(TARGET_NUCLEO_F072RB) || \
       defined(TARGET_NUCLEO_F042K6) || defined(TARGET_NUCLEO_F334R8) || \
-      defined(TARGET_NUCLEO_F303RE) || defined(TARGET_NUCLEO_F303K8)
+      defined(TARGET_NUCLEO_F303RE) || defined(TARGET_NUCLEO_F303K8) || \
+      defined(TARGET_NUCLEO_F302R8)
 CAN can1(PA_11, PA_12);
 #endif
 
diff --git a/workspace_tools/tests.py b/workspace_tools/tests.py
@@ -97,6 +97,7 @@
      * NUCLEO_F334R8: (RX=PA_11, TX=PA_12)
      * NUCLEO_F303RE: (RX=PA_11, TX=PA_12)
      * NUCLEO_F303K8: (RX=PA_11, TX=PA_12)
+     * NUCLEO_F302R8: (RX=PA_11, TX=PA_12)
 
 """
 TESTS = [
@@ -304,7 +305,7 @@
         "peripherals": ["can_transceiver"],
         "mcu": ["LPC1549", "LPC1768","B96B_F446VE", "VK_RZ_A1H",
 		"NUCLEO_F091RC", "NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8",
-        "NUCLEO_F303RE", "NUCLEO_F303K8"],
+        "NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8"],
     },
     {
         "id": "MBED_BLINKY", "description": "Blinky",
@@ -577,15 +578,15 @@
         "dependencies": [MBED_LIBRARIES],
         "mcu": ["LPC1768", "LPC4088", "LPC1549", "RZ_A1H", "B96B_F446VE", "NUCLEO_F091RC",
                 "NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8", "NUCLEO_F303RE",
-                "NUCLEO_F303K8"]
+                "NUCLEO_F303K8", "NUCLEO_F302R8"]
     },
     {
         "id": "MBED_30", "description": "CAN network test using interrupts",
         "source_dir": join(TEST_DIR, "mbed", "can_interrupt"),
         "dependencies": [MBED_LIBRARIES],
         "mcu": ["LPC1768", "LPC4088", "LPC1549", "RZ_A1H", "B96B_F446VE", "NUCLEO_F091RC",
                 "NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8", "NUCLEO_F303RE",
-                "NUCLEO_F303K8"]
+                "NUCLEO_F303K8", "NUCLEO_F302R8"]
     },
     {
         "id": "MBED_31", "description": "PWM LED test",
