mirror of
https://github.com/iNavFlight/inav.git
synced 2025-07-24 00:35:34 +03:00
Merge pull request #2085 from iNavFlight/jh_gcc7_janitorial_updates
Jh gcc7 janitorial updates
This commit is contained in:
commit
8d6fb67f1a
16 changed files with 602 additions and 555 deletions
File diff suppressed because it is too large
Load diff
|
@ -1048,8 +1048,8 @@ void blackboxFinish(void)
|
|||
case BLACKBOX_STATE_RUNNING:
|
||||
case BLACKBOX_STATE_PAUSED:
|
||||
blackboxLogEvent(FLIGHT_LOG_EVENT_LOG_END, NULL);
|
||||
FALLTHROUGH;
|
||||
|
||||
// Fall through
|
||||
default:
|
||||
blackboxSetState(BLACKBOX_STATE_SHUTTING_DOWN);
|
||||
}
|
||||
|
|
|
@ -91,8 +91,8 @@ void * memcpy_fn ( void * destination, const void * source, size_t num ) asm("me
|
|||
|
||||
#endif
|
||||
|
||||
#if __GNUC__ >= 7
|
||||
#define FALLTHROUGH __attribute__ ((fallthrough)
|
||||
#if __GNUC__ > 6
|
||||
#define FALLTHROUGH __attribute__ ((fallthrough))
|
||||
#else
|
||||
#define FALLTHROUGH do {} while(0)
|
||||
#endif
|
||||
|
|
|
@ -185,7 +185,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_GenerateSTART(I2Cx, ENABLE);
|
||||
i2cBusState->state = I2C_STATE_STARTING_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_STARTING_WAIT:
|
||||
if (I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_MODE_SELECT) != ERROR) {
|
||||
|
@ -205,7 +205,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_Send7bitAddress(I2Cx, i2cBusState->addr, I2C_Direction_Transmitter);
|
||||
i2cBusState->state = I2C_STATE_R_ADDR_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_R_ADDR_WAIT:
|
||||
if (I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_TRANSMITTER_MODE_SELECTED) != ERROR) {
|
||||
|
@ -223,7 +223,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_SendData(I2Cx, i2cBusState->reg);
|
||||
i2cBusState->state = I2C_STATE_R_REGISTER_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
/* Fallthrough */
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_R_REGISTER_WAIT:
|
||||
if (I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_BYTE_TRANSMITTED) != ERROR) {
|
||||
|
@ -248,7 +248,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_GenerateSTART(I2Cx, ENABLE);
|
||||
i2cBusState->state = I2C_STATE_R_RESTARTING_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_R_RESTARTING_WAIT:
|
||||
if (I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_MODE_SELECT) != ERROR) {
|
||||
|
@ -263,7 +263,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_Send7bitAddress(I2Cx, i2cBusState->addr, I2C_Direction_Receiver);
|
||||
i2cBusState->state = I2C_STATE_R_RESTART_ADDR_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_R_RESTART_ADDR_WAIT:
|
||||
if (I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_RECEIVER_MODE_SELECTED) != ERROR) {
|
||||
|
@ -384,7 +384,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_Send7bitAddress(I2Cx, i2cBusState->addr, I2C_Direction_Transmitter);
|
||||
i2cBusState->state = I2C_STATE_W_ADDR_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_W_ADDR_WAIT:
|
||||
if (I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_TRANSMITTER_MODE_SELECTED) != ERROR) {
|
||||
|
@ -402,7 +402,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_SendData(I2Cx, i2cBusState->reg);
|
||||
i2cBusState->state = I2C_STATE_W_TRANSFER_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
/* Fallthrough */
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_W_TRANSFER_WAIT:
|
||||
if (I2C_CheckEvent(I2Cx, I2C_EVENT_MASTER_BYTE_TRANSMITTED) != ERROR) {
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include <stdint.h>
|
||||
|
||||
#include <platform.h>
|
||||
#include "common/utils.h"
|
||||
|
||||
#include "drivers/time.h"
|
||||
#include "drivers/io.h"
|
||||
|
@ -146,7 +147,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
case I2C_STATE_STARTING:
|
||||
i2cBusState->timeout = currentTicks;
|
||||
i2cBusState->state = I2C_STATE_STARTING_WAIT;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_STARTING_WAIT:
|
||||
if (I2C_GetFlagStatus(I2Cx, I2C_ISR_BUSY) == RESET) {
|
||||
|
@ -167,7 +168,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_TransferHandling(I2Cx, i2cBusState->addr, 1, I2C_SoftEnd_Mode, I2C_Generate_Start_Write);
|
||||
i2cBusState->state = I2C_STATE_R_ADDR_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_R_ADDR_WAIT:
|
||||
if (I2C_GetFlagStatus(I2Cx, I2C_ISR_TXIS) != RESET) {
|
||||
|
@ -185,7 +186,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_SendData(I2Cx, i2cBusState->reg);
|
||||
i2cBusState->state = I2C_STATE_R_REGISTER_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_R_REGISTER_WAIT:
|
||||
if (I2C_GetFlagStatus(I2Cx, I2C_ISR_TC) != RESET) {
|
||||
|
@ -209,7 +210,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_TransferHandling(I2Cx, i2cBusState->addr, i2cBusState->len, I2C_AutoEnd_Mode, I2C_Generate_Start_Read);
|
||||
i2cBusState->state = I2C_STATE_R_TRANSFER;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_R_TRANSFER:
|
||||
if (I2C_GetFlagStatus(I2Cx, I2C_ISR_RXNE) != RESET) {
|
||||
|
@ -234,7 +235,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_TransferHandling(I2Cx, i2cBusState->addr, 1, I2C_Reload_Mode, I2C_Generate_Start_Write);
|
||||
i2cBusState->state = I2C_STATE_W_ADDR_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_W_ADDR_WAIT:
|
||||
if (I2C_GetFlagStatus(I2Cx, I2C_ISR_TXIS) != RESET) {
|
||||
|
@ -252,7 +253,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_SendData(I2Cx, i2cBusState->reg);
|
||||
i2cBusState->state = I2C_STATE_W_REGISTER_WAIT;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_W_REGISTER_WAIT:
|
||||
if (I2C_GetFlagStatus(I2Cx, I2C_ISR_TCR) != RESET) {
|
||||
|
@ -276,7 +277,7 @@ static void i2cStateMachine(i2cBusState_t * i2cBusState, const uint32_t currentT
|
|||
I2C_TransferHandling(I2Cx, i2cBusState->addr, i2cBusState->len, I2C_AutoEnd_Mode, I2C_No_StartStop);
|
||||
i2cBusState->state = I2C_STATE_W_TRANSFER;
|
||||
i2cBusState->timeout = currentTicks;
|
||||
// Fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
case I2C_STATE_W_TRANSFER:
|
||||
if (I2C_GetFlagStatus(I2Cx, I2C_ISR_TXIS) != RESET) {
|
||||
|
|
|
@ -893,6 +893,7 @@ bool sdcard_poll(void)
|
|||
break; // Timeout not reached yet so keep waiting
|
||||
}
|
||||
// Timeout has expired, so fall through to convert to a fatal error
|
||||
FALLTHROUGH;
|
||||
|
||||
case SDCARD_RECEIVE_ERROR:
|
||||
sdcard_deselect();
|
||||
|
|
|
@ -38,7 +38,7 @@ PG_REGISTER_ARRAY_WITH_RESET_FN(controlRateConfig_t, MAX_CONTROL_RATE_PROFILE_CO
|
|||
void pgResetFn_controlRateProfiles(controlRateConfig_t *instance)
|
||||
{
|
||||
for (int i = 0; i < MAX_CONTROL_RATE_PROFILE_COUNT; i++) {
|
||||
RESET_CONFIG(const controlRateConfig_t, &instance[i],
|
||||
RESET_CONFIG(controlRateConfig_t, &instance[i],
|
||||
.rcExpo8 = 70,
|
||||
.thrMid8 = 50,
|
||||
.thrExpo8 = 0,
|
||||
|
|
|
@ -228,6 +228,8 @@ static void applyStepAdjustment(controlRateConfig_t *controlRateConfig, uint8_t
|
|||
break;
|
||||
}
|
||||
// follow though for combined ADJUSTMENT_PITCH_ROLL_RATE
|
||||
FALLTHROUGH;
|
||||
|
||||
case ADJUSTMENT_ROLL_RATE:
|
||||
newValue = constrain((int)controlRateConfig->rates[FD_ROLL] + delta, CONTROL_RATE_CONFIG_ROLL_PITCH_RATE_MIN, CONTROL_RATE_CONFIG_ROLL_PITCH_RATE_MAX);
|
||||
controlRateConfig->rates[FD_ROLL] = newValue;
|
||||
|
@ -250,6 +252,8 @@ static void applyStepAdjustment(controlRateConfig_t *controlRateConfig, uint8_t
|
|||
break;
|
||||
}
|
||||
// follow though for combined ADJUSTMENT_PITCH_ROLL_P
|
||||
FALLTHROUGH;
|
||||
|
||||
case ADJUSTMENT_ROLL_P:
|
||||
newValue = constrain((int)pidBank()->pid[PID_ROLL].P + delta, 0, 200); // FIXME magic numbers repeated in serial_cli.c
|
||||
pidBankMutable()->pid[PID_ROLL].P = newValue;
|
||||
|
@ -266,6 +270,8 @@ static void applyStepAdjustment(controlRateConfig_t *controlRateConfig, uint8_t
|
|||
break;
|
||||
}
|
||||
// follow though for combined ADJUSTMENT_PITCH_ROLL_I
|
||||
FALLTHROUGH;
|
||||
|
||||
case ADJUSTMENT_ROLL_I:
|
||||
newValue = constrain((int)pidBank()->pid[PID_ROLL].I + delta, 0, 200); // FIXME magic numbers repeated in serial_cli.c
|
||||
pidBankMutable()->pid[PID_ROLL].I = newValue;
|
||||
|
@ -282,6 +288,8 @@ static void applyStepAdjustment(controlRateConfig_t *controlRateConfig, uint8_t
|
|||
break;
|
||||
}
|
||||
// follow though for combined ADJUSTMENT_PITCH_ROLL_D
|
||||
FALLTHROUGH;
|
||||
|
||||
case ADJUSTMENT_ROLL_D:
|
||||
newValue = constrain((int)pidBank()->pid[PID_ROLL].D + delta, 0, 200); // FIXME magic numbers repeated in serial_cli.c
|
||||
pidBankMutable()->pid[PID_ROLL].D = newValue;
|
||||
|
|
|
@ -74,7 +74,7 @@ PG_REGISTER_ARRAY_WITH_RESET_FN(servoParam_t, MAX_SUPPORTED_SERVOS, servoParams,
|
|||
void pgResetFn_servoParams(servoParam_t *instance)
|
||||
{
|
||||
for (int i = 0; i < MAX_SUPPORTED_SERVOS; i++) {
|
||||
RESET_CONFIG(const servoParam_t, &instance[i],
|
||||
RESET_CONFIG(servoParam_t, &instance[i],
|
||||
.min = DEFAULT_SERVO_MIN,
|
||||
.max = DEFAULT_SERVO_MAX,
|
||||
.middle = DEFAULT_SERVO_MIDDLE,
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
|
||||
#include <platform.h>
|
||||
|
||||
#include "common/utils.h"
|
||||
|
||||
#ifdef AFATFS_DEBUG
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
|
@ -935,15 +937,14 @@ static afatfsOperationStatus_e afatfs_cacheSector(uint32_t physicalSectorIndex,
|
|||
|
||||
afatfs.cacheDescriptor[cacheSectorIndex].consecutiveEraseBlockCount = eraseCount;
|
||||
#endif
|
||||
|
||||
// Fall through
|
||||
FALLTHROUGH;
|
||||
|
||||
case AFATFS_CACHE_STATE_WRITING:
|
||||
case AFATFS_CACHE_STATE_IN_SYNC:
|
||||
if ((sectorFlags & AFATFS_CACHE_WRITE) != 0) {
|
||||
afatfs_cacheSectorMarkDirty(&afatfs.cacheDescriptor[cacheSectorIndex]);
|
||||
}
|
||||
// Fall through
|
||||
FALLTHROUGH;
|
||||
|
||||
case AFATFS_CACHE_STATE_DIRTY:
|
||||
if ((sectorFlags & AFATFS_CACHE_LOCK) != 0) {
|
||||
|
@ -1457,7 +1458,7 @@ static afatfsOperationStatus_e afatfs_saveDirectoryEntry(afatfsFilePtr_t file, a
|
|||
break;
|
||||
case AFATFS_SAVE_DIRECTORY_DELETED:
|
||||
entry->filename[0] = FAT_DELETED_FILE_MARKER;
|
||||
//Fall through
|
||||
FALLTHROUGH;
|
||||
|
||||
case AFATFS_SAVE_DIRECTORY_FOR_CLOSE:
|
||||
// We write the true length of the file on close.
|
||||
|
|
|
@ -16,6 +16,8 @@
|
|||
#include "build/version.h"
|
||||
|
||||
#include "common/axis.h"
|
||||
#include "common/utils.h"
|
||||
|
||||
#include "config/config_master.h"
|
||||
#include "config/parameter_group.h"
|
||||
#include "config/parameter_group_ids.h"
|
||||
|
@ -318,6 +320,8 @@ static void telemetryRX(void)
|
|||
break;
|
||||
}
|
||||
telem_state++;
|
||||
FALLTHROUGH;
|
||||
|
||||
case 2:
|
||||
if (sensors(SENSOR_GPS)) {
|
||||
uint16_t gpsspeed = (gpsSol.groundSpeed*9L)/250L;
|
||||
|
@ -344,6 +348,8 @@ static void telemetryRX(void)
|
|||
break;
|
||||
}
|
||||
telem_state++;
|
||||
FALLTHROUGH;
|
||||
|
||||
default:
|
||||
rfTxBuffer[0] = 'D';
|
||||
memcpy(rfTxBuffer+1,&debug[0],2);
|
||||
|
@ -736,4 +742,3 @@ uint8_t eleresBind(void)
|
|||
}
|
||||
|
||||
#endif //RX_ELERES
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "common/axis.h"
|
||||
#include "common/filter.h"
|
||||
#include "common/maths.h"
|
||||
#include "common/utils.h"
|
||||
|
||||
#include "config/config_reset.h"
|
||||
#include "config/parameter_group.h"
|
||||
|
@ -111,7 +112,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
|
|||
|
||||
switch (accHardwareToUse) {
|
||||
case ACC_AUTODETECT:
|
||||
; // fallthrough
|
||||
FALLTHROUGH;
|
||||
#ifdef USE_ACC_ADXL345
|
||||
case ACC_ADXL345: {
|
||||
drv_adxl345_config_t acc_params;
|
||||
|
@ -133,6 +134,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
|
|||
break;
|
||||
}
|
||||
}
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_ACC_LSM303DLHC
|
||||
|
@ -148,6 +150,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
|
|||
if (accHardwareToUse != ACC_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_ACC_MPU6050
|
||||
|
@ -163,6 +166,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
|
|||
if (accHardwareToUse != ACC_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_ACC_MMA8452
|
||||
|
@ -183,6 +187,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
|
|||
if (accHardwareToUse != ACC_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_ACC_BMA280
|
||||
|
@ -198,6 +203,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
|
|||
if (accHardwareToUse != ACC_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_ACC_SPI_MPU6000
|
||||
|
@ -213,6 +219,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
|
|||
if (accHardwareToUse != ACC_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#if defined(USE_ACC_MPU6500) || defined(USE_ACC_SPI_MPU6500)
|
||||
|
@ -232,6 +239,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
|
|||
if (accHardwareToUse != ACC_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#if defined(USE_ACC_SPI_MPU9250)
|
||||
|
@ -247,6 +255,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
|
|||
if (accHardwareToUse != ACC_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_FAKE_ACC
|
||||
|
@ -259,6 +268,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
|
|||
if (accHardwareToUse != ACC_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
default:
|
||||
|
@ -496,7 +506,7 @@ void accInitFilters(void)
|
|||
if (acc.accTargetLooptime && accelerometerConfig()->acc_lpf_hz) {
|
||||
for (int axis = 0; axis < XYZ_AXIS_COUNT; axis++) {
|
||||
biquadFilterInitLPF(&accFilter[axis], accelerometerConfig()->acc_lpf_hz, acc.accTargetLooptime);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef USE_ACC_NOTCH
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
|
||||
#include "common/maths.h"
|
||||
#include "common/time.h"
|
||||
#include "common/utils.h"
|
||||
|
||||
#include "config/parameter_group.h"
|
||||
#include "config/parameter_group_ids.h"
|
||||
|
@ -108,6 +109,7 @@ bool baroDetect(baroDev_t *dev, baroSensor_e baroHardwareToUse)
|
|||
if (baroHardwareToUse != BARO_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case BARO_MS5607:
|
||||
#ifdef USE_BARO_MS5607
|
||||
|
@ -120,6 +122,7 @@ bool baroDetect(baroDev_t *dev, baroSensor_e baroHardwareToUse)
|
|||
if (baroHardwareToUse != BARO_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case BARO_MS5611:
|
||||
#ifdef USE_BARO_MS5611
|
||||
|
@ -132,6 +135,7 @@ bool baroDetect(baroDev_t *dev, baroSensor_e baroHardwareToUse)
|
|||
if (baroHardwareToUse != BARO_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case BARO_BMP280:
|
||||
#if defined(USE_BARO_BMP280) || defined(USE_BARO_SPI_BMP280)
|
||||
|
@ -144,6 +148,7 @@ bool baroDetect(baroDev_t *dev, baroSensor_e baroHardwareToUse)
|
|||
if (baroHardwareToUse != BARO_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case BARO_FAKE:
|
||||
#ifdef USE_FAKE_BARO
|
||||
|
@ -156,6 +161,7 @@ bool baroDetect(baroDev_t *dev, baroSensor_e baroHardwareToUse)
|
|||
if (baroHardwareToUse != BARO_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case BARO_NONE:
|
||||
baroHardware = BARO_NONE;
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
|
||||
#include "common/axis.h"
|
||||
#include "common/maths.h"
|
||||
#include "common/utils.h"
|
||||
|
||||
#include "config/parameter_group.h"
|
||||
#include "config/parameter_group_ids.h"
|
||||
|
@ -127,6 +128,7 @@ bool compassDetect(magDev_t *dev, magSensor_e magHardwareToUse)
|
|||
if (magHardwareToUse != MAG_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case MAG_AK8975:
|
||||
#ifdef USE_MAG_AK8975
|
||||
|
@ -142,6 +144,7 @@ bool compassDetect(magDev_t *dev, magSensor_e magHardwareToUse)
|
|||
if (magHardwareToUse != MAG_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case MAG_AK8963:
|
||||
#ifdef USE_MAG_AK8963
|
||||
|
@ -157,6 +160,7 @@ bool compassDetect(magDev_t *dev, magSensor_e magHardwareToUse)
|
|||
if (magHardwareToUse != MAG_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case MAG_GPS:
|
||||
#ifdef GPS
|
||||
|
@ -172,6 +176,7 @@ bool compassDetect(magDev_t *dev, magSensor_e magHardwareToUse)
|
|||
if (magHardwareToUse != MAG_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case MAG_MAG3110:
|
||||
#ifdef USE_MAG_MAG3110
|
||||
|
@ -187,6 +192,7 @@ bool compassDetect(magDev_t *dev, magSensor_e magHardwareToUse)
|
|||
if (magHardwareToUse != MAG_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case MAG_IST8310:
|
||||
#ifdef USE_MAG_IST8310
|
||||
|
@ -202,6 +208,7 @@ bool compassDetect(magDev_t *dev, magSensor_e magHardwareToUse)
|
|||
if (magHardwareToUse != MAG_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case MAG_QMC5883:
|
||||
#ifdef USE_MAG_QMC5883
|
||||
|
@ -217,6 +224,7 @@ bool compassDetect(magDev_t *dev, magSensor_e magHardwareToUse)
|
|||
if (magHardwareToUse != MAG_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case MAG_FAKE:
|
||||
#ifdef USE_FAKE_MAG
|
||||
|
@ -229,6 +237,7 @@ bool compassDetect(magDev_t *dev, magSensor_e magHardwareToUse)
|
|||
if (magHardwareToUse != MAG_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case MAG_NONE:
|
||||
magHardware = MAG_NONE;
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include "common/axis.h"
|
||||
#include "common/maths.h"
|
||||
#include "common/filter.h"
|
||||
#include "common/utils.h"
|
||||
|
||||
#include "config/parameter_group.h"
|
||||
#include "config/parameter_group_ids.h"
|
||||
|
@ -155,7 +156,7 @@ STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev, gyroSensor_e gyroHard
|
|||
|
||||
switch (gyroHardware) {
|
||||
case GYRO_AUTODETECT:
|
||||
// fallthrough
|
||||
FALLTHROUGH;
|
||||
|
||||
#ifdef USE_GYRO_MPU6050
|
||||
case GYRO_MPU6050:
|
||||
|
@ -166,7 +167,7 @@ STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev, gyroSensor_e gyroHard
|
|||
#endif
|
||||
break;
|
||||
}
|
||||
// fallthrough
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_GYRO_L3G4200D
|
||||
|
@ -178,7 +179,7 @@ STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev, gyroSensor_e gyroHard
|
|||
#endif
|
||||
break;
|
||||
}
|
||||
// fallthrough
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_GYRO_MPU3050
|
||||
|
@ -190,7 +191,7 @@ STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev, gyroSensor_e gyroHard
|
|||
#endif
|
||||
break;
|
||||
}
|
||||
// fallthrough
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_GYRO_L3GD20
|
||||
|
@ -202,7 +203,7 @@ STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev, gyroSensor_e gyroHard
|
|||
#endif
|
||||
break;
|
||||
}
|
||||
// fallthrough
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_GYRO_SPI_MPU6000
|
||||
|
@ -214,7 +215,7 @@ STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev, gyroSensor_e gyroHard
|
|||
#endif
|
||||
break;
|
||||
}
|
||||
// fallthrough
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#if defined(USE_GYRO_MPU6500) || defined(USE_GYRO_SPI_MPU6500)
|
||||
|
@ -230,7 +231,7 @@ STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev, gyroSensor_e gyroHard
|
|||
#endif
|
||||
break;
|
||||
}
|
||||
// fallthrough
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_GYRO_SPI_MPU9250
|
||||
|
@ -242,7 +243,7 @@ STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev, gyroSensor_e gyroHard
|
|||
#endif
|
||||
break;
|
||||
}
|
||||
// fallthrough
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
#ifdef USE_FAKE_GYRO
|
||||
|
@ -251,7 +252,7 @@ STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev, gyroSensor_e gyroHard
|
|||
gyroHardware = GYRO_FAKE;
|
||||
break;
|
||||
}
|
||||
// fallthrough
|
||||
FALLTHROUGH;
|
||||
#endif
|
||||
|
||||
default:
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
|
||||
#include "common/maths.h"
|
||||
#include "common/time.h"
|
||||
#include "common/utils.h"
|
||||
|
||||
#include "config/parameter_group.h"
|
||||
#include "config/parameter_group_ids.h"
|
||||
|
@ -84,6 +85,7 @@ bool pitotDetect(pitotDev_t *dev, uint8_t pitotHardwareToUse)
|
|||
if (pitotHardwareToUse != PITOT_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case PITOT_ADC:
|
||||
#if defined(USE_PITOT_ADC)
|
||||
|
@ -96,6 +98,7 @@ bool pitotDetect(pitotDev_t *dev, uint8_t pitotHardwareToUse)
|
|||
if (pitotHardwareToUse != PITOT_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case PITOT_VIRTUAL:
|
||||
#if defined(USE_PITOT_VIRTUAL)
|
||||
|
@ -110,6 +113,7 @@ bool pitotDetect(pitotDev_t *dev, uint8_t pitotHardwareToUse)
|
|||
if (pitotHardwareToUse != PITOT_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case PITOT_FAKE:
|
||||
#ifdef USE_PITOT_FAKE
|
||||
|
@ -122,6 +126,7 @@ bool pitotDetect(pitotDev_t *dev, uint8_t pitotHardwareToUse)
|
|||
if (pitotHardwareToUse != PITOT_AUTODETECT) {
|
||||
break;
|
||||
}
|
||||
FALLTHROUGH;
|
||||
|
||||
case PITOT_NONE:
|
||||
pitotHardware = PITOT_NONE;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue