ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[NUCLEO_F334R8] Added CAN support 

Added CAN API support for NUCLEO_F334R8 target.

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

Change-Id: Ic7b3273ffe24940ecdc189d2566a6a7f66825ce6
pull/1762/head
Bartosz Szczepanski 2016-04-19 16:37:20 +02:00
parent 78767491f7
commit 656d1953d9
9 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hal/targets/cmsis/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F334R8/stm32f334x8.h
View File

@ -872,7 +872,7 @@ typedef struct
#define USART2 ((USART_TypeDef *) USART2_BASE)
#define USART3 ((USART_TypeDef *) USART3_BASE)
#define I2C1 ((I2C_TypeDef *) I2C1_BASE)
#define CAN ((CAN_TypeDef *) CAN_BASE)
#define CAN1 ((CAN_TypeDef *) CAN_BASE)
#define PWR ((PWR_TypeDef *) PWR_BASE)
#define DAC1 ((DAC_TypeDef *) DAC1_BASE)
#define DAC2 ((DAC_TypeDef *) DAC2_BASE)

4
hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F334R8/PeripheralNames.h
View File

@ -73,6 +73,10 @@ typedef enum {
PWM_17 = (int)TIM17_BASE
} PWMName;
typedef enum {
CAN_1 = (int)CAN_BASE
} CANName;
#ifdef __cplusplus
}
#endif

12
hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F334R8/PeripheralPins.c
View File

@ -210,3 +210,15 @@ const PinMap PinMap_SPI_SSEL[] = {
{PA_15, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
{NC, NC, 0}
};
const PinMap PinMap_CAN_RD[] = {
{PB_8 , CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{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)},
{PA_12, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{NC, NC, 0}
};

2
hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F334R8/device.h
View File

@ -54,6 +54,8 @@
#define DEVICE_SLEEP 1
#define DEVICE_CAN 1
//=======================================
#define DEVICE_SEMIHOST 0

5
hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F334R8/objects.h
View File

@ -106,6 +106,11 @@ struct pwmout_s {
uint32_t inverted;
};
struct can_s {
CANName can;
int index;
};
#include "gpio_object.h"
#ifdef __cplusplus

4
libraries/tests/mbed/can/main.cpp
View File

@ -15,7 +15,7 @@ CAN can1(D2, D3);
// B96B_F446VE support only single CAN channel
CAN can1(PD_0, PD_1);
#elif defined(TARGET_NUCLEO_F091RC) || defined(TARGET_NUCLEO_F072RB) || \
defined(TARGET_NUCLEO_F042K6)
defined(TARGET_NUCLEO_F042K6) || defined(TARGET_NUCLEO_F334R8)
CAN can1(PA_11, PA_12);
#else
CAN can1(p9, p10);
@ -53,7 +53,7 @@ int main() {
while(1) {
#if (!defined (TARGET_LPC1549) && !defined(TARGET_B96B_F446VE) && \
!defined(TARGET_NUCLEO_F091RC) && !defined(TARGET_NUCLEO_F072RB) && \
!defined(TARGET_NUCLEO_F042K6))
!defined(TARGET_NUCLEO_F042K6) && !defined(TARGET_NUCLEO_F334R8))
printf("loop()\n");
if(can2.read(msg)) {
printmsg("Rx message:", &msg);

6
libraries/tests/mbed/can_interrupt/main.cpp
View File

@ -15,7 +15,7 @@ CAN can1(D2, D3);
// B96B_F446VE support only single CAN channel
CAN can1(PD_0, PD_1);
#elif defined(TARGET_NUCLEO_F091RC) || defined(TARGET_NUCLEO_F072RB) || \
defined(TARGET_NUCLEO_F042K6)
defined(TARGET_NUCLEO_F042K6) || defined(TARGET_NUCLEO_F334R8)
CAN can1(PA_11, PA_12);
#else
CAN can1(p9, p10);
@ -48,7 +48,7 @@ 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_F042K6) && !defined(TARGET_NUCLEO_F334R8))
void read() {
CANMessage msg;
printf("rx()\n");
@ -64,7 +64,7 @@ int main() {
ticker.attach(&send, 1);
#if (!defined (TARGET_LPC1549) && !defined(TARGET_B96B_F446VE) && \
!defined(TARGET_NUCLEO_F091RC) && !defined(TARGET_NUCLEO_F072RB) && \
!defined(TARGET_NUCLEO_F042K6))
!defined(TARGET_NUCLEO_F042K6) && !defined(TARGET_NUCLEO_F334R8))
can2.attach(&read);
#endif
while(1) {

2
libraries/tests/mbed/can_loopback/main.cpp
View File

@ -14,7 +14,7 @@ CAN can1(PD_0, PD_1);
#elif defined(TARGET_VK_RZ_A1H)
CAN can1(P5_9, P5_10);
#elif defined(TARGET_NUCLEO_F091RC) || defined(TARGET_NUCLEO_F072RB) || \
defined(TARGET_NUCLEO_F042K6)
defined(TARGET_NUCLEO_F042K6) || defined(TARGET_NUCLEO_F334R8)
CAN can1(PA_11, PA_12);
#endif

7
workspace_tools/tests.py
View File

@ -94,6 +94,7 @@ Wiring:
* NUCLEO_F091RC: (RX=PA_11, TX=PA_12)
* NUCLEO_F072RB: (RX=PA_11, TX=PA_12)
* NUCLEO_F042K6: (RX=PA_11, TX=PA_12)
* NUCLEO_F334R8: (RX=PA_11, TX=PA_12)
"""
TESTS = [
@ -300,7 +301,7 @@ TESTS = [
"duration": 20,
"peripherals": ["can_transceiver"],
"mcu": ["LPC1549", "LPC1768","B96B_F446VE", "VK_RZ_A1H",
"NUCLEO_F091RC", "NUCLEO_F072RB", "NUCLEO_F042K6"],
"NUCLEO_F091RC", "NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8"],
},
{
"id": "MBED_BLINKY", "description": "Blinky",
@ -572,14 +573,14 @@ TESTS = [
"source_dir": join(TEST_DIR, "mbed", "can"),
"dependencies": [MBED_LIBRARIES],
"mcu": ["LPC1768", "LPC4088", "LPC1549", "RZ_A1H", "B96B_F446VE", "NUCLEO_F091RC",
"NUCLEO_F072RB", "NUCLEO_F042K6"]
"NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8"]
},
{
"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_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8"]
},
{
"id": "MBED_31", "description": "PWM LED test",