diff options
15 files changed, 101 insertions, 264 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f0/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f0/pwm_config.h index 052e4ccec5..07eb637a65 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f0/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f0/pwm_config.h @@ -18,69 +18,57 @@ extern "C" { #endif #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef BSP_USING_PWM16 -#ifndef PWM16_CONFIG -#define PWM16_CONFIG \ +#define PWM16_CONFIG \ { \ - .tim_handle.Instance = TIM16, \ - .name = "pwm16", \ - .channel = 0 \ + .tim_handle.Instance = TIM16, \ + .name = "pwm16", \ + .channel = RT_NULL \ } -#endif /* PWM16_CONFIG */ #endif /* BSP_USING_PWM16 */ #ifdef BSP_USING_PWM17 -#ifndef PWM17_CONFIG -#define PWM17_CONFIG \ +#define PWM17_CONFIG \ { \ - .tim_handle.Instance = TIM17, \ - .name = "pwm17", \ - .channel = 0 \ + .tim_handle.Instance = TIM17, \ + .name = "pwm17", \ + .channel = RT_NULL \ } -#endif /* PWM17_CONFIG */ #endif /* BSP_USING_PWM17 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f1/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f1/pwm_config.h index f5b32eef73..296b54fdd0 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f1/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f1/pwm_config.h @@ -18,146 +18,121 @@ extern "C" { #endif #ifdef BSP_USING_PWM1 -#ifndef PWM1_CONFIG #define PWM1_CONFIG \ { \ .tim_handle.Instance = TIM1, \ .name = "pwm1", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM1_CONFIG */ + #endif /* BSP_USING_PWM1 */ #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef BSP_USING_PWM6 -#ifndef PWM6_CONFIG #define PWM6_CONFIG \ { \ .tim_handle.Instance = TIM6, \ .name = "pwm6", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM6_CONFIG */ #endif /* BSP_USING_PWM6 */ #ifdef BSP_USING_PWM7 -#ifndef PWM7_CONFIG #define PWM7_CONFIG \ { \ .tim_handle.Instance = TIM7, \ .name = "pwm7", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM7_CONFIG */ #endif /* BSP_USING_PWM7 */ #ifdef BSP_USING_PWM8 -#ifndef PWM8_CONFIG #define PWM8_CONFIG \ { \ .tim_handle.Instance = TIM8, \ .name = "pwm8", \ - .channel = 12 \ + .channel = RT_NULL \ } -#endif /* PWM8_CONFIG */ #endif /* BSP_USING_PWM8 */ #ifdef BSP_USING_PWM9 -#ifndef PWM9_CONFIG #define PWM9_CONFIG \ { \ .tim_handle.Instance = TIM9, \ .name = "pwm9", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM9_CONFIG */ #endif /* BSP_USING_PWM9 */ #ifdef BSP_USING_PWM10 -#ifndef PWM10_CONFIG -#define PWM10_CONFIG \ +#define PWM10_CONFIG \ { \ - .tim_handle.Instance = TIM10, \ - .name = "pwm10", \ - .channel = 0 \ + .tim_handle.Instance = TIM10, \ + .name = "pwm10", \ + .channel = RT_NULL \ } -#endif /* PWM10_CONFIG */ #endif /* BSP_USING_PWM10 */ #ifdef BSP_USING_PWM11 -#ifndef PWM11_CONFIG -#define PWM11_CONFIG \ +#define PWM11_CONFIG \ { \ - .tim_handle.Instance = TIM11, \ - .name = "pwm11", \ - .channel = 0 \ + .tim_handle.Instance = TIM11, \ + .name = "pwm11", \ + .channel = RT_NULL \ } -#endif /* PWM11_CONFIG */ #endif /* BSP_USING_PWM11 */ #ifdef BSP_USING_PWM12 -#ifndef PWM12_CONFIG -#define PWM12_CONFIG \ +#define PWM12_CONFIG \ { \ - .tim_handle.Instance = TIM12, \ - .name = "pwm12", \ - .channel = 0 \ + .tim_handle.Instance = TIM12, \ + .name = "pwm12", \ + .channel = RT_NULL \ } -#endif /* PWM12_CONFIG */ #endif /* BSP_USING_PWM12 */ #ifdef BSP_USING_PWM13 -#ifndef PWM13_CONFIG -#define PWM13_CONFIG \ +#define PWM13_CONFIG \ { \ - .tim_handle.Instance = TIM13, \ - .name = "pwm13", \ - .channel = 0 \ + .tim_handle.Instance = TIM13, \ + .name = "pwm13", \ + .channel = RT_NULL \ } -#endif /* PWM13_CONFIG */ #endif /* BSP_USING_PWM13 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f2/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f2/pwm_config.h index b8ef2d37f7..d0325356ef 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f2/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f2/pwm_config.h @@ -18,47 +18,39 @@ extern "C" { #endif #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f3/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f3/pwm_config.h index eafd4644c9..9b0cacfa7b 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f3/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f3/pwm_config.h @@ -18,14 +18,12 @@ extern "C" { #endif #ifdef BSP_USING_PWM1 -#ifndef PWM1_CONFIG #define PWM1_CONFIG \ { \ .tim_handle.Instance = TIM1, \ .name = "pwm1", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM1_CONFIG */ #endif /* BSP_USING_PWM1 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f4/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f4/pwm_config.h index 05563ce434..6b3130e644 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f4/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f4/pwm_config.h @@ -18,157 +18,129 @@ extern "C" { #endif #ifdef BSP_USING_PWM1 -#ifndef PWM1_CONFIG #define PWM1_CONFIG \ { \ .tim_handle.Instance = TIM1, \ .name = "pwm1", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM1_CONFIG */ #endif /* BSP_USING_PWM1 */ #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef BSP_USING_PWM6 -#ifndef PWM6_CONFIG #define PWM6_CONFIG \ { \ .tim_handle.Instance = TIM6, \ .name = "pwm6", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM6_CONFIG */ #endif /* BSP_USING_PWM6 */ #ifdef BSP_USING_PWM7 -#ifndef PWM7_CONFIG #define PWM7_CONFIG \ { \ .tim_handle.Instance = TIM7, \ .name = "pwm7", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM7_CONFIG */ #endif /* BSP_USING_PWM7 */ #ifdef BSP_USING_PWM8 -#ifndef PWM8_CONFIG #define PWM8_CONFIG \ { \ .tim_handle.Instance = TIM8, \ .name = "pwm8", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM8_CONFIG */ #endif /* BSP_USING_PWM8 */ #ifdef BSP_USING_PWM9 -#ifndef PWM9_CONFIG #define PWM9_CONFIG \ { \ .tim_handle.Instance = TIM9, \ .name = "pwm9", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM9_CONFIG */ #endif /* BSP_USING_PWM9 */ #ifdef BSP_USING_PWM10 -#ifndef PWM10_CONFIG #define PWM10_CONFIG \ { \ .tim_handle.Instance = TIM10, \ .name = "pwm10", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM10_CONFIG */ #endif /* BSP_USING_PWM10 */ #ifdef BSP_USING_PWM11 -#ifndef PWM11_CONFIG #define PWM11_CONFIG \ { \ .tim_handle.Instance = TIM11, \ .name = "pwm11", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM11_CONFIG */ #endif /* BSP_USING_PWM11 */ #ifdef BSP_USING_PWM12 -#ifndef PWM12_CONFIG #define PWM12_CONFIG \ { \ .tim_handle.Instance = TIM12, \ .name = "pwm12", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM12_CONFIG */ #endif /* BSP_USING_PWM12 */ #ifdef BSP_USING_PWM13 -#ifndef PWM13_CONFIG #define PWM13_CONFIG \ { \ .tim_handle.Instance = TIM13, \ .name = "pwm13", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM13_CONFIG */ #endif /* BSP_USING_PWM13 */ #ifdef BSP_USING_PWM14 -#ifndef PWM14_CONFIG #define PWM14_CONFIG \ { \ .tim_handle.Instance = TIM14, \ .name = "pwm14", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM14_CONFIG */ #endif /* BSP_USING_PWM14 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f7/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f7/pwm_config.h index b8ef2d37f7..d0325356ef 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f7/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f7/pwm_config.h @@ -18,47 +18,39 @@ extern "C" { #endif #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/g0/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/g0/pwm_config.h index bc9c375b7a..91b0446997 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/g0/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/g0/pwm_config.h @@ -19,25 +19,21 @@ extern "C" { #endif #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/g4/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/g4/pwm_config.h index ca382e4742..139f64d4d5 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/g4/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/g4/pwm_config.h @@ -18,58 +18,48 @@ extern "C" { #endif #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef BSP_USING_PWM12 -#ifndef PWM12_CONFIG #define PWM12_CONFIG \ { \ .tim_handle.Instance = TIM12, \ .name = "pwm12", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM12_CONFIG */ #endif /* BSP_USING_PWM12 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/h7/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/h7/pwm_config.h index 3306a20b25..7f541986a5 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/h7/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/h7/pwm_config.h @@ -19,58 +19,48 @@ extern "C" { #endif #ifdef BSP_USING_PWM1 -#ifndef PWM1_CONFIG #define PWM1_CONFIG \ { \ .tim_handle.Instance = TIM1, \ .name = "pwm1", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM1_CONFIG */ #endif /* BSP_USING_PWM1 */ #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/l1/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/l1/pwm_config.h index b8ef2d37f7..d0325356ef 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/l1/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/l1/pwm_config.h @@ -18,47 +18,39 @@ extern "C" { #endif #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/l4/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/l4/pwm_config.h index c4d4bcf202..900c0fc048 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/l4/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/l4/pwm_config.h @@ -18,58 +18,48 @@ extern "C" { #endif #ifdef BSP_USING_PWM1 -#ifndef PWM1_CONFIG #define PWM1_CONFIG \ { \ .tim_handle.Instance = TIM1, \ .name = "pwm1", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM1_CONFIG */ #endif /* BSP_USING_PWM1 */ #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/l5/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/l5/pwm_config.h index c4d4bcf202..900c0fc048 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/l5/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/l5/pwm_config.h @@ -18,58 +18,48 @@ extern "C" { #endif #ifdef BSP_USING_PWM1 -#ifndef PWM1_CONFIG #define PWM1_CONFIG \ { \ .tim_handle.Instance = TIM1, \ .name = "pwm1", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM1_CONFIG */ #endif /* BSP_USING_PWM1 */ #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/mp1/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/mp1/pwm_config.h index b8ef2d37f7..d0325356ef 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/mp1/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/mp1/pwm_config.h @@ -18,47 +18,39 @@ extern "C" { #endif #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/u5/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/u5/pwm_config.h index c4d4bcf202..900c0fc048 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/u5/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/u5/pwm_config.h @@ -18,58 +18,48 @@ extern "C" { #endif #ifdef BSP_USING_PWM1 -#ifndef PWM1_CONFIG #define PWM1_CONFIG \ { \ .tim_handle.Instance = TIM1, \ .name = "pwm1", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM1_CONFIG */ #endif /* BSP_USING_PWM1 */ #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/wb/pwm_config.h b/bsp/stm32/libraries/HAL_Drivers/config/wb/pwm_config.h index 1d129e6792..65059da7dd 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/wb/pwm_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/wb/pwm_config.h @@ -18,58 +18,48 @@ extern "C" { #endif #ifdef BSP_USING_PWM1 -#ifndef PWM1_CONFIG #define PWM1_CONFIG \ { \ .tim_handle.Instance = TIM1, \ .name = "pwm1", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM1_CONFIG */ #endif /* BSP_USING_PWM1 */ #ifdef BSP_USING_PWM2 -#ifndef PWM2_CONFIG #define PWM2_CONFIG \ { \ .tim_handle.Instance = TIM2, \ .name = "pwm2", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 -#ifndef PWM3_CONFIG #define PWM3_CONFIG \ { \ .tim_handle.Instance = TIM3, \ .name = "pwm3", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 -#ifndef PWM4_CONFIG #define PWM4_CONFIG \ { \ .tim_handle.Instance = TIM4, \ .name = "pwm4", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 -#ifndef PWM5_CONFIG #define PWM5_CONFIG \ { \ .tim_handle.Instance = TIM5, \ .name = "pwm5", \ - .channel = 0 \ + .channel = RT_NULL \ } -#endif /* PWM5_CONFIG */ #endif /* BSP_USING_PWM5 */ #ifdef __cplusplus |