From 27f0216a1976128585cc75a5e4fbb2f4aac8d57f Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Sat, 31 Jan 2015 21:56:01 +0100 Subject: [PATCH] Ensure that current meter feature is not disabled since it requires no hardware io. --- src/main/config/config.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/config/config.c b/src/main/config/config.c index eb5465c83..8c49b2d79 100644 --- a/src/main/config/config.c +++ b/src/main/config/config.c @@ -676,7 +676,9 @@ void validateAndFixConfig(void) // rssi adc needs the same ports featureClear(FEATURE_RSSI_ADC); // current meter needs the same ports - featureClear(FEATURE_CURRENT_METER); + if (masterConfig.batteryConfig.currentMeterType == CURRENT_SENSOR_ADC) { + featureClear(FEATURE_CURRENT_METER); + } #endif #if defined(STM32F10X) || defined(CHEBUZZ) || defined(STM32F3DISCOVERY) @@ -709,13 +711,13 @@ void validateAndFixConfig(void) #endif #if defined(NAZE) && defined(SONAR) - if (feature(FEATURE_RX_PARALLEL_PWM) && feature(FEATURE_SONAR) && feature(FEATURE_CURRENT_METER)) { + if (feature(FEATURE_RX_PARALLEL_PWM) && feature(FEATURE_SONAR) && feature(FEATURE_CURRENT_METER) && masterConfig.batteryConfig.currentMeterType == CURRENT_SENSOR_ADC) { featureClear(FEATURE_CURRENT_METER); } #endif #if defined(OLIMEXINO) && defined(SONAR) - if (feature(FEATURE_SONAR) && feature(FEATURE_CURRENT_METER)) { + if (feature(FEATURE_SONAR) && feature(FEATURE_CURRENT_METER) && masterConfig.batteryConfig.currentMeterType == CURRENT_SENSOR_ADC) { featureClear(FEATURE_CURRENT_METER); } #endif -- 2.11.4.GIT