Skip to content

Commit 4162421

Browse files
github-actions[bot]dchansen06
github-actions[bot]
authored and
dchansen06
committed
Automatic Clang-Format: Standardized formatting automatically
1 parent 1371c95 commit 4162421

9 files changed

Lines changed: 41 additions & 32 deletions

File tree

‎Lib/Vendor/STM32_HAL_LL/STM32G4xx/Inc/stm32g4xx_hal_hrtim.h‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,10 +1001,12 @@ typedef void (*pHRTIM_TIMxCallbackTypeDef)(HRTIM_HandleTypeDef *hhrtim, /*!< HRT
10011001
#define HRTIM_TIMER_D_E_DELAYEDPROTECTION_BALANCED_EEV8 (HRTIM_OUTR_DLYPRT_1 | HRTIM_OUTR_DLYPRT_0 | HRTIM_OUTR_DLYPRTEN) /*!< Timers D, E: Balanced Idle on external Event 6U */
10021002
#define HRTIM_TIMER_D_E_DELAYEDPROTECTION_DELAYEDOUT1_DEEV9 (HRTIM_OUTR_DLYPRT_2 | HRTIM_OUTR_DLYPRTEN) /*!< Timers D, E: Output 1 delayed Idle on external Event 7U */
10031003
#define HRTIM_TIMER_D_E_DELAYEDPROTECTION_DELAYEDOUT2_DEEV9 (HRTIM_OUTR_DLYPRT_2 | HRTIM_OUTR_DLYPRT_0 | HRTIM_OUTR_DLYPRTEN) /*!< Timers D, E: Output 2 delayed Idle on external Event 7U */
1004-
#define HRTIM_TIMER_D_E_DELAYEDPROTECTION_DELAYEDBOTH_EEV9 (HRTIM_OUTR_DLYPRT_2 | HRTIM_OUTR_DLYPRT_1 | HRTIM_OUTR_DLYPRTEN) /*!< Timers D, E: Output 1 and output2 delayed Idle on external Event 7U \
1005-
*/
1006-
#define HRTIM_TIMER_D_E_DELAYEDPROTECTION_BALANCED_EEV9 (HRTIM_OUTR_DLYPRT_2 | HRTIM_OUTR_DLYPRT_1 | HRTIM_OUTR_DLYPRT_0 | HRTIM_OUTR_DLYPRTEN) /*!< Timers D, E: Balanced Idle on external Event 7U \
1007-
*/
1004+
#define HRTIM_TIMER_D_E_DELAYEDPROTECTION_DELAYEDBOTH_EEV9 \
1005+
(HRTIM_OUTR_DLYPRT_2 | HRTIM_OUTR_DLYPRT_1 | HRTIM_OUTR_DLYPRTEN) /*!< Timers D, E: Output 1 and output2 delayed Idle on external Event 7U \
1006+
*/
1007+
#define HRTIM_TIMER_D_E_DELAYEDPROTECTION_BALANCED_EEV9 \
1008+
(HRTIM_OUTR_DLYPRT_2 | HRTIM_OUTR_DLYPRT_1 | HRTIM_OUTR_DLYPRT_0 | HRTIM_OUTR_DLYPRTEN) /*!< Timers D, E: Balanced Idle on external Event 7U \
1009+
*/
10081010

10091011
#define HRTIM_TIMER_F_DELAYEDPROTECTION_DISABLED (0x00000000U) /*!< No action */
10101012
#define HRTIM_TIMER_F_DELAYEDPROTECTION_DELAYEDOUT1_EEV8 (HRTIM_OUTR_DLYPRTEN) /*!< Timers F: Output 1 delayed Idle on external Event 6U */
@@ -1128,10 +1130,11 @@ typedef void (*pHRTIM_TIMxCallbackTypeDef)(HRTIM_HandleTypeDef *hhrtim, /*!< HRT
11281130
* regular mode (compare match issued as soon as counter equal compare),
11291131
* or in auto-delayed mode
11301132
*/
1131-
#define HRTIM_AUTODELAYEDMODE_REGULAR (0x00000000U) /*!< standard compare mode */
1132-
#define HRTIM_AUTODELAYEDMODE_AUTODELAYED_NOTIMEOUT (HRTIM_TIMCR_DELCMP2_0) /*!< Compare event generated only if a capture has occurred */
1133-
#define HRTIM_AUTODELAYEDMODE_AUTODELAYED_TIMEOUTCMP1 (HRTIM_TIMCR_DELCMP2_1) /*!< Compare event generated if a capture has occurred or after a Compare 1 match (timeout if capture event is missing) \
1134-
*/
1133+
#define HRTIM_AUTODELAYEDMODE_REGULAR (0x00000000U) /*!< standard compare mode */
1134+
#define HRTIM_AUTODELAYEDMODE_AUTODELAYED_NOTIMEOUT (HRTIM_TIMCR_DELCMP2_0) /*!< Compare event generated only if a capture has occurred */
1135+
#define HRTIM_AUTODELAYEDMODE_AUTODELAYED_TIMEOUTCMP1 \
1136+
(HRTIM_TIMCR_DELCMP2_1) /*!< Compare event generated if a capture has occurred or after a Compare 1 match (timeout if capture event is missing) \
1137+
*/
11351138
#define HRTIM_AUTODELAYEDMODE_AUTODELAYED_TIMEOUTCMP3 \
11361139
(HRTIM_TIMCR_DELCMP2_1 | HRTIM_TIMCR_DELCMP2_0) /*!< Compare event generated if a capture has occurred or after a Compare 3 match (timeout if capture event is missing) */
11371140
/**

‎Lib/Vendor/STM32_HAL_LL/STM32G4xx/Inc/stm32g4xx_ll_comp.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ typedef struct {
127127
(COMP_CSR_INMSEL_2) /*!< Comparator input minus connected to DAC3 Channel 2 for COMP2/4. Note: For COMPx & DACx instances availability, please refer to datasheet */
128128
#define LL_COMP_INPUT_MINUS_DAC4_CH1 \
129129
(COMP_CSR_INMSEL_2) /*!< Comparator input minus connected to DAC4 Channel 1 for COMP5/7. Note: For COMPx & DACx instances availability, please refer to datasheet */
130-
#define LL_COMP_INPUT_MINUS_DAC4_CH2 (COMP_CSR_INMSEL_2) /*!< Comparator input minus connected to DAC4 Channel 2 for COMP6. Note: For COMPx & DACx instances availability, please refer to datasheet \
131-
*/
130+
#define LL_COMP_INPUT_MINUS_DAC4_CH2 \
131+
(COMP_CSR_INMSEL_2) /*!< Comparator input minus connected to DAC4 Channel 2 for COMP6. Note: For COMPx & DACx instances availability, please refer to datasheet \
132+
*/
132133
#define LL_COMP_INPUT_MINUS_IO1 \
133134
(COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1) /*!< Comparator input minus connected to IO1 (pin PA4 for COMP1, pin PA5 for COMP2, pin PF1 for COMP3, pin PE8 for COMP4, pin PB10 for COMP5, pin PD10 \
134135
for COMP6, pin PD15 for COMP7). Note: For COMPx instance availability, please refer to datasheet */

‎Lib/Vendor/STM32_HAL_LL/STM32G4xx/Inc/stm32g4xx_ll_tim.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,8 +662,9 @@ typedef struct {
662662
#define LL_TIM_COUNTERMODE_DOWN TIM_CR1_DIR /*!< Counter used as downcounter */
663663
#define LL_TIM_COUNTERMODE_CENTER_DOWN \
664664
TIM_CR1_CMS_0 /*!< The counter counts up and down alternatively. Output compare interrupt flags of output channels are set only when the counter is counting down. */
665-
#define LL_TIM_COUNTERMODE_CENTER_UP TIM_CR1_CMS_1 /*!< The counter counts up and down alternatively. Output compare interrupt flags of output channels are set only when the counter is counting up \
666-
*/
665+
#define LL_TIM_COUNTERMODE_CENTER_UP \
666+
TIM_CR1_CMS_1 /*!< The counter counts up and down alternatively. Output compare interrupt flags of output channels are set only when the counter is counting up \
667+
*/
667668
#define LL_TIM_COUNTERMODE_CENTER_UP_DOWN \
668669
TIM_CR1_CMS /*!< The counter counts up and down alternatively. Output compare interrupt flags of output channels are set only when the counter is counting up or down. */
669670
/**

‎Lib/Vendor/STM32_HAL_LL/STM32L4xx/Inc/stm32l4xx_ll_comp.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,12 @@ typedef struct {
159159
#define LL_COMP_INPUT_MINUS_IO1 (COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1) /*!< Comparator input minus connected to IO1 (pin PB1 for COMP1, pin PB3 for COMP2) */
160160
#define LL_COMP_INPUT_MINUS_IO2 (COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO2 (pin PC4 for COMP1, pin PB7 for COMP2) */
161161
#if defined(COMP_CSR_INMESEL_1)
162-
#define LL_COMP_INPUT_MINUS_IO3 (COMP_CSR_INMESEL_0 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO3 (pin PA0 for COMP1, pin PA2 for COMP2) \
163-
*/
164-
#define LL_COMP_INPUT_MINUS_IO4 (COMP_CSR_INMESEL_1 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO4 (pin PA4 for COMP1, pin PA4 for COMP2) \
165-
*/
162+
#define LL_COMP_INPUT_MINUS_IO3 \
163+
(COMP_CSR_INMESEL_0 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO3 (pin PA0 for COMP1, pin PA2 for COMP2) \
164+
*/
165+
#define LL_COMP_INPUT_MINUS_IO4 \
166+
(COMP_CSR_INMESEL_1 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO4 (pin PA4 for COMP1, pin PA4 for COMP2) \
167+
*/
166168
#define LL_COMP_INPUT_MINUS_IO5 \
167169
(COMP_CSR_INMESEL_1 | COMP_CSR_INMESEL_0 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO5 (pin PA5 for COMP1, pin PA5 for COMP2) */
168170
#endif

‎Lib/Vendor/STM32_HAL_LL/STM32L4xx/Inc/stm32l4xx_ll_tim.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,8 +644,9 @@ typedef struct {
644644
#define LL_TIM_COUNTERMODE_DOWN TIM_CR1_DIR /*!< Counter used as downcounter */
645645
#define LL_TIM_COUNTERMODE_CENTER_DOWN \
646646
TIM_CR1_CMS_0 /*!< The counter counts up and down alternatively. Output compare interrupt flags of output channels are set only when the counter is counting down. */
647-
#define LL_TIM_COUNTERMODE_CENTER_UP TIM_CR1_CMS_1 /*!< The counter counts up and down alternatively. Output compare interrupt flags of output channels are set only when the counter is counting up \
648-
*/
647+
#define LL_TIM_COUNTERMODE_CENTER_UP \
648+
TIM_CR1_CMS_1 /*!< The counter counts up and down alternatively. Output compare interrupt flags of output channels are set only when the counter is counting up \
649+
*/
649650
#define LL_TIM_COUNTERMODE_CENTER_UP_DOWN \
650651
TIM_CR1_CMS /*!< The counter counts up and down alternatively. Output compare interrupt flags of output channels are set only when the counter is counting up or down. */
651652
/**

‎Lib/Vendor/STM32_HAL_LL/STM32L4xx/Src/stm32l4xx_hal_cryp_ex.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,8 +1125,8 @@ HAL_StatusTypeDef HAL_CRYPEx_AES_Auth_IT(CRYP_HandleTypeDef *hcryp, uint8_t *pIn
11251125
if (hcryp->Init.ChainingMode == CRYP_CHAINMODE_AES_GCM_GMAC) {
11261126
headerlength = hcryp->Init.HeaderSize * 8U; /* Header length in bits */
11271127
inputlength = Size * 8U; /* Input length in bits */
1128-
/* Write the number of bits in the header on 64 bits followed by the number
1129-
of bits in the payload on 64 bits as well */
1128+
/* Write the number of bits in the header on 64 bits followed by the number
1129+
of bits in the payload on 64 bits as well */
11301130

11311131
#if !defined(AES_CR_NPBLB)
11321132
if (hcryp->Init.DataType == CRYP_DATATYPE_1B) {
@@ -1484,8 +1484,8 @@ HAL_StatusTypeDef HAL_CRYPEx_AES_Auth_DMA(CRYP_HandleTypeDef *hcryp, uint8_t *pI
14841484
if (hcryp->Init.ChainingMode == CRYP_CHAINMODE_AES_GCM_GMAC) {
14851485
headerlength = hcryp->Init.HeaderSize * 8U; /* Header length in bits */
14861486
inputlength = Size * 8U; /* input length in bits */
1487-
/* Write the number of bits in the header on 64 bits followed by the number
1488-
of bits in the payload on 64 bits as well */
1487+
/* Write the number of bits in the header on 64 bits followed by the number
1488+
of bits in the payload on 64 bits as well */
14891489
#if !defined(AES_CR_NPBLB)
14901490
if (hcryp->Init.DataType == CRYP_DATATYPE_1B) {
14911491
hcryp->Instance->DINR = __RBIT((uint32_t)(headerlength >> 32));

‎Lib/Vendor/STM32_HAL_LL/STM32L4xx/Src/stm32l4xx_hal_dac.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ HAL_StatusTypeDef HAL_DAC_Init(DAC_HandleTypeDef *hdac)
398398
hdac->ConvHalfCpltCallbackCh2 = HAL_DACEx_ConvHalfCpltCallbackCh2;
399399
hdac->ErrorCallbackCh2 = HAL_DACEx_ErrorCallbackCh2;
400400
hdac->DMAUnderrunCallbackCh2 = HAL_DACEx_DMAUnderrunCallbackCh2;
401-
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
401+
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
402402
/* STM32L471xx STM32L475xx STM32L476xx STM32L485xx STM32L486xx STM32L496xx STM32L4A6xx */
403403
/* STM32L4P5xx STM32L4Q5xx */
404404
/* STM32L4R5xx STM32L4R7xx STM32L4R9xx STM32L4S5xx STM32L4S7xx STM32L4S9xx */
@@ -586,7 +586,7 @@ HAL_StatusTypeDef HAL_DAC_Start(DAC_HandleTypeDef *hdac, uint32_t Channel)
586586
SET_BIT(hdac->Instance->SWTRIGR, DAC_SWTRIGR_SWTRIG2);
587587
}
588588
}
589-
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
589+
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
590590
/* STM32L471xx STM32L475xx STM32L476xx STM32L485xx STM32L486xx STM32L496xx STM32L4A6xx */
591591

592592
#if defined(STM32L451xx) || defined(STM32L452xx) || defined(STM32L462xx)
@@ -886,7 +886,7 @@ HAL_StatusTypeDef HAL_DAC_Stop_DMA(DAC_HandleTypeDef *hdac, uint32_t Channel)
886886
/* Disable the DAC DMA underrun interrupt */
887887
__HAL_DAC_DISABLE_IT(hdac, DAC_IT_DMAUDR2);
888888
}
889-
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
889+
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
890890
/* STM32L471xx STM32L475xx STM32L476xx STM32L485xx STM32L486xx STM32L496xx STM32L4A6xx */
891891
/* STM32L4P5xx STM32L4Q5xx */
892892
/* STM32L4R5xx STM32L4R7xx STM32L4R9xx STM32L4S5xx STM32L4S7xx STM32L4S9xx */
@@ -966,7 +966,7 @@ void HAL_DAC_IRQHandler(DAC_HandleTypeDef *hdac)
966966
#endif /* USE_HAL_DAC_REGISTER_CALLBACKS */
967967
}
968968
}
969-
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
969+
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
970970
/* STM32L471xx STM32L475xx STM32L476xx STM32L485xx STM32L486xx STM32L496xx STM32L4A6xx */
971971
/* STM32L4P5xx STM32L4Q5xx */
972972
/* STM32L4R5xx STM32L4R7xx STM32L4R9xx STM32L4S5xx STM32L4S7xx STM32L4S9xx */
@@ -1125,7 +1125,7 @@ uint32_t HAL_DAC_GetValue(DAC_HandleTypeDef *hdac, uint32_t Channel)
11251125
} else {
11261126
return hdac->Instance->DOR2;
11271127
}
1128-
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
1128+
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
11291129
/* STM32L471xx STM32L475xx STM32L476xx STM32L485xx STM32L486xx STM32L496xx STM32L4A6xx */
11301130
/* STM32L4P5xx STM32L4Q5xx */
11311131
/* STM32L4R5xx STM32L4R7xx STM32L4R9xx STM32L4S5xx STM32L4S7xx STM32L4S9xx */
@@ -1551,7 +1551,7 @@ HAL_StatusTypeDef HAL_DAC_UnRegisterCallback(DAC_HandleTypeDef *hdac, HAL_DAC_Ca
15511551
hdac->ConvHalfCpltCallbackCh2 = HAL_DACEx_ConvHalfCpltCallbackCh2;
15521552
hdac->ErrorCallbackCh2 = HAL_DACEx_ErrorCallbackCh2;
15531553
hdac->DMAUnderrunCallbackCh2 = HAL_DACEx_DMAUnderrunCallbackCh2;
1554-
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
1554+
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
15551555
/* STM32L471xx STM32L475xx STM32L476xx STM32L485xx STM32L486xx STM32L496xx STM32L4A6xx */
15561556
/* STM32L4P5xx STM32L4Q5xx */
15571557
/* STM32L4R5xx STM32L4R7xx STM32L4R9xx STM32L4S5xx STM32L4S7xx STM32L4S9xx */

‎Lib/Vendor/STM32_HAL_LL/STM32L4xx/Src/stm32l4xx_hal_dac_ex.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ HAL_StatusTypeDef HAL_DACEx_SelfCalibrate(DAC_HandleTypeDef *hdac, DAC_ChannelCo
361361
} else {
362362
tmp += DAC_DHR12R2_ALIGNMENT(DAC_ALIGN_12B_R);
363363
}
364-
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
364+
#endif /* STM32L431xx STM32L432xx STM32L433xx STM32L442xx STM32L443xx */
365365
/* STM32L471xx STM32L475xx STM32L476xx STM32L485xx STM32L486xx STM32L496xx STM32L4A6xx */
366366
/* STM32L4P5xx STM32L4Q5xx */
367367
/* STM32L4R5xx STM32L4R7xx STM32L4R9xx STM32L4S5xx STM32L4S7xx STM32L4S9xx */

‎Lib/Vendor/STM32_HAL_LL/STM32L4xx/Src/stm32l4xx_hal_smartcard.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,10 @@
206206
((uint32_t)(USART_CR1_M | USART_CR1_PCE | USART_CR1_PS | USART_CR1_TE | USART_CR1_RE | USART_CR1_OVER8 | \
207207
USART_CR1_FIFOEN)) /*!< USART CR1 fields of parameters set by SMARTCARD_SetConfig API */
208208
#else
209-
#define USART_CR1_FIELDS ((uint32_t)(USART_CR1_M | USART_CR1_PCE | USART_CR1_PS | USART_CR1_TE | USART_CR1_RE | USART_CR1_OVER8)) /*!< USART CR1 fields of parameters set by SMARTCARD_SetConfig API \
210-
*/
211-
#endif /* USART_CR1_FIFOEN */
209+
#define USART_CR1_FIELDS \
210+
((uint32_t)(USART_CR1_M | USART_CR1_PCE | USART_CR1_PS | USART_CR1_TE | USART_CR1_RE | USART_CR1_OVER8)) /*!< USART CR1 fields of parameters set by SMARTCARD_SetConfig API \
211+
*/
212+
#endif /* USART_CR1_FIFOEN */
212213

213214
#define USART_CR2_CLK_FIELDS ((uint32_t)(USART_CR2_CLKEN | USART_CR2_CPOL | USART_CR2_CPHA | USART_CR2_LBCL)) /*!< SMARTCARD clock-related USART CR2 fields of parameters */
214215

0 commit comments

Comments
 (0)