From 000c6ee284b3e9bd8d742d6625418430d3545793 Mon Sep 17 00:00:00 2001 From: Andrey Gusakov Date: Mon, 9 Dec 2024 13:22:49 +0300 Subject: [PATCH] adc: try to clean naming mess: getAdcValue() rename to adcGetRawValue() --- firmware/hw_layer/adc/adc_external.h | 4 ++-- firmware/hw_layer/adc/adc_inputs.cpp | 4 ++-- firmware/hw_layer/adc/adc_inputs.h | 2 +- firmware/hw_layer/adc/adc_inputs_onchip.cpp | 2 +- firmware/hw_layer/hardware.cpp | 3 ++- simulator/simulator/boards.cpp | 4 ++-- simulator/simulator/boards.h | 2 +- unit_tests/boards.cpp | 8 ++++---- unit_tests/boards.h | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/firmware/hw_layer/adc/adc_external.h b/firmware/hw_layer/adc/adc_external.h index 099804ccca..4614f67aef 100644 --- a/firmware/hw_layer/adc/adc_external.h +++ b/firmware/hw_layer/adc/adc_external.h @@ -11,6 +11,6 @@ #include "mcp3208.h" -#define getAdcValue(channel) getMcp3208adc(channel) +#define adcGetRawValue(channel) getMcp3208adc(channel) #define adcToVoltsDivided(adc) (5.0f / 4095 * (adc)) -#define getVoltageDivided(msg, channel) (isAdcChannelValid(channel) ? adcToVoltsDivided(getAdcValue(msg, channel), channel) : 66.66) +#define getVoltageDivided(msg, channel) (isAdcChannelValid(channel) ? adcToVoltsDivided(adcGetRawValue(msg, channel), channel) : 66.66) diff --git a/firmware/hw_layer/adc/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp index f79e3fb89f..06adb0b853 100644 --- a/firmware/hw_layer/adc/adc_inputs.cpp +++ b/firmware/hw_layer/adc/adc_inputs.cpp @@ -63,7 +63,7 @@ static void printAdcValue(int channel) { efiPrintf("Invalid ADC channel %d", channel); return; } - int value = getAdcValue("print", (adc_channel_e)channel); + int value = adcGetRawValue("print", (adc_channel_e)channel); float volts = adcToVoltsDivided(value, (adc_channel_e)channel); efiPrintf("adc %d voltage : %.3f", channel, volts); } @@ -73,7 +73,7 @@ static void printAdcChannedReport(const char *prefix, int internalIndex, adc_cha if (isAdcChannelValid(hwChannel)) { ioportid_t port = getAdcChannelPort("print", hwChannel); int pin = getAdcChannelPin(hwChannel); - int adcValue = getAdcValue("print", hwChannel); + int adcValue = adcGetRawValue("print", hwChannel); float volts = getVoltage("print", hwChannel); float voltsDivided = getVoltageDivided("print", hwChannel); /* Human index starts from 1 */ diff --git a/firmware/hw_layer/adc/adc_inputs.h b/firmware/hw_layer/adc/adc_inputs.h index f494e4a4ab..4f7f19a759 100644 --- a/firmware/hw_layer/adc/adc_inputs.h +++ b/firmware/hw_layer/adc/adc_inputs.h @@ -89,7 +89,7 @@ float getMCUInternalTemperature(void); 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) +#define adcGetRawValue(msg, hwChannel) getInternalAdcValue(msg, hwChannel) #define adcToVoltsDivided(adc, hwChannel) (adcToVolts(adc) * getAnalogInputDividerCoefficient(hwChannel)) diff --git a/firmware/hw_layer/adc/adc_inputs_onchip.cpp b/firmware/hw_layer/adc/adc_inputs_onchip.cpp index 017fc14545..625c4e5bf6 100644 --- a/firmware/hw_layer/adc/adc_inputs_onchip.cpp +++ b/firmware/hw_layer/adc/adc_inputs_onchip.cpp @@ -36,7 +36,7 @@ float getVoltageDivided(const char *msg, adc_channel_e hwChannel) { // voltage in MCU universe, from zero to VDD float getVoltage(const char *msg, adc_channel_e hwChannel) { - return adcToVolts(getAdcValue(msg, hwChannel)); + return adcToVolts(adcGetRawValue(msg, hwChannel)); } #if EFI_USE_FAST_ADC diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 94840691cd..bd5ca85a09 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -283,7 +283,8 @@ void onFastAdcComplete(adcsample_t*) { #if EFI_SENSOR_CHART && EFI_SHAFT_POSITION_INPUT if (getEngineState()->sensorChartMode == SC_AUX_FAST1) { - float voltage = getAdcValue("fAux1", engineConfiguration->auxFastSensor1_adcChannel); + /* Why we use raw value here? */ + float voltage = adcGetRawValue("fAux1", engineConfiguration->auxFastSensor1_adcChannel); scAddData(engine->triggerCentral.getCurrentEnginePhase(getTimeNowNt()).value_or(0), voltage); } #endif /* EFI_SENSOR_CHART */ diff --git a/simulator/simulator/boards.cpp b/simulator/simulator/boards.cpp index e19c1b06b0..fc9bcab544 100644 --- a/simulator/simulator/boards.cpp +++ b/simulator/simulator/boards.cpp @@ -11,13 +11,13 @@ #include "engine_sniffer.h" #include "adc_math.h" -int getAdcValue(const char * /*msg*/, int /*hwChannel*/) { +int adcGetRawValue(const char * /*msg*/, int /*hwChannel*/) { return 0; } // voltage in MCU universe, from zero to VDD float getVoltage(const char *msg, adc_channel_e hwChannel) { - return adcToVolts(getAdcValue(msg, hwChannel)); + return adcToVolts(adcGetRawValue(msg, hwChannel)); } // Board voltage, with divider coefficient accounted for diff --git a/simulator/simulator/boards.h b/simulator/simulator/boards.h index 27db168712..c8172c4397 100644 --- a/simulator/simulator/boards.h +++ b/simulator/simulator/boards.h @@ -10,7 +10,7 @@ #define ADC_LOGIC_INTAKE_AIR 0 #define ADC_LOGIC_COOLANT 0 -int getAdcValue(const char *msg, int channel); +int adcGetRawValue(const char *msg, int channel); #define waitForSlowAdc(x) {} diff --git a/unit_tests/boards.cpp b/unit_tests/boards.cpp index d58ea9f82a..7febdd6985 100644 --- a/unit_tests/boards.cpp +++ b/unit_tests/boards.cpp @@ -9,6 +9,10 @@ #include "boards.h" +int adcGetRawValue(const char *msg, adc_channel_e hwChannel) { + return 0; +} + float getVoltageDivided(const char *msg, adc_channel_e hwChannel) { return 0; } @@ -16,7 +20,3 @@ float getVoltageDivided(const char *msg, adc_channel_e hwChannel) { float getVoltage(const char *msg, adc_channel_e hwChannel) { return 0; } - -int getAdcValue(const char *msg, adc_channel_e hwChannel) { - return 0; -} diff --git a/unit_tests/boards.h b/unit_tests/boards.h index 8841d6fc72..e9690ebd3e 100644 --- a/unit_tests/boards.h +++ b/unit_tests/boards.h @@ -12,4 +12,4 @@ #define ADC_CHANNEL_VREF 0 -int getAdcValue(const char *msg, adc_channel_e channel); +int adcGetRawValue(const char *msg, adc_channel_e channel);