Working fork to test F0 application
Fork of CANnucleo by
Diff: stm32f3xx_hal_msp.c
- Revision:
- 14:0344705e6fb8
- Parent:
- 13:a3e2be3d49a2
- Child:
- 16:f4c8f45bded9
--- a/stm32f3xx_hal_msp.c Wed Dec 23 10:37:01 2015 +0000 +++ b/stm32f3xx_hal_msp.c Sun Dec 27 09:02:47 2015 +0000 @@ -44,7 +44,6 @@ defined(TARGET_NUCLEO_F334R8) || \ defined(TARGET_DISCO_F334C8) -#include "stm32f3xx_hal.h" #include "can_api.h" #include "pinmap.h" @@ -68,7 +67,7 @@ _rxPin = rxPin; _txPin = txPin; - _canHandle.Instance = ((CAN_TypeDef *) CAN_BASE); + _canHandle.Instance = ((CAN_TypeDef*)CAN_BASE); _canHandle.pTxMsg = &_canTxMsg; _canHandle.pRxMsg = &_canRxMsg; @@ -111,14 +110,7 @@ GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Speed = GPIO_SPEED_HIGH; GPIO_InitStruct.Pull = GPIO_PULLUP; -#if defined(TARGET_NUCLEO_F302R8) || \ - defined(TARGET_NUCLEO_F303RE) - GPIO_InitStruct.Alternate = GPIO_AF7_CAN; -#elif defined(TARGET_NUCLEO_F303K8) || \ - defined(TARGET_NUCLEO_F334R8) || \ - defined(TARGET_DISCO_F334C8) GPIO_InitStruct.Alternate = GPIO_AF9_CAN; -#endif HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); /* CAN1 TX GPIO pin configuration */ @@ -126,18 +118,13 @@ GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Speed = GPIO_SPEED_HIGH; GPIO_InitStruct.Pull = GPIO_PULLUP; -#if defined(TARGET_NUCLEO_F302R8) || \ - defined(TARGET_NUCLEO_F303RE) - GPIO_InitStruct.Alternate = GPIO_AF7_CAN; -#elif defined(TARGET_NUCLEO_F303K8) || \ - defined(TARGET_NUCLEO_F334R8) || \ - defined(TARGET_DISCO_F334C8) GPIO_InitStruct.Alternate = GPIO_AF9_CAN; -#endif - HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); } -#if !defined(TARGET_NUCLEO_F303K8) +#if defined(TARGET_NUCLEO_F302R8) || \ + defined(TARGET_NUCLEO_F303RE) || \ + defined(TARGET_NUCLEO_F334R8) || \ + defined(TARGET_DISCO_F334C8) else if((_rxPin == PB_8) && (_txPin == PB_9)) { /* CAN1 Periph clock enable */ @@ -151,13 +138,7 @@ GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Speed = GPIO_SPEED_HIGH; GPIO_InitStruct.Pull = GPIO_PULLUP; -#if defined(TARGET_NUCLEO_F302R8) || \ - defined(TARGET_NUCLEO_F303RE) - GPIO_InitStruct.Alternate = GPIO_AF7_CAN; -#elif defined(TARGET_NUCLEO_F334R8) || \ - defined(TARGET_DISCO_F334C8) GPIO_InitStruct.Alternate = GPIO_AF9_CAN; -#endif HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); /* CAN1 TX GPIO pin configuration */ @@ -165,13 +146,7 @@ GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Speed = GPIO_SPEED_HIGH; GPIO_InitStruct.Pull = GPIO_PULLUP; -#if defined(TARGET_NUCLEO_F302R8) || \ - defined(TARGET_NUCLEO_F303RE) - GPIO_InitStruct.Alternate = GPIO_AF7_CAN; -#elif defined(TARGET_NUCLEO_F334R8) || \ - defined(TARGET_DISCO_F334C8) GPIO_InitStruct.Alternate = GPIO_AF9_CAN; -#endif HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); } #endif