1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 14:25:20 +03:00

switch case cleanup

Co-Authored-By: Petr Ledvina <ledvinap@gmail.com>
Co-Authored-By: haslinghuis <mark@numloq.nl>
This commit is contained in:
Hugo Chiang 2022-08-25 22:38:25 +08:00
parent c8a6f2a60c
commit 0088eb5f21
7 changed files with 2 additions and 24 deletions

View file

@ -160,18 +160,14 @@ bool dshotStreamingCommandsAreEnabled(void)
static bool dshotCommandsAreEnabled(dshotCommandType_e commandType) static bool dshotCommandsAreEnabled(dshotCommandType_e commandType)
{ {
bool ret = false; bool ret = false;
switch (commandType) { switch (commandType) {
case DSHOT_CMD_TYPE_BLOCKING: case DSHOT_CMD_TYPE_BLOCKING:
ret = !motorIsEnabled(); ret = !motorIsEnabled();
break; break;
case DSHOT_CMD_TYPE_INLINE: case DSHOT_CMD_TYPE_INLINE:
ret = dshotStreamingCommandsAreEnabled(); ret = dshotStreamingCommandsAreEnabled();
break; break;
default: default:
break; break;
} }

View file

@ -111,7 +111,6 @@ bool checkMotorProtocolEnabled(const motorDevConfig_t *motorDevConfig, bool *isP
case PWM_TYPE_MULTISHOT: case PWM_TYPE_MULTISHOT:
case PWM_TYPE_BRUSHED: case PWM_TYPE_BRUSHED:
enabled = true; enabled = true;
break; break;
#ifdef USE_DSHOT #ifdef USE_DSHOT
@ -121,11 +120,9 @@ bool checkMotorProtocolEnabled(const motorDevConfig_t *motorDevConfig, bool *isP
case PWM_TYPE_PROSHOT1000: case PWM_TYPE_PROSHOT1000:
enabled = true; enabled = true;
isDshot = true; isDshot = true;
break; break;
#endif #endif
default: default:
break; break;
} }

View file

@ -81,18 +81,15 @@ void pwmChannelDMAStart(TIM_HandleTypeDef *htim, uint32_t Channel, uint32_t *pDa
case TIM_CHANNEL_1: case TIM_CHANNEL_1:
HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)pData, (uint32_t)&htim->Instance->CCR1, Length); 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); __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC1);
break; break;
case TIM_CHANNEL_2: case TIM_CHANNEL_2:
HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)pData, (uint32_t)&htim->Instance->CCR2, Length); 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); __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC2);
break; break;
case TIM_CHANNEL_3: case TIM_CHANNEL_3:
HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)pData, (uint32_t)&htim->Instance->CCR3,Length); 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); __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC3);
break; break;
case TIM_CHANNEL_4: case TIM_CHANNEL_4:
HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC4], (uint32_t)pData, (uint32_t)&htim->Instance->CCR4, Length); 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); __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC4);
@ -110,15 +107,12 @@ void pwmChannelDMAStop(TIM_HandleTypeDef *htim, uint32_t Channel)
case TIM_CHANNEL_1: case TIM_CHANNEL_1:
__HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC1); __HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC1);
break; break;
case TIM_CHANNEL_2: case TIM_CHANNEL_2:
__HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC2); __HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC2);
break; break;
case TIM_CHANNEL_3: case TIM_CHANNEL_3:
__HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC3); __HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC3);
break; break;
case TIM_CHANNEL_4: case TIM_CHANNEL_4:
__HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC4); __HAL_TIM_DISABLE_DMA(htim, TIM_DMA_CC4);
break; break;

View file

@ -423,8 +423,7 @@ void sx1280SetMode(const sx1280OperatingModes_e opMode)
buf[2] = 0xFF; // TODO dynamic timeout based on expected onairtime buf[2] = 0xFF; // TODO dynamic timeout based on expected onairtime
sx1280WriteCommandBurst(SX1280_RADIO_SET_TX, buf, 3); sx1280WriteCommandBurst(SX1280_RADIO_SET_TX, buf, 3);
break; break;
case SX1280_MODE_CAD: case SX1280_MODE_CAD: // not implemented yet
break;
default: default:
break; break;
} }

View file

@ -705,23 +705,18 @@ void initRcProcessing(void)
case RATES_TYPE_BETAFLIGHT: case RATES_TYPE_BETAFLIGHT:
default: default:
applyRates = applyBetaflightRates; applyRates = applyBetaflightRates;
break; break;
case RATES_TYPE_RACEFLIGHT: case RATES_TYPE_RACEFLIGHT:
applyRates = applyRaceFlightRates; applyRates = applyRaceFlightRates;
break; break;
case RATES_TYPE_KISS: case RATES_TYPE_KISS:
applyRates = applyKissRates; applyRates = applyKissRates;
break; break;
case RATES_TYPE_ACTUAL: case RATES_TYPE_ACTUAL:
applyRates = applyActualRates; applyRates = applyActualRates;
break; break;
case RATES_TYPE_QUICK: case RATES_TYPE_QUICK:
applyRates = applyQuickRates; applyRates = applyQuickRates;
break; break;
} }

View file

@ -445,11 +445,9 @@ bool mixerModeIsFixedWing(mixerMode_e mixerMode)
case MIXER_AIRPLANE: case MIXER_AIRPLANE:
case MIXER_CUSTOM_AIRPLANE: case MIXER_CUSTOM_AIRPLANE:
return true; return true;
break; break;
default: default:
return false; return false;
break; break;
} }
} }

View file

@ -249,7 +249,6 @@ static void servoConfigureOutput(void)
case MIXER_CUSTOM_AIRPLANE: case MIXER_CUSTOM_AIRPLANE:
case MIXER_CUSTOM_TRI: case MIXER_CUSTOM_TRI:
loadCustomServoMixer(); loadCustomServoMixer();
break; break;
default: default:
break; break;