diff --git a/src/main/drivers/adc.h b/src/main/drivers/adc.h index 89b0dccd78..dceed0a857 100644 --- a/src/main/drivers/adc.h +++ b/src/main/drivers/adc.h @@ -43,7 +43,7 @@ typedef struct adcChannelConfig_t { typedef struct adcConfig_s { adcChannelConfig_t vbat; adcChannelConfig_t rssi; - adcChannelConfig_t currentMeter; // FIXME rename to current/amperage + adcChannelConfig_t current; adcChannelConfig_t external1; } adcConfig_t; diff --git a/src/main/drivers/adc_stm32f10x.c b/src/main/drivers/adc_stm32f10x.c index 84ecf1048a..f987123c99 100644 --- a/src/main/drivers/adc_stm32f10x.c +++ b/src/main/drivers/adc_stm32f10x.c @@ -96,8 +96,8 @@ void adcInit(const adcConfig_t *config) adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL; } - if (config->currentMeter.enabled) { - adcOperatingConfig[ADC_CURRENT].tag = config->currentMeter.ioTag; //CURRENT_METER_ADC_CHANNEL; + if (config->current.enabled) { + adcOperatingConfig[ADC_CURRENT].tag = config->current.ioTag; //CURRENT_METER_ADC_CHANNEL; } ADCDevice device = adcDeviceByInstance(ADC_INSTANCE); diff --git a/src/main/drivers/adc_stm32f30x.c b/src/main/drivers/adc_stm32f30x.c index 9c7216529c..044b407fe0 100644 --- a/src/main/drivers/adc_stm32f30x.c +++ b/src/main/drivers/adc_stm32f30x.c @@ -125,8 +125,8 @@ void adcInit(const adcConfig_t *config) adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL; } - if (config->currentMeter.enabled) { - adcOperatingConfig[ADC_CURRENT].tag = config->currentMeter.ioTag; //CURRENT_METER_ADC_CHANNEL; + if (config->current.enabled) { + adcOperatingConfig[ADC_CURRENT].tag = config->current.ioTag; //CURRENT_METER_ADC_CHANNEL; } ADCDevice device = adcDeviceByInstance(ADC_INSTANCE); diff --git a/src/main/drivers/adc_stm32f4xx.c b/src/main/drivers/adc_stm32f4xx.c index 29e3348347..740dfea047 100644 --- a/src/main/drivers/adc_stm32f4xx.c +++ b/src/main/drivers/adc_stm32f4xx.c @@ -109,8 +109,8 @@ void adcInit(const adcConfig_t *config) adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL; } - if (config->currentMeter.enabled) { - adcOperatingConfig[ADC_CURRENT].tag = config->currentMeter.ioTag; //CURRENT_METER_ADC_CHANNEL; + if (config->current.enabled) { + adcOperatingConfig[ADC_CURRENT].tag = config->current.ioTag; //CURRENT_METER_ADC_CHANNEL; } ADCDevice device = adcDeviceByInstance(ADC_INSTANCE); diff --git a/src/main/drivers/adc_stm32f7xx.c b/src/main/drivers/adc_stm32f7xx.c index c5fb482867..53bf1c0f19 100644 --- a/src/main/drivers/adc_stm32f7xx.c +++ b/src/main/drivers/adc_stm32f7xx.c @@ -102,8 +102,8 @@ void adcInit(const adcConfig_t *config) adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL; } - if (config->currentMeter.enabled) { - adcOperatingConfig[ADC_CURRENT].tag = config->currentMeter.ioTag; //CURRENT_METER_ADC_CHANNEL; + if (config->current.enabled) { + adcOperatingConfig[ADC_CURRENT].tag = config->current.ioTag; //CURRENT_METER_ADC_CHANNEL; } ADCDevice device = adcDeviceByInstance(ADC_INSTANCE); diff --git a/src/main/fc/config.c b/src/main/fc/config.c index 42e7be6d4a..af7868958c 100755 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -195,8 +195,8 @@ void pgResetFn_adcConfig(adcConfig_t *adcConfig) #endif #ifdef CURRENT_METER_ADC_PIN - adcConfig->currentMeter.enabled = true; - adcConfig->currentMeter.ioTag = IO_TAG(CURRENT_METER_ADC_PIN); + adcConfig->current.enabled = true; + adcConfig->current.ioTag = IO_TAG(CURRENT_METER_ADC_PIN); #endif #ifdef RSSI_ADC_PIN diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c index 017744018a..6b36697bcc 100644 --- a/src/main/fc/fc_init.c +++ b/src/main/fc/fc_init.c @@ -378,7 +378,7 @@ void init(void) #ifdef USE_ADC adcConfigMutable()->vbat.enabled = (batteryConfig()->voltageMeterSource == VOLTAGE_METER_ADC); - adcConfigMutable()->currentMeter.enabled = (batteryConfig()->currentMeterSource == CURRENT_METER_ADC); + adcConfigMutable()->current.enabled = (batteryConfig()->currentMeterSource == CURRENT_METER_ADC); adcConfigMutable()->rssi.enabled = feature(FEATURE_RSSI_ADC); adcInit(adcConfig());