switch case cleanup

betaflight · Aug 25, 2022 · 405d574 · 405d574
1 parent c8a6f2a
commit 405d574
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 24 deletions.
diff --git a/src/main/drivers/dshot_command.c b/src/main/drivers/dshot_command.c
@@ -160,18 +160,14 @@ bool dshotStreamingCommandsAreEnabled(void)
 static bool dshotCommandsAreEnabled(dshotCommandType_e commandType)
 {
     bool ret = false;
-
     switch (commandType) {
     case DSHOT_CMD_TYPE_BLOCKING:
         ret = !motorIsEnabled();
-
         break;
     case DSHOT_CMD_TYPE_INLINE:
         ret = dshotStreamingCommandsAreEnabled();
-
         break;
     default:
-
         break;
     }
 

diff --git a/src/main/drivers/mco.c b/src/main/drivers/mco.c
@@ -89,6 +89,8 @@ void mcoConfigure(MCODevice_e device, const mcoConfig_t *config)
         IOConfigGPIOAF(io, IO_CONFIG(GPIO_Mode_AF, GPIO_Speed_50MHz, GPIO_OType_PP, GPIO_PuPd_NOPULL), GPIO_AF_MCO);
 #endif
         break;
+    default:
+        break;
     }
 #elif defined(STM32G4)
     // G4 only supports one MCO on PA8

diff --git a/src/main/drivers/motor.c b/src/main/drivers/motor.c
@@ -111,7 +111,6 @@ bool checkMotorProtocolEnabled(const motorDevConfig_t *motorDevConfig, bool *isP
     case PWM_TYPE_MULTISHOT:
     case PWM_TYPE_BRUSHED:
         enabled = true;
-
         break;
 
 #ifdef USE_DSHOT
@@ -121,11 +120,9 @@ bool checkMotorProtocolEnabled(const motorDevConfig_t *motorDevConfig, bool *isP
     case PWM_TYPE_PROSHOT1000:
         enabled = true;
         isDshot = true;
-
         break;
 #endif
     default:
-
         break;
     }
 

diff --git a/src/main/drivers/pinio.c b/src/main/drivers/pinio.c
@@ -58,6 +58,8 @@ void pinioInit(const pinioConfig_t *pinioConfig)
             }
             IOConfigGPIO(io, IOCFG_OUT_PP);
             break;
+        default:
+            break;
         }
 
         if (pinioConfig->config[i] & PINIO_CONFIG_OUT_INVERTED)

diff --git a/src/main/drivers/pwm_output_dshot_hal.c b/src/main/drivers/pwm_output_dshot_hal.c
@@ -331,6 +331,7 @@ bool pwmDshotMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t m
     case TIM_CHANNEL_2: channel = LL_TIM_CHANNEL_CH2; break;
     case TIM_CHANNEL_3: channel = LL_TIM_CHANNEL_CH3; break;
     case TIM_CHANNEL_4: channel = LL_TIM_CHANNEL_CH4; break;
+    default: break;
     }
     motor->llChannel = channel;
 

diff --git a/src/main/drivers/pwm_output_dshot_hal_hal.c b/src/main/drivers/pwm_output_dshot_hal_hal.c
@@ -81,22 +81,21 @@ void pwmChannelDMAStart(TIM_HandleTypeDef *htim, uint32_t Channel, uint32_t *pDa
     case TIM_CHANNEL_1:
         HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)pData, (uint32_t)&htim->Instance->CCR1, Length);
         __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC1);
-    break;
-
+        break;
     case TIM_CHANNEL_2:
         HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)pData, (uint32_t)&htim->Instance->CCR2, Length);
         __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC2);
         break;
-
     case TIM_CHANNEL_3:
         HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)pData, (uint32_t)&htim->Instance->CCR3,Length);
         __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC3);
         break;
-
     case TIM_CHANNEL_4:
         HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC4], (uint32_t)pData, (uint32_t)&htim->Instance->CCR4, Length);
         __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC4);
         break;
+    default:
+        break;
     }
 }
 
@@ -110,18 +109,17 @@ void pwmChannelDMAStop(TIM_HandleTypeDef *htim, uint32_t Channel)
     case TIM_CHANNEL_1:
         __HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC1);
         break;
-
     case TIM_CHANNEL_2:
         __HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC2);
         break;
-
     case TIM_CHANNEL_3:
         __HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC3);
         break;
-
     case TIM_CHANNEL_4:
         __HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC4);
         break;
+    default:
+        break;
     }
 }
 

diff --git a/src/main/drivers/rx/rx_sx1280.c b/src/main/drivers/rx/rx_sx1280.c
@@ -423,8 +423,7 @@ void sx1280SetMode(const sx1280OperatingModes_e opMode)
         buf[2] = 0xFF; // TODO dynamic timeout based on expected onairtime
         sx1280WriteCommandBurst(SX1280_RADIO_SET_TX, buf, 3);
         break;
-    case SX1280_MODE_CAD:
-        break;
+    case SX1280_MODE_CAD: // not implemented yet
     default:
         break;
     }

diff --git a/src/main/fc/rc.c b/src/main/fc/rc.c
@@ -705,23 +705,18 @@ void initRcProcessing(void)
     case RATES_TYPE_BETAFLIGHT:
     default:
         applyRates = applyBetaflightRates;
-
         break;
     case RATES_TYPE_RACEFLIGHT:
         applyRates = applyRaceFlightRates;
-
         break;
     case RATES_TYPE_KISS:
         applyRates = applyKissRates;
-
         break;
     case RATES_TYPE_ACTUAL:
         applyRates = applyActualRates;
-
         break;
     case RATES_TYPE_QUICK:
         applyRates = applyQuickRates;
-
         break;
     }
 

diff --git a/src/main/flight/mixer_init.c b/src/main/flight/mixer_init.c
@@ -445,11 +445,9 @@ bool mixerModeIsFixedWing(mixerMode_e mixerMode)
     case MIXER_AIRPLANE:
     case MIXER_CUSTOM_AIRPLANE:
         return true;
-
         break;
     default:
         return false;
-
         break;
     }
 }

diff --git a/src/main/flight/servos.c b/src/main/flight/servos.c
@@ -249,7 +249,6 @@ static void servoConfigureOutput(void)
     case MIXER_CUSTOM_AIRPLANE:
     case MIXER_CUSTOM_TRI:
         loadCustomServoMixer();
-
         break;
     default:
         break;

diff --git a/src/main/io/dashboard.c b/src/main/io/dashboard.c
@@ -236,6 +236,8 @@ static void updateFailsafeStatus(void)
     case FAILSAFE_GPS_RESCUE:
         failsafeIndicator = 'G';
         break;
+    default:
+        break;
     }
     i2c_OLED_set_xy(dev, SCREEN_CHARACTER_COLUMN_COUNT - 3, 0);
     i2c_OLED_send_char(dev, failsafeIndicator);