Skip to content

[STM B96B_F446VE] Add CAN feature #1520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 26, 2016
Merged

[STM B96B_F446VE] Add CAN feature #1520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1325d8c
[B96B_F446VE] Add CAN Feature
adustm Jan 28, 2016
6ff8955
[B96B_F446VE] Add Can test files + bug fix in can_api.c
adustm Jan 29, 2016
a58480e
[B96B_F446VE] Add the target for can test
adustm Jan 29, 2016
c11325e
[B96B_F446VE] add IRQ_RX1 interrupt
adustm Feb 1, 2016
3df28ea
[B96B_F446VE] remove unused IRQ_RX1 interrupt
adustm Feb 22, 2016
4a4cb7f
[B96B_F446VE] Add more details about the timing_pts table
adustm Feb 22, 2016
8e8af8f
[B96B_F446VE] Remove unused IRQ_RX1 interrupt (init / irq_set / ...)
adustm Feb 22, 2016
20c34f4
[B96B_F446VE] remove spaces (typo)
adustm Feb 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/mbed/hal/can_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* mbed Microcontroller Library
* Copyright (c) 2006-2013 ARM Limited
* Copyright (c) 2006-2016 ARM Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 4 additions & 0 deletions libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/PeripheralPins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,8 @@ extern const PinMap PinMap_SPI_MISO[];
extern const PinMap PinMap_SPI_SCLK[];
extern const PinMap PinMap_SPI_SSEL[];

//*** CAN ***
extern const PinMap PinMap_CAN_RD[];
extern const PinMap PinMap_CAN_TD[];

#endif
7 changes: 6 additions & 1 deletion libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/PeripheralNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ extern "C" {

typedef enum {
ADC_1 = (int)ADC1_BASE,
ADC_3 = (int)ADC3_BASE,
ADC_3 = (int)ADC3_BASE
} ADCName;

typedef enum {
Expand Down Expand Up @@ -92,6 +92,11 @@ typedef enum {
PWM_14 = (int)TIM14_BASE
} PWMName;

typedef enum {
CAN_1 = (int)CAN1_BASE,
CAN_2 = (int)CAN2_BASE
} CANName;

#ifdef __cplusplus
}
#endif
Expand Down
21 changes: 21 additions & 0 deletions libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/PeripheralPins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,3 +267,24 @@ const PinMap PinMap_SPI_SSEL[] = {
{PE_11, SPI_4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
{NC, NC, 0}
};

//*** CAN ***

const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // unsolder JP73 to use it
// {PB_5 , CAN_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // unsolder JP36 to use it
// {PB_8, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // connected to MEMs
// {PB_12, CAN_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
{PD_0, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{NC, NC, 0}
};

const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // unsolder JP74 to use it
// {PB_6 , CAN_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // unsolder JP43 to use it
// {PB_9, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // connected to MEMs
// {PB_13, CAN_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
{PD_1, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{NC, NC, 0}
};

2 changes: 1 addition & 1 deletion libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/PinNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ typedef enum {
PC_15 = 0x2F,

PD_0 = 0x30,
PD_1 = 0x31,
PD_1 = 0x31,
PD_2 = 0x32,
PD_3 = 0x33,
PD_4 = 0x34,
Expand Down
2 changes: 2 additions & 0 deletions libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@

#define DEVICE_SLEEP 1

#define DEVICE_CAN 1

//=======================================

#define DEVICE_SEMIHOST 0
Expand Down
5 changes: 5 additions & 0 deletions libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ struct pwmout_s {
uint8_t inverted;
};

struct can_s {
CANName can;
int index; // Used by irq
};

#include "gpio_object.h"

#ifdef __cplusplus
Expand Down
Loading