andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reducinc code duplication thank you Matt

This commit is contained in:
rusefi 2020-03-30 14:12:57 -04:00
parent 2a2b00f2d9
commit 057b447d3d
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
firmware/controllers/engine_controller.cpp
View File

@ -368,9 +368,11 @@ static void printAnalogChannelInfoExt(const char *name, adc_channel_e hwChannel,
} }
static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) { static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) {
if (hwChannel != EFI_ADC_NONE) {
#if HAL_USE_ADC #if HAL_USE_ADC
printAnalogChannelInfoExt(name, hwChannel, getVoltage("print", hwChannel PASS_ENGINE_PARAMETER_SUFFIX), engineConfiguration->analogInputDividerCoefficient); printAnalogChannelInfoExt(name, hwChannel, getVoltage("print", hwChannel PASS_ENGINE_PARAMETER_SUFFIX), engineConfiguration->analogInputDividerCoefficient);
#endif /* HAL_USE_ADC */ #endif /* HAL_USE_ADC */
}
} }
static void printAnalogInfo(void) { static void printAnalogInfo(void) {
@ -379,36 +381,20 @@ static void printAnalogInfo(void) {
printAnalogChannelInfo("hip9011", engineConfiguration->hipOutputChannel); printAnalogChannelInfo("hip9011", engineConfiguration->hipOutputChannel);
printAnalogChannelInfo("fuel gauge", engineConfiguration->fuelLevelSensor); printAnalogChannelInfo("fuel gauge", engineConfiguration->fuelLevelSensor);
printAnalogChannelInfo("TPS", engineConfiguration->tps1_1AdcChannel); printAnalogChannelInfo("TPS", engineConfiguration->tps1_1AdcChannel);
if (engineConfiguration->tps2_1AdcChannel != EFI_ADC_NONE) { printAnalogChannelInfo("TPS2", engineConfiguration->tps2_1AdcChannel);
printAnalogChannelInfo("TPS2", engineConfiguration->tps2_1AdcChannel);
}
printAnalogChannelInfo("pPS", engineConfiguration->throttlePedalPositionAdcChannel); printAnalogChannelInfo("pPS", engineConfiguration->throttlePedalPositionAdcChannel);
if (engineConfiguration->clt.adcChannel != EFI_ADC_NONE) { printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel);
printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel); printAnalogChannelInfo("IAT", engineConfiguration->iat.adcChannel);
} printAnalogChannelInfo("MAF", engineConfiguration->mafAdcChannel);
if (engineConfiguration->iat.adcChannel != EFI_ADC_NONE) {
printAnalogChannelInfo("IAT", engineConfiguration->iat.adcChannel);
}
if (hasMafSensor()) {
printAnalogChannelInfo("MAF", engineConfiguration->mafAdcChannel);
}
for (int i = 0; i < FSIO_ANALOG_INPUT_COUNT ; i++) { for (int i = 0; i < FSIO_ANALOG_INPUT_COUNT ; i++) {
adc_channel_e ch = engineConfiguration->fsioAdc[i]; adc_channel_e ch = engineConfiguration->fsioAdc[i];
if (ch != EFI_ADC_NONE) { printAnalogChannelInfo("fsio", ch);
printAnalogChannelInfo("fsio", ch);
}
} }
printAnalogChannelInfo("AFR", engineConfiguration->afr.hwChannel); printAnalogChannelInfo("AFR", engineConfiguration->afr.hwChannel);
if (hasMapSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) { printAnalogChannelInfo("MAP", engineConfiguration->map.sensor.hwChannel);
printAnalogChannelInfo("MAP", engineConfiguration->map.sensor.hwChannel); printAnalogChannelInfo("BARO", engineConfiguration->baroSensor.hwChannel);
} printAnalogChannelInfo("extKno", engineConfiguration->externalKnockSenseAdc);
if (hasBaroSensor(PASS_ENGINE_PARAMETER_SIGNATURE)) {
printAnalogChannelInfo("BARO", engineConfiguration->baroSensor.hwChannel);
}
if (engineConfiguration->externalKnockSenseAdc != EFI_ADC_NONE) {
printAnalogChannelInfo("extKno", engineConfiguration->externalKnockSenseAdc);
}
printAnalogChannelInfo("OilP", engineConfiguration->oilPressure.hwChannel); printAnalogChannelInfo("OilP", engineConfiguration->oilPressure.hwChannel);