From 8a98d21c00c511188af1bbe10c6d6adfc9deb719 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 22 Jul 2024 19:28:17 -0400 Subject: [PATCH] only:ADC mode argument is always the same FAST, renaming method --- .../boards/kinetis/board_configuration.cpp | 4 ++-- firmware/hw_layer/adc/adc_inputs.cpp | 16 +++++++--------- firmware/hw_layer/adc/adc_inputs.h | 2 +- .../digital_input/trigger/trigger_input_adc.cpp | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/firmware/config/boards/kinetis/board_configuration.cpp b/firmware/config/boards/kinetis/board_configuration.cpp index 29ae8d76bd..f2f7aaaf98 100644 --- a/firmware/config/boards/kinetis/board_configuration.cpp +++ b/firmware/config/boards/kinetis/board_configuration.cpp @@ -105,10 +105,10 @@ void setAdcChannelOverrides() { // on Kinetis, ADC_FAST & SLOW are not really "fast" or "slow", // they are just different ADC numbers with different sets of channels removeChannel("VBatt", engineConfiguration->vbattAdcChannel); - addChannel("VBatt", engineConfiguration->vbattAdcChannel, ADC_FAST); + addFastAdcChannel("VBatt", engineConfiguration->vbattAdcChannel); removeChannel("TPS", engineConfiguration->tps1_1AdcChannel); - addChannel("TPS", engineConfiguration->tps1_1AdcChannel, ADC_SLOW); + addFastAdcChannel("TPS", engineConfiguration->tps1_1AdcChannel); } #include diff --git a/firmware/hw_layer/adc/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp index e1f6ab31a6..a18a66f917 100644 --- a/firmware/hw_layer/adc/adc_inputs.cpp +++ b/firmware/hw_layer/adc/adc_inputs.cpp @@ -142,18 +142,16 @@ public: } }; -void addChannel(const char*, adc_channel_e hwChannel, adc_channel_mode_e mode) { +void addFastAdcChannel(const char*, adc_channel_e hwChannel) { if (!isAdcChannelValid(hwChannel)) { return; } #if EFI_USE_FAST_ADC - if (mode == ADC_FAST) { - fastAdc.enableChannel(hwChannel); - } + fastAdc.enableChannel(hwChannel); #endif - adcHwChannelMode[hwChannel] = mode; + adcHwChannelMode[hwChannel] = ADC_FAST; // Nothing to do for slow channels, input is mapped to analog in init_sensors.cpp } @@ -183,13 +181,13 @@ static void configureInputs() { * which does not mean anything. */ - addChannel("MAP", engineConfiguration->map.sensor.hwChannel, ADC_FAST); + addFastAdcChannel("MAP", engineConfiguration->map.sensor.hwChannel); - addChannel("HIP9011", engineConfiguration->hipOutputChannel, ADC_FAST); + addFastAdcChannel("HIP9011", engineConfiguration->hipOutputChannel); - // not currently used addChannel("Vref", engineConfiguration->vRefAdcChannel, ADC_SLOW); + // not currently used addFastAdcChannel("Vref", engineConfiguration->vRefAdcChannel, ADC_SLOW); - addChannel("AUXF#1", engineConfiguration->auxFastSensor1_adcChannel, ADC_FAST); + addFastAdcChannel("AUXF#1", engineConfiguration->auxFastSensor1_adcChannel); setAdcChannelOverrides(); } diff --git a/firmware/hw_layer/adc/adc_inputs.h b/firmware/hw_layer/adc/adc_inputs.h index f02a87864c..fb00ee3746 100644 --- a/firmware/hw_layer/adc/adc_inputs.h +++ b/firmware/hw_layer/adc/adc_inputs.h @@ -86,7 +86,7 @@ void printFullAdcReportIfNeeded(void); int getInternalAdcValue(const char *msg, adc_channel_e index); float getMCUInternalTemperature(void); -void addChannel(const char *name, adc_channel_e hwChannel, adc_channel_mode_e mode); +void addFastAdcChannel(const char *name, adc_channel_e hwChannel); void removeChannel(const char *name, adc_channel_e hwChannel); #define getAdcValue(msg, hwChannel) getInternalAdcValue(msg, hwChannel) diff --git a/firmware/hw_layer/digital_input/trigger/trigger_input_adc.cpp b/firmware/hw_layer/digital_input/trigger/trigger_input_adc.cpp index a7e4300033..28edd6fbd4 100644 --- a/firmware/hw_layer/digital_input/trigger/trigger_input_adc.cpp +++ b/firmware/hw_layer/digital_input/trigger/trigger_input_adc.cpp @@ -158,7 +158,7 @@ adc_channel_e getAdcChannelForTrigger(void) { void addAdcChannelForTrigger(void) { adc_channel_e channel = getAdcChannelForTrigger(); if (isAdcChannelValid(channel)) { - addChannel("TRIG", channel, ADC_FAST); + addFastAdcChannel("TRIG", channel); } }