Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 20:35:33 +03:00
Code Issues Wiki Activity

CF/BF - rename adcConfig.currentMeter to adcConfig.current

Browse source
This commit is contained in:
Hydra 2017-03-16 23:22:48 +00:00 • committed by Dominic Clifton
parent dbd819c85a
commit 249c707beb
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/drivers/adc.h
View file

@ -43,7 +43,7 @@ typedef struct adcChannelConfig_t {
typedef struct adcConfig_s { typedef struct adcConfig_s {
adcChannelConfig_t vbat; adcChannelConfig_t vbat;
adcChannelConfig_t rssi; adcChannelConfig_t rssi;
adcChannelConfig_t currentMeter; // FIXME rename to current/amperage adcChannelConfig_t current;
adcChannelConfig_t external1; adcChannelConfig_t external1;
} adcConfig_t; } adcConfig_t;

4
src/main/drivers/adc_stm32f10x.c
View file

@ -96,8 +96,8 @@ void adcInit(const adcConfig_t *config)
adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL; adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL;
} }
if (config->currentMeter.enabled) { if (config->current.enabled) {
adcOperatingConfig[ADC_CURRENT].tag = config->currentMeter.ioTag; //CURRENT_METER_ADC_CHANNEL; adcOperatingConfig[ADC_CURRENT].tag = config->current.ioTag; //CURRENT_METER_ADC_CHANNEL;
} }
ADCDevice device = adcDeviceByInstance(ADC_INSTANCE); ADCDevice device = adcDeviceByInstance(ADC_INSTANCE);

4
src/main/drivers/adc_stm32f30x.c
View file

@ -125,8 +125,8 @@ void adcInit(const adcConfig_t *config)
adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL; adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL;
} }
if (config->currentMeter.enabled) { if (config->current.enabled) {
adcOperatingConfig[ADC_CURRENT].tag = config->currentMeter.ioTag; //CURRENT_METER_ADC_CHANNEL; adcOperatingConfig[ADC_CURRENT].tag = config->current.ioTag; //CURRENT_METER_ADC_CHANNEL;
} }
ADCDevice device = adcDeviceByInstance(ADC_INSTANCE); ADCDevice device = adcDeviceByInstance(ADC_INSTANCE);

4
src/main/drivers/adc_stm32f4xx.c
View file

@ -109,8 +109,8 @@ void adcInit(const adcConfig_t *config)
adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL; adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL;
} }
if (config->currentMeter.enabled) { if (config->current.enabled) {
adcOperatingConfig[ADC_CURRENT].tag = config->currentMeter.ioTag; //CURRENT_METER_ADC_CHANNEL; adcOperatingConfig[ADC_CURRENT].tag = config->current.ioTag; //CURRENT_METER_ADC_CHANNEL;
} }
ADCDevice device = adcDeviceByInstance(ADC_INSTANCE); ADCDevice device = adcDeviceByInstance(ADC_INSTANCE);

4
src/main/drivers/adc_stm32f7xx.c
View file

@ -102,8 +102,8 @@ void adcInit(const adcConfig_t *config)
adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL; adcOperatingConfig[ADC_EXTERNAL1].tag = config->external1.ioTag; //EXTERNAL1_ADC_CHANNEL;
} }
if (config->currentMeter.enabled) { if (config->current.enabled) {
adcOperatingConfig[ADC_CURRENT].tag = config->currentMeter.ioTag; //CURRENT_METER_ADC_CHANNEL; adcOperatingConfig[ADC_CURRENT].tag = config->current.ioTag; //CURRENT_METER_ADC_CHANNEL;
} }
ADCDevice device = adcDeviceByInstance(ADC_INSTANCE); ADCDevice device = adcDeviceByInstance(ADC_INSTANCE);

4
src/main/fc/config.c
View file

@ -195,8 +195,8 @@ void pgResetFn_adcConfig(adcConfig_t *adcConfig)
#endif #endif
#ifdef CURRENT_METER_ADC_PIN #ifdef CURRENT_METER_ADC_PIN
adcConfig->currentMeter.enabled = true; adcConfig->current.enabled = true;
adcConfig->currentMeter.ioTag = IO_TAG(CURRENT_METER_ADC_PIN); adcConfig->current.ioTag = IO_TAG(CURRENT_METER_ADC_PIN);
#endif #endif
#ifdef RSSI_ADC_PIN #ifdef RSSI_ADC_PIN

2
src/main/fc/fc_init.c
View file

@ -378,7 +378,7 @@ void init(void)
#ifdef USE_ADC #ifdef USE_ADC
adcConfigMutable()->vbat.enabled = (batteryConfig()->voltageMeterSource == VOLTAGE_METER_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); adcConfigMutable()->rssi.enabled = feature(FEATURE_RSSI_ADC);
adcInit(adcConfig()); adcInit(adcConfig());