Skip to content
Snippets Groups Projects
Commit 8f47aee7 authored by Hauke Petersen's avatar Hauke Petersen
Browse files

boards/stm32-based: adapted PWM configuration

parent 346b51d9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 38 deletions
boards/msbiot/include/periph_conf.h
+ 4
− 2
View file @ 8f47aee7
...@@ -83,9 +83,11 @@ static const pwm_conf_t pwm_config[] = { ...@@ -83,9 +83,11 @@ static const pwm_conf_t pwm_config[] = {
{ {
.dev = TIM11, .dev = TIM11,
.rcc_mask = RCC_APB2ENR_TIM11EN, .rcc_mask = RCC_APB2ENR_TIM11EN,
.pins = { GPIO_PIN(PORT_B, 9), GPIO_UNDEF, GPIO_UNDEF, GPIO_UNDEF }, .chan = { { .pin = GPIO_PIN(PORT_B, 9), .cc_chan = 0 },
{ .pin = GPIO_UNDEF, .cc_chan = 0 },
{ .pin = GPIO_UNDEF, .cc_chan = 0 },
{ .pin = GPIO_UNDEF, .cc_chan = 0 } },
.af = GPIO_AF3, .af = GPIO_AF3,
.chan = 1,
.bus = APB2 .bus = APB2
} }
}; };
......
boards/nucleo-f207/Makefile.features
+ 1
− 0
View file @ 8f47aee7
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_cpuid
FEATURES_PROVIDED += periph_gpio FEATURES_PROVIDED += periph_gpio
FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_pwm
FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_rtc
FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
......
boards/nucleo-f207/include/periph_conf.h
+ 4
− 3
View file @ 8f47aee7
...@@ -58,10 +58,11 @@ static const pwm_conf_t pwm_config[] = { ...@@ -58,10 +58,11 @@ static const pwm_conf_t pwm_config[] = {
{ {
.dev = TIM3, .dev = TIM3,
.rcc_mask = RCC_APB1ENR_TIM3EN, .rcc_mask = RCC_APB1ENR_TIM3EN,
.pins = { GPIO_PIN(PORT_C, 6), GPIO_PIN(PORT_C, 7), .chan = { { .pin = GPIO_PIN(PORT_C, 6), .cc_chan = 0 },
GPIO_PIN(PORT_C, 8), GPIO_PIN(PORT_C, 9) }, { .pin = GPIO_PIN(PORT_C, 7), .cc_chan = 1 },
{ .pin = GPIO_PIN(PORT_C, 8), .cc_chan = 2 },
{ .pin = GPIO_PIN(PORT_C, 9), .cc_chan = 3 } },
.af = GPIO_AF2, .af = GPIO_AF2,
.chan = 4,
.bus = APB1 .bus = APB1
} }
}; };
......
boards/nucleo-f303/include/periph_conf.h
+ 4
− 3
View file @ 8f47aee7
...@@ -125,10 +125,11 @@ static const pwm_conf_t pwm_config[] = { ...@@ -125,10 +125,11 @@ static const pwm_conf_t pwm_config[] = {
{ {
.dev = TIM3, .dev = TIM3,
.rcc_mask = RCC_APB1ENR_TIM3EN, .rcc_mask = RCC_APB1ENR_TIM3EN,
.pins = { GPIO_PIN(PORT_C, 6), GPIO_PIN(PORT_C, 7), .chan = { { .pin = GPIO_PIN(PORT_C, 6), .cc_chan = 0 },
GPIO_PIN(PORT_C, 8), GPIO_PIN(PORT_C, 9) }, { .pin = GPIO_PIN(PORT_C, 7), .cc_chan = 1 },
{ .pin = GPIO_PIN(PORT_C, 8), .cc_chan = 2 },
{ .pin = GPIO_PIN(PORT_C, 9), .cc_chan = 3 } },
.af = GPIO_AF2, .af = GPIO_AF2,
.chan = 4,
.bus = APB1 .bus = APB1
} }
}; };
......
boards/nucleo-f334/include/periph_conf.h
+ 4
− 3
View file @ 8f47aee7
...@@ -109,10 +109,11 @@ static const pwm_conf_t pwm_config[] = { ...@@ -109,10 +109,11 @@ static const pwm_conf_t pwm_config[] = {
{ {
.dev = TIM3, .dev = TIM3,
.rcc_mask = RCC_APB1ENR_TIM3EN, .rcc_mask = RCC_APB1ENR_TIM3EN,
.pins = { GPIO_PIN(PORT_C, 6), GPIO_PIN(PORT_C, 7), .chan = { { .pin = GPIO_PIN(PORT_C, 6), .cc_chan = 0 },
GPIO_PIN(PORT_C, 8), GPIO_PIN(PORT_C, 9) }, { .pin = GPIO_PIN(PORT_C, 7), .cc_chan = 1 },
{ .pin = GPIO_PIN(PORT_C, 8), .cc_chan = 2 },
{ .pin = GPIO_PIN(PORT_C, 9), .cc_chan = 3 } },
.af = GPIO_AF2, .af = GPIO_AF2,
.chan = 4,
.bus = APB1 .bus = APB1
} }
}; };
......
boards/nucleo-f446/include/periph_conf.h
+ 12
− 9
View file @ 8f47aee7
...@@ -134,28 +134,31 @@ static const pwm_conf_t pwm_config[] = { ...@@ -134,28 +134,31 @@ static const pwm_conf_t pwm_config[] = {
{ {
.dev = TIM2, .dev = TIM2,
.rcc_mask = RCC_APB1ENR_TIM2EN, .rcc_mask = RCC_APB1ENR_TIM2EN,
.pins = { GPIO_PIN(PORT_A, 15), GPIO_PIN(PORT_B, 3), .chan = { { .pin = GPIO_PIN(PORT_A, 15), .cc_chan = 0},
GPIO_PIN(PORT_B, 10), GPIO_PIN(PORT_B, 2) }, { .pin = GPIO_PIN(PORT_B, 3), .cc_chan = 1},
{ .pin = GPIO_PIN(PORT_B, 10), .cc_chan = 2},
{ .pin = GPIO_PIN(PORT_B, 2), .cc_chan = 3} },
.af = GPIO_AF1, .af = GPIO_AF1,
.chan = 4,
.bus = APB1 .bus = APB1
}, },
{ {
.dev = TIM3, .dev = TIM3,
.rcc_mask = RCC_APB1ENR_TIM3EN, .rcc_mask = RCC_APB1ENR_TIM3EN,
.pins = { GPIO_PIN(PORT_B, 4), GPIO_UNDEF, .chan = { { .pin = GPIO_PIN(PORT_B, 4), .cc_chan = 0 },
GPIO_UNDEF, GPIO_UNDEF }, { .pin = GPIO_UNDEF, .cc_chan = 0 },
{ .pin = GPIO_UNDEF, .cc_chan = 0 },
{ .pin = GPIO_UNDEF, .cc_chan = 0 } },
.af = GPIO_AF2, .af = GPIO_AF2,
.chan = 1,
.bus = APB1 .bus = APB1
}, },
{ {
.dev = TIM8, .dev = TIM8,
.rcc_mask = RCC_APB2ENR_TIM8EN, .rcc_mask = RCC_APB2ENR_TIM8EN,
.pins = { GPIO_PIN(PORT_C, 6), GPIO_PIN(PORT_C, 7), .chan = { { .pin = GPIO_PIN(PORT_C, 6), .cc_chan = 0},
GPIO_PIN(PORT_C, 8), GPIO_PIN(PORT_C, 9) }, { .pin = GPIO_PIN(PORT_C, 7), .cc_chan = 1},
{ .pin = GPIO_PIN(PORT_C, 8), .cc_chan = 2},
{ .pin = GPIO_PIN(PORT_C, 9), .cc_chan = 3} },
.af = GPIO_AF3, .af = GPIO_AF3,
.chan = 4,
.bus = APB2 .bus = APB2
}, },
}; };
......
boards/stm32f3discovery/include/periph_conf.h
+ 8
− 6
View file @ 8f47aee7
...@@ -127,19 +127,21 @@ static const pwm_conf_t pwm_config[] = { ...@@ -127,19 +127,21 @@ static const pwm_conf_t pwm_config[] = {
{ {
.dev = TIM3, .dev = TIM3,
.rcc_mask = RCC_APB1ENR_TIM3EN, .rcc_mask = RCC_APB1ENR_TIM3EN,
.pins = { GPIO_PIN(PORT_C, 6), GPIO_PIN(PORT_C, 7), .chan = { { .pin = GPIO_PIN(PORT_C, 6), .cc_chan = 0 },
GPIO_PIN(PORT_C, 8), GPIO_PIN(PORT_C, 9) }, { .pin = GPIO_PIN(PORT_C, 7), .cc_chan = 1 },
{ .pin = GPIO_PIN(PORT_C, 8), .cc_chan = 2 },
{ .pin = GPIO_PIN(PORT_C, 9), .cc_chan = 3 } },
.af = GPIO_AF2, .af = GPIO_AF2,
.chan = 4,
.bus = APB1 .bus = APB1
}, },
{ {
.dev = TIM4, .dev = TIM4,
.rcc_mask = RCC_APB1ENR_TIM4EN, .rcc_mask = RCC_APB1ENR_TIM4EN,
.pins = { GPIO_PIN(PORT_D, 12), GPIO_PIN(PORT_D, 13), .chan = { { .pin = GPIO_PIN(PORT_D, 12), .cc_chan = 0},
GPIO_PIN(PORT_D, 14), GPIO_PIN(PORT_D, 15) }, { .pin = GPIO_PIN(PORT_D, 13), .cc_chan = 1},
{ .pin = GPIO_PIN(PORT_D, 14), .cc_chan = 2},
{ .pin = GPIO_PIN(PORT_D, 15), .cc_chan = 3} },
.af = GPIO_AF2, .af = GPIO_AF2,
.chan = 4,
.bus = APB1 .bus = APB1
} }
}; };
......
boards/stm32f4discovery/include/periph_conf.h
+ 12
− 12
View file @ 8f47aee7
...@@ -159,21 +159,21 @@ static const pwm_conf_t pwm_config[] = { ...@@ -159,21 +159,21 @@ static const pwm_conf_t pwm_config[] = {
{ {
.dev = TIM1, .dev = TIM1,
.rcc_mask = RCC_APB2ENR_TIM1EN, .rcc_mask = RCC_APB2ENR_TIM1EN,
.pins = { GPIO_PIN(PORT_E, 9), GPIO_PIN(PORT_E, 11), .chan = { { .pin = GPIO_PIN(PORT_E, 9), .cc_chan = 0 },
GPIO_PIN(PORT_E, 11), GPIO_PIN(PORT_E, 14) }, { .pin = GPIO_PIN(PORT_E, 11), .cc_chan = 1 },
{ .pin = GPIO_PIN(PORT_E, 11), .cc_chan = 2 },
{ .pin = GPIO_PIN(PORT_E, 14), .cc_chan = 3 } },
.af = GPIO_AF1, .af = GPIO_AF1,
.chan = 4,
.bus = APB2 .bus = APB2
}, },
{ // {
.dev = TIM3, // .dev = TIM3,
.rcc_mask = RCC_APB1ENR_TIM3EN, // .rcc_mask = RCC_APB1ENR_TIM3EN,
.pins = { GPIO_PIN(PORT_B, 4), GPIO_PIN(PORT_B, 5), // .chan = { GPIO_PIN(PORT_B, 4), GPIO_PIN(PORT_B, 5),
GPIO_PIN(PORT_B, 0), GPIO_PIN(PORT_B, 1) }, // GPIO_PIN(PORT_B, 0), GPIO_PIN(PORT_B, 1) },
.af = GPIO_AF2, // .af = GPIO_AF2,
.chan = 4, // .bus = APB1
.bus = APB1 // }
}
}; };
#define PWM_NUMOF (sizeof(pwm_config) / sizeof(pwm_config[0])) #define PWM_NUMOF (sizeof(pwm_config) / sizeof(pwm_config[0]))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment