From 25e92703958ee0f03c55d3d5b19aacffec262571 Mon Sep 17 00:00:00 2001 From: Steffen Windoffer Date: Thu, 10 Aug 2017 11:15:52 +0200 Subject: [PATCH] remove unused gyro isr setting --- src/main/fc/config.c | 4 ---- src/main/fc/fc_msp.c | 6 ------ src/main/fc/settings.c | 3 --- src/main/sensors/gyro.c | 1 - src/main/sensors/gyro.h | 1 - 5 files changed, 15 deletions(-) diff --git a/src/main/fc/config.c b/src/main/fc/config.c index 98fa6797a8..d7f5b3dac6 100755 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -453,10 +453,6 @@ void validateAndFixGyroConfig(void) #endif } -#if !defined(GYRO_USES_SPI) || !defined(USE_MPU_DATA_READY_SIGNAL) - gyroConfigMutable()->gyro_isr_update = false; -#endif - // check for looptime restrictions based on motor protocol. Motor times have safety margin const float pidLooptime = samplingTime * gyroConfig()->gyro_sync_denom * pidConfig()->pid_process_denom; float motorUpdateRestriction; diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c index 346a921e67..3d7c6776ea 100644 --- a/src/main/fc/fc_msp.c +++ b/src/main/fc/fc_msp.c @@ -1125,8 +1125,6 @@ static bool mspFcProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst) sbufWriteU16(dst, motorConfig()->dev.motorPwmRate); sbufWriteU16(dst, motorConfig()->digitalIdleOffsetValue); sbufWriteU8(dst, gyroConfig()->gyro_use_32khz); - //!!TODO gyro_isr_update to be added pending decision - //sbufWriteU8(dst, gyroConfig()->gyro_isr_update); sbufWriteU8(dst, motorConfig()->dev.motorPwmInversion); break; @@ -1520,10 +1518,6 @@ static mspResult_e mspFcProcessInCommand(uint8_t cmdMSP, sbuf_t *src) if (sbufBytesRemaining(src)) { gyroConfigMutable()->gyro_use_32khz = sbufReadU8(src); } - //!!TODO gyro_isr_update to be added pending decision - /*if (sbufBytesRemaining(src)) { - gyroConfigMutable()->gyro_isr_update = sbufReadU8(src); - }*/ validateAndFixGyroConfig(); if (sbufBytesRemaining(src)) { diff --git a/src/main/fc/settings.c b/src/main/fc/settings.c index 014f062bdf..66b9774acf 100644 --- a/src/main/fc/settings.c +++ b/src/main/fc/settings.c @@ -308,9 +308,6 @@ const clivalue_t valueTable[] = { #if defined(USE_GYRO_SPI_MPU6500) || defined(USE_GYRO_SPI_MPU9250) || defined(USE_GYRO_SPI_ICM20689) { "gyro_use_32khz", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_GYRO_CONFIG, offsetof(gyroConfig_t, gyro_use_32khz) }, #endif -#if defined(USE_MPU_DATA_READY_SIGNAL) - { "gyro_isr_update", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_GYRO_CONFIG, offsetof(gyroConfig_t, gyro_isr_update) }, -#endif #endif #ifdef USE_DUAL_GYRO { "gyro_to_use", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, 1 }, PG_GYRO_CONFIG, offsetof(gyroConfig_t, gyro_to_use) }, diff --git a/src/main/sensors/gyro.c b/src/main/sensors/gyro.c index 04df73ccf4..8dfde31b97 100644 --- a/src/main/sensors/gyro.c +++ b/src/main/sensors/gyro.c @@ -124,7 +124,6 @@ PG_RESET_TEMPLATE(gyroConfig_t, gyroConfig, .gyro_lpf = GYRO_LPF_256HZ, .gyro_soft_lpf_type = FILTER_PT1, .gyro_soft_lpf_hz = 90, - .gyro_isr_update = false, .gyro_use_32khz = false, .gyro_to_use = 0, .gyro_soft_notch_hz_1 = 400, diff --git a/src/main/sensors/gyro.h b/src/main/sensors/gyro.h index ce29ea4718..fd055ceddb 100644 --- a/src/main/sensors/gyro.h +++ b/src/main/sensors/gyro.h @@ -54,7 +54,6 @@ typedef struct gyroConfig_s { uint8_t gyro_lpf; // gyro LPF setting - values are driver specific, in case of invalid number, a reasonable default ~30-40HZ is chosen. uint8_t gyro_soft_lpf_type; uint8_t gyro_soft_lpf_hz; - bool gyro_isr_update; bool gyro_use_32khz; uint8_t gyro_to_use; uint16_t gyro_soft_notch_hz_1;