mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-22 15:55:48 +03:00
Merge branch 'master' into betaflight
Conflicts: src/main/drivers/accgyro_mpu3050.c src/main/drivers/accgyro_mpu6050.c src/main/drivers/accgyro_spi_mpu6000.c src/main/drivers/accgyro_spi_mpu6500.c src/main/drivers/sensor.h
This commit is contained in:
commit
dae052632c
24 changed files with 201 additions and 92 deletions
|
@ -373,7 +373,7 @@ void init(void)
|
|||
|
||||
if (!sensorsAutodetect(&masterConfig.sensorAlignmentConfig, masterConfig.gyro_lpf, masterConfig.acc_hardware, masterConfig.mag_hardware, masterConfig.baro_hardware, currentProfile->mag_declination, masterConfig.looptime, masterConfig.syncGyroToLoop)) {
|
||||
// if gyro was not detected due to whatever reason, we give up now.
|
||||
failureMode(3);
|
||||
failureMode(FAILURE_MISSING_ACC);
|
||||
}
|
||||
|
||||
systemState |= SYSTEM_STATE_SENSORS_READY;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue