r2maeh2/kosmos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix/pwm_channel_board_cfg' into 'develop'

Browse Source 
error correction of wrong pwm channel usage in board cfg



See merge request !10
This commit is contained in:
tkl 2016-08-10 16:00:54 +00:00
commit 91353397c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/firmware/arch/stm32f4xx/board/stm32f4-discovery/include/stm32f4-discovery.h
View File

@ -160,7 +160,7 @@ const struct driver pwm_2 = {
&pwm_ch2, &pwm_ch2,
}; };
// PWM Channel 2 // PWM Channel 1
static const GPIO_InitTypeDef port_cfg_D12 = { static const GPIO_InitTypeDef port_cfg_D12 = {
.GPIO_Pin = GPIO_Pin_12, .GPIO_Pin = GPIO_Pin_12,
.GPIO_Mode = GPIO_Mode_AF, .GPIO_Mode = GPIO_Mode_AF,
@ -190,7 +190,7 @@ static const struct driver pwm_1 = {
const struct driver pwm_1 = { const struct driver pwm_1 = {
#endif #endif
DRIVER_TYPE_PWM, DRIVER_TYPE_PWM,
&pwm_ch3, &pwm_ch1,
}; };
// UART 1 // UART 1