Skip to content

Commit ba8fa71

Browse files
LMESTMbulislaw
authored andcommitted
STM32: fix formatting
Use the recommended style if (condition) { do(); } else { do_else(); }
1 parent 435d5d3 commit ba8fa71

File tree

1 file changed

+72
-30
lines changed

1 file changed

+72
-30
lines changed

targets/TARGET_STM/pwmout_api.c

Lines changed: 72 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -53,64 +53,104 @@ void pwmout_init(pwmout_t* obj, PinName pin)
5353

5454
// Enable TIM clock
5555
#if defined(TIM1_BASE)
56-
if (obj->pwm == PWM_1) __HAL_RCC_TIM1_CLK_ENABLE();
56+
if (obj->pwm == PWM_1){
57+
__HAL_RCC_TIM1_CLK_ENABLE();
58+
}
5759
#endif
5860
#if defined(TIM2_BASE)
59-
if (obj->pwm == PWM_2) __HAL_RCC_TIM2_CLK_ENABLE();
61+
if (obj->pwm == PWM_2) {
62+
__HAL_RCC_TIM2_CLK_ENABLE();
63+
}
6064
#endif
6165
#if defined(TIM3_BASE)
62-
if (obj->pwm == PWM_3) __HAL_RCC_TIM3_CLK_ENABLE();
66+
if (obj->pwm == PWM_3) {
67+
__HAL_RCC_TIM3_CLK_ENABLE();
68+
}
6369
#endif
6470
#if defined(TIM4_BASE)
65-
if (obj->pwm == PWM_4) __HAL_RCC_TIM4_CLK_ENABLE();
71+
if (obj->pwm == PWM_4) {
72+
__HAL_RCC_TIM4_CLK_ENABLE();
73+
}
6674
#endif
6775
#if defined(TIM5_BASE)
68-
if (obj->pwm == PWM_5) __HAL_RCC_TIM5_CLK_ENABLE();
76+
if (obj->pwm == PWM_5) {
77+
__HAL_RCC_TIM5_CLK_ENABLE();
78+
}
6979
#endif
7080
#if defined(TIM8_BASE)
71-
if (obj->pwm == PWM_8) __HAL_RCC_TIM8_CLK_ENABLE();
81+
if (obj->pwm == PWM_8) {
82+
__HAL_RCC_TIM8_CLK_ENABLE();
83+
}
7284
#endif
7385
#if defined(TIM9_BASE)
74-
if (obj->pwm == PWM_9) __HAL_RCC_TIM9_CLK_ENABLE();
86+
if (obj->pwm == PWM_9) {
87+
__HAL_RCC_TIM9_CLK_ENABLE();
88+
}
7589
#endif
7690
#if defined(TIM10_BASE)
77-
if (obj->pwm == PWM_10) __HAL_RCC_TIM10_CLK_ENABLE();
91+
if (obj->pwm == PWM_10) {
92+
__HAL_RCC_TIM10_CLK_ENABLE();
93+
}
7894
#endif
7995
#if defined(TIM11_BASE)
80-
if (obj->pwm == PWM_11) __HAL_RCC_TIM11_CLK_ENABLE();
96+
if (obj->pwm == PWM_11) {
97+
__HAL_RCC_TIM11_CLK_ENABLE();
98+
}
8199
#endif
82100
#if defined(TIM12_BASE)
83-
if (obj->pwm == PWM_12) __HAL_RCC_TIM12_CLK_ENABLE();
101+
if (obj->pwm == PWM_12) {
102+
__HAL_RCC_TIM12_CLK_ENABLE();
103+
}
84104
#endif
85105
#if defined(TIM13_BASE)
86-
if (obj->pwm == PWM_13) __HAL_RCC_TIM13_CLK_ENABLE();
106+
if (obj->pwm == PWM_13) {
107+
__HAL_RCC_TIM13_CLK_ENABLE();
108+
}
87109
#endif
88110
#if defined(TIM14_BASE)
89-
if (obj->pwm == PWM_14) __HAL_RCC_TIM14_CLK_ENABLE();
111+
if (obj->pwm == PWM_14) {
112+
__HAL_RCC_TIM14_CLK_ENABLE();
113+
}
90114
#endif
91115
#if defined(TIM15_BASE)
92-
if (obj->pwm == PWM_15) __HAL_RCC_TIM15_CLK_ENABLE();
116+
if (obj->pwm == PWM_15) {
117+
__HAL_RCC_TIM15_CLK_ENABLE();
118+
}
93119
#endif
94120
#if defined(TIM16_BASE)
95-
if (obj->pwm == PWM_16) __HAL_RCC_TIM16_CLK_ENABLE();
121+
if (obj->pwm == PWM_16) {
122+
__HAL_RCC_TIM16_CLK_ENABLE();
123+
}
96124
#endif
97125
#if defined(TIM17_BASE)
98-
if (obj->pwm == PWM_17) __HAL_RCC_TIM17_CLK_ENABLE();
126+
if (obj->pwm == PWM_17) {
127+
__HAL_RCC_TIM17_CLK_ENABLE();
128+
}
99129
#endif
100130
#if defined(TIM18_BASE)
101-
if (obj->pwm == PWM_18) __HAL_RCC_TIM18_CLK_ENABLE();
131+
if (obj->pwm == PWM_18) {
132+
__HAL_RCC_TIM18_CLK_ENABLE();
133+
}
102134
#endif
103135
#if defined(TIM19_BASE)
104-
if (obj->pwm == PWM_19) __HAL_RCC_TIM19_CLK_ENABLE();
136+
if (obj->pwm == PWM_19) {
137+
__HAL_RCC_TIM19_CLK_ENABLE();
138+
}
105139
#endif
106140
#if defined(TIM20_BASE)
107-
if (obj->pwm == PWM_20) __HAL_RCC_TIM20_CLK_ENABLE();
141+
if (obj->pwm == PWM_20) {
142+
__HAL_RCC_TIM20_CLK_ENABLE();
143+
}
108144
#endif
109145
#if defined(TIM21_BASE)
110-
if (obj->pwm == PWM_21) __HAL_RCC_TIM21_CLK_ENABLE();
146+
if (obj->pwm == PWM_21) {
147+
__HAL_RCC_TIM21_CLK_ENABLE();
148+
}
111149
#endif
112150
#if defined(TIM22_BASE)
113-
if (obj->pwm == PWM_22) __HAL_RCC_TIM22_CLK_ENABLE();
151+
if (obj->pwm == PWM_22) {
152+
__HAL_RCC_TIM22_CLK_ENABLE();
153+
}
114154
#endif
115155
// Configure GPIO
116156
pinmap_pinout(pin, PinMap_PWM);
@@ -244,20 +284,22 @@ void pwmout_period_us(pwmout_t* obj, int us)
244284
/* By default use, 1us as SW pre-scaler */
245285
obj->prescaler = 1;
246286
// TIMxCLK = PCLKx when the APB prescaler = 1 else TIMxCLK = 2 * PCLKx
247-
if (APBxCLKDivider == RCC_HCLK_DIV1)
248-
TimHandle.Init.Prescaler = (((PclkFreq) / 1000000)) - 1; // 1 us tick
249-
else
250-
TimHandle.Init.Prescaler = (((PclkFreq * 2) / 1000000)) - 1; // 1 us tick
251-
TimHandle.Init.Period = (us - 1);
287+
if (APBxCLKDivider == RCC_HCLK_DIV1) {
288+
TimHandle.Init.Prescaler = (((PclkFreq) / 1000000)) - 1; // 1 us tick
289+
} else {
290+
TimHandle.Init.Prescaler = (((PclkFreq * 2) / 1000000)) - 1; // 1 us tick
291+
}
292+
TimHandle.Init.Period = (us - 1);
252293

253294
/* In case period or pre-scalers are out of range, loop-in to get valid values */
254295
while ((TimHandle.Init.Period > 0xFFFF) || (TimHandle.Init.Prescaler > 0xFFFF)) {
255296
obj->prescaler = obj->prescaler * 2;
256-
if (APBxCLKDivider == RCC_HCLK_DIV1)
257-
TimHandle.Init.Prescaler = (((PclkFreq) / 1000000) * obj->prescaler) - 1;
258-
else
259-
TimHandle.Init.Prescaler = (((PclkFreq * 2) / 1000000) * obj->prescaler) - 1;
260-
TimHandle.Init.Period = (us - 1) / obj->prescaler;
297+
if (APBxCLKDivider == RCC_HCLK_DIV1) {
298+
TimHandle.Init.Prescaler = (((PclkFreq) / 1000000) * obj->prescaler) - 1;
299+
} else {
300+
TimHandle.Init.Prescaler = (((PclkFreq * 2) / 1000000) * obj->prescaler) - 1;
301+
}
302+
TimHandle.Init.Period = (us - 1) / obj->prescaler;
261303
/* Period decreases and prescaler increases over loops, so check for
262304
* possible out of range cases */
263305
if ((TimHandle.Init.Period < 0xFFFF) && (TimHandle.Init.Prescaler > 0xFFFF)) {

0 commit comments

Comments
 (0)