APM: Formatting changes for cleanup (#14431)

* APM: Formatting changes for cleanup

* Formatting inconsistency

* Missed in first round

* Adjusted as per @ledvinap

src/platform/APM32/adc_apm32f4xx.c

@@ -270,8 +270,7 @@ void adcInit(const adcConfig_t *config)
         adcInitDevice(&adcInternal, 2);
         DDL_ADC_Enable(adcInternal.ADCx);
         adcInitInternalInjected(&adcInternal);
-    }
+    } else {
-    else {
         // Initialize for injected conversion
         adcInitInternalInjected(&adc);
     }

src/platform/APM32/apm32f4xx_ddl_ex.h

@@ -31,10 +31,12 @@ __STATIC_INLINE void DDL_EX_TMR_DisableIT(TMR_TypeDef *TMRx, uint32_t Sources)
 {
     CLEAR_BIT(TMRx->DIEN, Sources);
 }
+
 __STATIC_INLINE void DDL_EX_TMR_EnableIT(TMR_TypeDef *TMRx, uint32_t Sources)
 {
     SET_BIT(TMRx->DIEN, Sources);
 }
+
 __STATIC_INLINE uint32_t DDL_EX_DMA_Stream_to_Stream(DMA_Stream_TypeDef *DMAx_Streamy)
 {
     STATIC_ASSERT(DMA1_Stream0_BASE - DMA1_BASE == sizeof(DMA_TypeDef), DMA_TypeDef_has_padding);
@@ -45,11 +47,13 @@ __STATIC_INLINE uint32_t DDL_EX_DMA_Stream_to_Stream(DMA_Stream_TypeDef *DMAx_St
 
     return (((uint32_t) DMAx_Streamy & 0XFF) - firstStreamOffset) / streamSize;
 }
+
 __STATIC_INLINE DMA_TypeDef *DDL_EX_DMA_Stream_to_DMA(DMA_Stream_TypeDef *DMAx_Streamy)
 {
     // clear stream address
     return (DMA_TypeDef *) (((uint32_t) DMAx_Streamy) & ((uint32_t) ~0XFF));
 }
+
 __STATIC_INLINE uint32_t DDL_EX_DMA_DeInit(DMA_Stream_TypeDef *DMAx_Streamy)
 {
     DMA_TypeDef *DMA = DDL_EX_DMA_Stream_to_DMA(DMAx_Streamy);
@@ -57,6 +61,7 @@ __STATIC_INLINE uint32_t DDL_EX_DMA_DeInit(DMA_Stream_TypeDef *DMAx_Streamy)
 
     return DDL_DMA_DeInit(DMA, Stream);
 }
+
 __STATIC_INLINE uint32_t DDL_EX_DMA_Init(DMA_Stream_TypeDef *DMAx_Streamy, DDL_DMA_InitTypeDef *DMA_InitStruct)
 {
     DMA_TypeDef *DMA = DDL_EX_DMA_Stream_to_DMA(DMAx_Streamy);
@@ -64,6 +69,7 @@ __STATIC_INLINE uint32_t DDL_EX_DMA_Init(DMA_Stream_TypeDef *DMAx_Streamy, DDL_D
 
     return DDL_DMA_Init(DMA, Stream, DMA_InitStruct);
 }
+
 __STATIC_INLINE void DDL_EX_DMA_SetDataLength(DMA_Stream_TypeDef* DMAx_Streamy, uint32_t NbData)
 {
     MODIFY_REG(DMAx_Streamy->NDATA, DMA_NDATAx, NbData);
@@ -81,6 +87,7 @@ __STATIC_INLINE void DDL_EX_DMA_EnableResource(DMA_Stream_TypeDef *DMAx_Streamy)
 {
     SET_BIT(DMAx_Streamy->SCFG, DMA_SCFGx_EN);
 }
+
 __STATIC_INLINE void DDL_EX_DMA_DisableResource(DMA_Stream_TypeDef *DMAx_Streamy)
 {
     CLEAR_BIT(DMAx_Streamy->SCFG, DMA_SCFGx_EN);

src/platform/APM32/bus_i2c_apm32.c

@@ -76,7 +76,7 @@ static volatile uint16_t i2cErrorCount = 0;
 
 static bool i2cHandleHardwareFailure(I2CDevice device)
 {
-    (void)device;
+    UNUSED(device);
     i2cErrorCount++;
     // reinit peripheral + clock out garbage
     //i2cInit(device);
@@ -103,13 +103,15 @@ bool i2cWrite(I2CDevice device, uint8_t addr_, uint8_t reg_, uint8_t data)
 
     HAL_StatusTypeDef status;
 
-    if (reg_ == 0xFF)
+    if (reg_ == 0xFF) {
         status = DAL_I2C_Master_Transmit(pHandle ,addr_ << 1, &data, 1, I2C_TIMEOUT_SYS_TICKS);
-    else
+    } else {
         status = DAL_I2C_Mem_Write(pHandle ,addr_ << 1, reg_, I2C_MEMADD_SIZE_8BIT, &data, 1, I2C_TIMEOUT_SYS_TICKS);
+    }
 
-    if (status != DAL_OK)
+    if (status != DAL_OK) {
         return i2cHandleHardwareFailure(device);
+    }
 
     return true;
 }
@@ -135,8 +137,7 @@ bool i2cWriteBuffer(I2CDevice device, uint8_t addr_, uint8_t reg_, uint8_t len_,
         return false;
     }
 
-    if (status != DAL_OK)
+    if (status != DAL_OK) {
-    {
         return i2cHandleHardwareFailure(device);
     }
 
@@ -158,10 +159,11 @@ bool i2cRead(I2CDevice device, uint8_t addr_, uint8_t reg_, uint8_t len, uint8_t
 
     DAL_StatusTypeDef status;
 
-    if (reg_ == 0xFF)
+    if (reg_ == 0xFF) {
         status = DAL_I2C_Master_Receive(pHandle ,addr_ << 1, buf, len, I2C_TIMEOUT_SYS_TICKS);
-    else
+    } else {
         status = DAL_I2C_Mem_Read(pHandle, addr_ << 1, reg_, I2C_MEMADD_SIZE_8BIT,buf, len, I2C_TIMEOUT_SYS_TICKS);
+    }
 
     if (status != DAL_OK) {
         return i2cHandleHardwareFailure(device);
@@ -206,8 +208,7 @@ bool i2cBusy(I2CDevice device, bool *error)
         *error = pHandle->ErrorCode;
     }
 
-    if (pHandle->State == DAL_I2C_STATE_READY)
+    if (pHandle->State == DAL_I2C_STATE_READY) {
-    {
         if (__DAL_I2C_GET_FLAG(pHandle, I2C_FLAG_BUSY) == SET)
         {
             return true;
@@ -218,5 +219,4 @@ bool i2cBusy(I2CDevice device, bool *error)
 
     return true;
 }
-
 #endif

src/platform/APM32/bus_spi_apm32.c

@@ -347,8 +347,7 @@ FAST_CODE void spiSequenceStart(const extDevice_t *dev)
             IOConfigGPIOAF(IOGetByTag(spi->sck), SPI_IO_AF_SCK_CFG_LOW, spi->sckAF);
             DDL_SPI_SetClockPhase(instance, DDL_SPI_PHASE_1EDGE);
             DDL_SPI_SetClockPolarity(instance, DDL_SPI_POLARITY_LOW);
-        }
+        } else {
-        else {
             IOConfigGPIOAF(IOGetByTag(spi->sck), SPI_IO_AF_SCK_CFG_HIGH, spi->sckAF);
             DDL_SPI_SetClockPhase(instance, DDL_SPI_PHASE_2EDGE);
             DDL_SPI_SetClockPolarity(instance, DDL_SPI_POLARITY_HIGH);

src/platform/APM32/dshot_bitbang.c

@@ -450,14 +450,15 @@ static bool bbMotorConfig(IO_t io, uint8_t motorIndex, motorProtocolTypes_e pwmP
 
     bbGpioSetup(&bbMotors[motorIndex]);
 
+    do {
 #ifdef USE_DSHOT_TELEMETRY
     if (useDshotTelemetry) {
         bbOutputDataInit(bbPort->portOutputBuffer, (1 << pinIndex), DSHOT_BITBANG_INVERTED);
-    } else
+        break;
-#endif
-    {
-        bbOutputDataInit(bbPort->portOutputBuffer, (1 << pinIndex), DSHOT_BITBANG_NONINVERTED);
     }
+#endif
+        bbOutputDataInit(bbPort->portOutputBuffer, (1 << pinIndex), DSHOT_BITBANG_NONINVERTED);
+    } while (false);
 
     bbSwitchToOutput(bbPort);
 
@@ -577,14 +578,15 @@ static void bbWriteInt(uint8_t motorIndex, uint16_t value)
 
     bbPort_t *bbPort = bbmotor->bbPort;
 
+    do {
 #ifdef USE_DSHOT_TELEMETRY
         if (useDshotTelemetry) {
             bbOutputDataSet(bbPort->portOutputBuffer, bbmotor->pinIndex, packet, DSHOT_BITBANG_INVERTED);
-    } else
+            break;
-#endif
-    {
-        bbOutputDataSet(bbPort->portOutputBuffer, bbmotor->pinIndex, packet, DSHOT_BITBANG_NONINVERTED);
         }
+#endif
+        bbOutputDataSet(bbPort->portOutputBuffer, bbmotor->pinIndex, packet, DSHOT_BITBANG_NONINVERTED);
+    } while (false);
 }
 
 static void bbWrite(uint8_t motorIndex, float value)
@@ -614,11 +616,8 @@ static void bbUpdateComplete(void)
                 bbPort->inputActive = false;
                 bbSwitchToOutput(bbPort);
             }
-        } else
-#endif
-        {
-            // Nothing to do
         }
+#endif
 
         bbDMA_Cmd(bbPort, ENABLE);
     }

src/platform/APM32/dshot_bitbang_ddl.c

@@ -56,23 +56,12 @@ void bbGpioSetup(bbMotor_t *bbMotor)
     bbPort->gpioModeInput |= (DDL_GPIO_MODE_INPUT << (pinIndex * 2));
     bbPort->gpioModeOutput |= (DDL_GPIO_MODE_OUTPUT << (pinIndex * 2));
 
+    bool inverted = false;
 #ifdef USE_DSHOT_TELEMETRY
-    if (useDshotTelemetry) {
+    inverted = true;
-        bbPort->gpioIdleBSRR |= (1 << pinIndex);         // BS (lower half)
-    } else
 #endif
-    {
+    bbPort->gpioIdleBSRR |= (1 << pinIndex) + (inverted ? 0 : 16); // write BITSET or BITRESET half of BSRR
-        bbPort->gpioIdleBSRR |= (1 << (pinIndex + 16));  // BR (higher half)
+    IOWrite(bbMotor->io, inverted);
-    }
-
-#ifdef USE_DSHOT_TELEMETRY
-    if (useDshotTelemetry) {
-        IOWrite(bbMotor->io, 1);
-    } else
-#endif
-    {
-        IOWrite(bbMotor->io, 0);
-    }
 }
 
 void bbTimerChannelInit(bbPort_t *bbPort)

src/platform/APM32/pwm_output_dshot_apm32.c

@@ -133,6 +133,7 @@ FAST_CODE void pwmCompleteDshotMotorUpdate(void)
     }
 
     for (int i = 0; i < dmaMotorTimerCount; i++) {
+        do {
 #ifdef USE_DSHOT_DMAR
             if (useBurstDshot) {
                 xDDL_EX_DMA_SetDataLength(dmaMotorTimers[i].dmaBurstRef, dmaMotorTimers[i].dmaBurstLength);
@@ -142,9 +143,9 @@ FAST_CODE void pwmCompleteDshotMotorUpdate(void)
                 DDL_TMR_ConfigDMABurst(dmaMotorTimers[i].timer, DDL_TMR_DMABURST_BASEADDR_CC1, DDL_TMR_DMABURST_LENGTH_4TRANSFERS);
                 /* Enable the TIM DMA Request */
                 DDL_TMR_EnableDMAReq_UPDATE(dmaMotorTimers[i].timer);
-        } else
+                break;
+            }
 #endif
-        {
             DDL_TMR_DisableARRPreload(dmaMotorTimers[i].timer);
             dmaMotorTimers[i].timer->AUTORLD = dmaMotorTimers[i].outputPeriod;
 
@@ -153,7 +154,7 @@ FAST_CODE void pwmCompleteDshotMotorUpdate(void)
             /* Enable channel DMA requests */
             DDL_EX_TMR_EnableIT(dmaMotorTimers[i].timer, dmaMotorTimers[i].timerDmaSources);
             dmaMotorTimers[i].timerDmaSources = 0;
-        }
+        } while (false);
     }
 }
 
@@ -164,16 +165,17 @@ FAST_CODE static void motor_DMA_IRQHandler(dmaChannelDescriptor_t* descriptor)
 #ifdef USE_DSHOT_TELEMETRY
         dshotDMAHandlerCycleCounters.irqAt = getCycleCounter();
 #endif
+        do {
 #ifdef USE_DSHOT_DMAR
             if (useBurstDshot) {
                 xDDL_EX_DMA_DisableResource(motor->timerHardware->dmaTimUPRef);
                 DDL_TMR_DisableDMAReq_UPDATE(motor->timerHardware->tim);
-        } else
+                break;
+            }
 #endif
-        {
             xDDL_EX_DMA_DisableResource(motor->dmaRef);
             DDL_EX_TMR_DisableIT(motor->timerHardware->tim, motor->timerDmaSource);
-        }
+        } while (false);
 
 #ifdef USE_DSHOT_TELEMETRY
         if (useDshotTelemetry) {
@@ -228,6 +230,7 @@ bool pwmDshotMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t m
     dmaIdentifier_e dmaIdentifier = dmaGetIdentifier(dmaRef);
 
     bool dmaIsConfigured = false;
+    do {
 #ifdef USE_DSHOT_DMAR
         if (useBurstDshot) {
             const resourceOwner_t *owner = dmaGetOwner(dmaIdentifier);
@@ -236,13 +239,13 @@ bool pwmDshotMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t m
             } else if (!dmaAllocate(dmaIdentifier, OWNER_TIMUP, timerGetTIMNumber(timerHardware->tim))) {
                 return false;
             }
-    } else
+            break;
+        }
 #endif
-    {
         if (!dmaAllocate(dmaIdentifier, OWNER_MOTOR, RESOURCE_INDEX(reorderedMotorIndex))) {
             return false;
         }
-    }
+    } while (false);
 
     motorDmaOutput_t * const motor = &dmaMotors[motorIndex];
     motor->dmaRef = dmaRef;
@@ -312,18 +315,19 @@ bool pwmDshotMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t m
     }
     motor->llChannel = channel;
 
+    do {
 #ifdef USE_DSHOT_DMAR
         if (useBurstDshot) {
             motor->timer->dmaBurstRef = dmaRef;
 #ifdef USE_DSHOT_TELEMETRY
             motor->dmaRef = dmaRef;
 #endif
-    } else
+            break;
+        }
 #endif
-    {
         motor->timerDmaSource = timerDmaSource(timerHardware->channel);
         motor->timer->timerDmaSources &= ~motor->timerDmaSource;
-    }
+    } while (false);
 
     if (!dmaIsConfigured) {
         xDDL_EX_DMA_DisableResource(dmaRef);
@@ -333,6 +337,7 @@ bool pwmDshotMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t m
     }
 
     DDL_DMA_StructInit(&DMAINIT);
+    do {
 #ifdef USE_DSHOT_DMAR
         if (useBurstDshot) {
             motor->timer->dmaBurstBuffer = &dshotBurstDmaBuffer[timerIndex][0];
@@ -341,16 +346,16 @@ bool pwmDshotMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t m
             DMAINIT.MemoryOrM2MDstAddress = (uint32_t)motor->timer->dmaBurstBuffer;
             DMAINIT.FIFOThreshold = DDL_DMA_FIFOTHRESHOLD_FULL;
             DMAINIT.PeriphOrM2MSrcAddress = (uint32_t)&timerHardware->tim->DMAR;
-    } else
+            break;
+        }
 #endif
-    {
         motor->dmaBuffer = &dshotDmaBuffer[motorIndex][0];
 
         DMAINIT.Channel = dmaChannel;
         DMAINIT.MemoryOrM2MDstAddress = (uint32_t)motor->dmaBuffer;
         DMAINIT.FIFOThreshold = DDL_DMA_FIFOTHRESHOLD_1_4;
         DMAINIT.PeriphOrM2MSrcAddress = (uint32_t)timerChCCR(timerHardware);
-    }
+    } while (false);
 
     DMAINIT.Direction = DDL_DMA_DIRECTION_MEMORY_TO_PERIPH;
     DMAINIT.FIFOMode = DDL_DMA_FIFOMODE_ENABLE;
@@ -380,16 +385,17 @@ bool pwmDshotMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t m
     pwmDshotSetDirectionOutput(motor, &OCINIT, &DMAINIT);
 #endif
 
+    do {
 #ifdef USE_DSHOT_DMAR
         if (useBurstDshot) {
             if (!dmaIsConfigured) {
                 dmaSetHandler(dmaIdentifier, motor_DMA_IRQHandler, NVIC_PRIO_DSHOT_DMA, motor->index);
             }
-    } else
+            break;
-#endif
-    {
-        dmaSetHandler(dmaIdentifier, motor_DMA_IRQHandler, NVIC_PRIO_DSHOT_DMA, motor->index);
         }
+#endif
+        dmaSetHandler(dmaIdentifier, motor_DMA_IRQHandler, NVIC_PRIO_DSHOT_DMA, motor->index);
+    } while (false);
 
     DDL_TMR_OC_Init(timer, channel, &OCINIT);
     DDL_TMR_OC_EnablePreload(timer, channel);

src/platform/APM32/serial_uart_apm32.c

@@ -82,6 +82,7 @@ void uartReconfigure(uartPort_t *uartPort)
 
     // Receive DMA or IRQ
     if (uartPort->port.mode & MODE_RX) {
+        do {
 #ifdef USE_DMA
             if (uartPort->rxDMAResource) {
                 uartPort->rxDMAHandle.Instance = (DMA_ARCH_TYPE *)uartPort->rxDMAResource;
@@ -108,9 +109,10 @@ void uartReconfigure(uartPort_t *uartPort)
                 DAL_UART_Receive_DMA(&uartPort->Handle, (uint8_t*)uartPort->port.rxBuffer, uartPort->port.rxBufferSize);
 
                 uartPort->rxDMAPos = __DAL_DMA_GET_COUNTER(&uartPort->rxDMAHandle);
-        } else
+                break;
+            }
 #endif
-        {
+
             /* Enable the UART Parity Error Interrupt */
             SET_BIT(uartPort->USARTx->CTRL1, USART_CTRL1_PEIEN);
 
@@ -122,11 +124,12 @@ void uartReconfigure(uartPort_t *uartPort)
 
             /* Enable Idle Line detection */
             SET_BIT(uartPort->USARTx->CTRL1, USART_CTRL1_IDLEIEN);
-        }
+        } while(false);
     }
 
     // Transmit DMA or IRQ
     if (uartPort->port.mode & MODE_TX) {
+        do {
 #ifdef USE_DMA
             if (uartPort->txDMAResource) {
                 uartPort->txDMAHandle.Instance = (DMA_ARCH_TYPE *)uartPort->txDMAResource;
@@ -152,14 +155,13 @@ void uartReconfigure(uartPort_t *uartPort)
                 __DAL_LINKDMA(&uartPort->Handle, hdmatx, uartPort->txDMAHandle);
 
                 __DAL_DMA_SET_COUNTER(&uartPort->txDMAHandle, 0);
-        } else
+                break;
+            }
 #endif
-        {
-
             /* Enable the UART Transmit Data Register Empty Interrupt */
             SET_BIT(uartPort->USARTx->CTRL1, USART_CTRL1_TXBEIEN);
             SET_BIT(uartPort->USARTx->CTRL1, USART_CTRL1_TXCIEN);
-        }
+        } while(false);
     }
 }
 

src/platform/APM32/serial_uart_apm32f4xx.c

@@ -269,10 +269,12 @@ void uartDmaIrqHandler(dmaChannelDescriptor_t* descriptor)
         }
         handleUsartTxDma(s);
     }
+
     if (DMA_GET_FLAG_STATUS(descriptor, DMA_IT_TEIF))
     {
         DMA_CLEAR_FLAG(descriptor, DMA_IT_TEIF);
     }
+
     if (DMA_GET_FLAG_STATUS(descriptor, DMA_IT_DMEIF))
     {
         DMA_CLEAR_FLAG(descriptor, DMA_IT_DMEIF);

src/platform/APM32/system_apm32f4xx.c

@@ -121,11 +121,12 @@ void enableGPIOPowerUsageAndNoiseReductions(void)
 
 bool isMPUSoftReset(void)
 {
-    if (cachedRccCsrValue & RCM_CSTS_SWRSTFLG)
+    if (cachedRccCsrValue & RCM_CSTS_SWRSTFLG) {
         return true;
-    else
+    } else {
         return false;
     }
+}
 
 void systemInit(void)
 {

src/platform/APM32/timer_apm32.c

@@ -340,7 +340,9 @@ TMR_HandleTypeDef* timerFindTimerHandle(TMR_TypeDef *tim)
 void timerReconfigureTimeBase(TMR_TypeDef *tim, uint16_t period, uint32_t hz)
 {
     TMR_HandleTypeDef* handle = timerFindTimerHandle(tim);
-    if (handle == NULL) return;
+    if (handle == NULL) {
+        return;
+    }
 
     handle->Init.Period = (period - 1) & 0xffff; // AKA TIMx_ARR
     handle->Init.Prescaler = (timerClock(tim) / hz) - 1;
@@ -351,7 +353,9 @@ void timerReconfigureTimeBase(TMR_TypeDef *tim, uint16_t period, uint32_t hz)
 void configTimeBase(TMR_TypeDef *tim, uint16_t period, uint32_t hz)
 {
     TMR_HandleTypeDef* handle = timerFindTimerHandle(tim);
-    if (handle == NULL) return;
+    if (handle == NULL) {
+        return;
+    }
 
     if (handle->Instance == tim) {
         // already configured
@@ -368,8 +372,7 @@ void configTimeBase(TMR_TypeDef *tim, uint16_t period, uint32_t hz)
     handle->Init.RepetitionCounter = 0x0000;
 
     DAL_TMR_Base_Init(handle);
-    if (tim == TMR1 || tim == TMR2 || tim == TMR3 || tim == TMR4 || tim == TMR5 || tim == TMR8 || tim == TMR9)
+    if (tim == TMR1 || tim == TMR2 || tim == TMR3 || tim == TMR4 || tim == TMR5 || tim == TMR8 || tim == TMR9) {
-    {
         TMR_ClockConfigTypeDef sClockSourceConfig;
         memset(&sClockSourceConfig, 0, sizeof(sClockSourceConfig));
         sClockSourceConfig.ClockSource = TMR_CLOCKSOURCE_INTERNAL;
@@ -402,7 +405,6 @@ void timerConfigure(const timerHardware_t *timerHardwarePtr, uint16_t period, ui
     timerNVICConfigure(irq);
     // HACK - enable second IRQ on timers that need it
     switch (irq) {
-
     case TMR1_CC_IRQn:
         timerNVICConfigure(TMR1_UP_TMR10_IRQn);
         break;
@@ -421,13 +423,16 @@ void timerChInit(const timerHardware_t *timHw, channelType_t type, int irqPriori
         return;
     }
     unsigned channel = timHw - TIMER_HARDWARE;
-    if (channel >= TIMER_CHANNEL_COUNT)
+    if (channel >= TIMER_CHANNEL_COUNT) {
         return;
+    }
 
     timerChannelInfo[channel].type = type;
     unsigned timer = lookupTimerIndex(timHw->tim);
-    if (timer >= USED_TIMER_COUNT)
+    if (timer >= USED_TIMER_COUNT) {
         return;
+    }
+
     if (irqPriority < timerInfo[timer].priority) {
         // it would be better to set priority in the end, but current startup sequence is not ready
         configTimeBase(usedTimers[timer], 0, 1);
@@ -476,11 +481,12 @@ static void timerChConfig_UpdateOverflow(timerConfig_t *cfg, const TMR_TypeDef *
         *chain = NULL;
     }
     // enable or disable IRQ
-    if (cfg->overflowCallbackActive)
+    if (cfg->overflowCallbackActive) {
         __DAL_TMR_ENABLE_IT(&timerHandle[timerIndex].Handle, TMR_IT_UPDATE);
-    else
+    } else {
         __DAL_TMR_DISABLE_IT(&timerHandle[timerIndex].Handle, TMR_IT_UPDATE);
     }
+}
 
 // config edge and overflow callback for channel. Try to avoid overflowCallback, it is a bit expensive
 void timerChConfigCallbacks(const timerHardware_t *timHw, timerCCHandlerRec_t *edgeCallback, timerOvrHandlerRec_t *overflowCallback)
@@ -490,14 +496,17 @@ void timerChConfigCallbacks(const timerHardware_t *timHw, timerCCHandlerRec_t *e
         return;
     }
     uint8_t channelIndex = lookupChannelIndex(timHw->channel);
-    if (edgeCallback == NULL)   // disable irq before changing callback to NULL
+    if (edgeCallback == NULL) {   // disable irq before changing callback to NULL
         __DAL_TMR_DISABLE_IT(&timerHandle[timerIndex].Handle, TIM_IT_CCx(timHw->channel));
+    }
+
     // setup callback info
     timerConfig[timerIndex].edgeCallback[channelIndex] = edgeCallback;
     timerConfig[timerIndex].overflowCallback[channelIndex] = overflowCallback;
     // enable channel IRQ
-    if (edgeCallback)
+    if (edgeCallback) {
         __DAL_TMR_ENABLE_IT(&timerHandle[timerIndex].Handle, TIM_IT_CCx(timHw->channel));
+    }
 
     timerChConfig_UpdateOverflow(&timerConfig[timerIndex], timHw->tim);
 }
@@ -525,10 +534,13 @@ void timerChConfigCallbacksDual(const timerHardware_t *timHw, timerCCHandlerRec_
     uint16_t chHi = timHw->channel | TMR_CHANNEL_2;    // upper channel
     uint8_t channelIndex = lookupChannelIndex(chLo);   // get index of lower channel
 
-    if (edgeCallbackLo == NULL)   // disable irq before changing setting callback to NULL
+    if (edgeCallbackLo == NULL) {  // disable irq before changing setting callback to NULL
         __DAL_TMR_DISABLE_IT(&timerHandle[timerIndex].Handle, TIM_IT_CCx(chLo));
-    if (edgeCallbackHi == NULL)   // disable irq before changing setting callback to NULL
+    }
+
+    if (edgeCallbackHi == NULL) {   // disable irq before changing setting callback to NULL
         __DAL_TMR_DISABLE_IT(&timerHandle[timerIndex].Handle, TIM_IT_CCx(chHi));
+    }
 
     // setup callback info
     timerConfig[timerIndex].edgeCallback[channelIndex] = edgeCallbackLo;
@@ -541,6 +553,7 @@ void timerChConfigCallbacksDual(const timerHardware_t *timHw, timerCCHandlerRec_
         __DAL_TMR_CLEAR_FLAG(&timerHandle[timerIndex].Handle, TIM_IT_CCx(chLo));
         __DAL_TMR_ENABLE_IT(&timerHandle[timerIndex].Handle, TIM_IT_CCx(chLo));
     }
+
     if (edgeCallbackHi) {
         __DAL_TMR_CLEAR_FLAG(&timerHandle[timerIndex].Handle, TIM_IT_CCx(chHi));
         __DAL_TMR_ENABLE_IT(&timerHandle[timerIndex].Handle, TIM_IT_CCx(chHi));
@@ -561,11 +574,12 @@ void timerChITConfigDualLo(const timerHardware_t *timHw, FunctionalState newStat
         return;
     }
 
-    if (newState)
+    if (newState) {
         __DAL_TMR_ENABLE_IT(&timerHandle[timerIndex].Handle, TIM_IT_CCx(timHw->channel & ~TMR_CHANNEL_2));
-    else
+    } else {
         __DAL_TMR_DISABLE_IT(&timerHandle[timerIndex].Handle, TIM_IT_CCx(timHw->channel & ~TMR_CHANNEL_2));
     }
+}
 
 //// enable or disable IRQ
 //void timerChITConfig(const timerHardware_t *timHw, FunctionalState newState)
@@ -580,11 +594,12 @@ void timerChITConfig(const timerHardware_t *timHw, FunctionalState newState)
         return;
     }
 
-    if (newState)
+    if (newState) {
         __DAL_TMR_ENABLE_IT(&timerHandle[timerIndex].Handle, TIM_IT_CCx(timHw->channel));
-    else
+    } else {
         __DAL_TMR_DISABLE_IT(&timerHandle[timerIndex].Handle, TIM_IT_CCx(timHw->channel));
     }
+}
 
 // clear Compare/Capture flag for channel
 //void timerChClearCCFlag(const timerHardware_t *timHw)
@@ -623,9 +638,11 @@ static unsigned getFilter(unsigned ticks)
         16*5, 16*6, 16*8,
         32*5, 32*6, 32*8
     };
-    for (unsigned i = 1; i < ARRAYLEN(ftab); i++)
+    for (unsigned i = 1; i < ARRAYLEN(ftab); i++) {
-        if (ftab[i] > ticks)
+        if (ftab[i] > ticks) {
             return i - 1;
+        }
+    }
     return 0x0f;
 }
 
@@ -633,8 +650,9 @@ static unsigned getFilter(unsigned ticks)
 void timerChConfigIC(const timerHardware_t *timHw, bool polarityRising, unsigned inputFilterTicks)
 {
     unsigned timer = lookupTimerIndex(timHw->tim);
-    if (timer >= USED_TIMER_COUNT)
+    if (timer >= USED_TIMER_COUNT) {
         return;
+    }
 
     TMR_IC_InitTypeDef TIM_ICInitStructure;
 
@@ -650,8 +668,9 @@ void timerChConfigIC(const timerHardware_t *timHw, bool polarityRising, unsigned
 void timerChConfigICDual(const timerHardware_t *timHw, bool polarityRising, unsigned inputFilterTicks)
 {
     unsigned timer = lookupTimerIndex(timHw->tim);
-    if (timer >= USED_TIMER_COUNT)
+    if (timer >= USED_TIMER_COUNT) {
         return;
+    }
 
     TMR_IC_InitTypeDef TIM_ICInitStructure;
     bool directRising = (timHw->channel & TMR_CHANNEL_2) ? !polarityRising : polarityRising;
@@ -695,8 +714,9 @@ volatile timCCR_t* timerChCCR(const timerHardware_t *timHw)
 void timerChConfigOC(const timerHardware_t* timHw, bool outEnable, bool stateHigh)
 {
     unsigned timer = lookupTimerIndex(timHw->tim);
-    if (timer >= USED_TIMER_COUNT)
+    if (timer >= USED_TIMER_COUNT) {
         return;
+    }
 
     TMR_OC_InitTypeDef TIM_OCInitStructure;
 
@@ -1000,7 +1020,9 @@ void timerInit(void)
 void timerStart(TMR_TypeDef *tim)
 {
     TMR_HandleTypeDef* handle = timerFindTimerHandle(tim);
-    if (handle == NULL) return;
+    if (handle == NULL) {
+        return;
+    }
 
     __DAL_TMR_ENABLE(handle);
 }
@@ -1135,13 +1157,16 @@ DAL_StatusTypeDef DMA_SetCurrDataCounter(TMR_HandleTypeDef *htim, uint32_t Chann
 {
     if ((htim->State == DAL_TMR_STATE_BUSY)) {
         return DAL_BUSY;
-    } else if ((htim->State == DAL_TMR_STATE_READY)) {
+    } else {
+        if ((htim->State == DAL_TMR_STATE_READY)) {
             if (((uint32_t) pData == 0) && (Length > 0)) {
                 return DAL_ERROR;
             } else {
                 htim->State = DAL_TMR_STATE_BUSY;
             }
         }
+    }
+
     switch (Channel) {
     case TMR_CHANNEL_1: {
         /* Set the DMA Period elapsed callback */

src/platform/APM32/transponder_ir_io_apm32.c

@@ -165,6 +165,7 @@ void transponderIrHardwareInit(ioTag_t ioTag, transponder_t *transponder)
         /* Configuration Error */
         return;
     }
+
     if (timerHardware->output & TIMER_OUTPUT_N_CHANNEL) {
         if (DAL_TMREx_PWMN_Start(&TmrHandle, timerChannel) != DAL_OK) {
             /* Starting PWM generation Error */