Skip to content

[STM32F4] Clock and interrupt fixes #1735

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 2 commits into from
May 16, 2016
Merged

[STM32F4] Clock and interrupt fixes #1735

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
407c368
[STM32F4] Get PCLK1 clock and set initial CAN frequency
BartSX May 12, 2016
08a71bc
[STM32F4] Fix for CAN2 interrupt index
BartSX May 13, 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
7 changes: 5 additions & 2 deletions libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/can_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void can_init(can_t *obj, PinName rd, PinName td)
obj->index = 0;
} else {
__HAL_RCC_CAN2_CLK_ENABLE();
obj->index = 0;
obj->index = 1;
}

// Configure the CAN pins
Expand Down Expand Up @@ -75,6 +75,9 @@ void can_init(can_t *obj, PinName rd, PinName td)

filter_number = (obj->can == CAN_1) ? 0 : 14;

// Set initial CAN frequency to 100kb/s
can_frequency(obj, 100000);

can_filter(obj, 0, 0, CANStandard, filter_number);
}

Expand Down Expand Up @@ -177,7 +180,7 @@ static unsigned int can_speed(unsigned int pclk, unsigned int cclk, unsigned cha

int can_frequency(can_t *obj, int f)
{
int pclk ; //= PeripheralClock;
int pclk = HAL_RCC_GetPCLK1Freq();
int btr = can_speed(pclk, (unsigned int)f, 1);
CAN_TypeDef *can = (CAN_TypeDef *)(obj->can);

Expand Down