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

adc: try to clean naming mess: getAdcValue() rename to adcGetRawValue()

This commit is contained in:
Andrey Gusakov 2024-12-09 13:22:49 +03:00 committed by rusefillc
parent 1ad805e1a8
commit 000c6ee284
9 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/hw_layer/adc/adc_external.h
View File

@ -11,6 +11,6 @@
#include "mcp3208.h" #include "mcp3208.h"
#define getAdcValue(channel) getMcp3208adc(channel) #define adcGetRawValue(channel) getMcp3208adc(channel)
#define adcToVoltsDivided(adc) (5.0f / 4095 * (adc)) #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)

4
firmware/hw_layer/adc/adc_inputs.cpp
View File

@ -63,7 +63,7 @@ static void printAdcValue(int channel) {
efiPrintf("Invalid ADC channel %d", channel); efiPrintf("Invalid ADC channel %d", channel);
return; 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); float volts = adcToVoltsDivided(value, (adc_channel_e)channel);
efiPrintf("adc %d voltage : %.3f", channel, volts); efiPrintf("adc %d voltage : %.3f", channel, volts);
} }
@ -73,7 +73,7 @@ static void printAdcChannedReport(const char *prefix, int internalIndex, adc_cha
if (isAdcChannelValid(hwChannel)) { if (isAdcChannelValid(hwChannel)) {
ioportid_t port = getAdcChannelPort("print", hwChannel); ioportid_t port = getAdcChannelPort("print", hwChannel);
int pin = getAdcChannelPin(hwChannel); int pin = getAdcChannelPin(hwChannel);
int adcValue = getAdcValue("print", hwChannel); int adcValue = adcGetRawValue("print", hwChannel);
float volts = getVoltage("print", hwChannel); float volts = getVoltage("print", hwChannel);
float voltsDivided = getVoltageDivided("print", hwChannel); float voltsDivided = getVoltageDivided("print", hwChannel);
/* Human index starts from 1 */ /* Human index starts from 1 */

2
firmware/hw_layer/adc/adc_inputs.h
View File

@ -89,7 +89,7 @@ float getMCUInternalTemperature(void);
void addFastAdcChannel(const char *name, adc_channel_e hwChannel); void addFastAdcChannel(const char *name, adc_channel_e hwChannel);
void removeChannel(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)) #define adcToVoltsDivided(adc, hwChannel) (adcToVolts(adc) * getAnalogInputDividerCoefficient(hwChannel))

2
firmware/hw_layer/adc/adc_inputs_onchip.cpp
View File

@ -36,7 +36,7 @@ float getVoltageDivided(const char *msg, adc_channel_e hwChannel) {
// voltage in MCU universe, from zero to VDD // voltage in MCU universe, from zero to VDD
float getVoltage(const char *msg, adc_channel_e hwChannel) { float getVoltage(const char *msg, adc_channel_e hwChannel) {
return adcToVolts(getAdcValue(msg, hwChannel)); return adcToVolts(adcGetRawValue(msg, hwChannel));
} }
#if EFI_USE_FAST_ADC #if EFI_USE_FAST_ADC

3
firmware/hw_layer/hardware.cpp
View File

@ -283,7 +283,8 @@ void onFastAdcComplete(adcsample_t*) {
#if EFI_SENSOR_CHART && EFI_SHAFT_POSITION_INPUT #if EFI_SENSOR_CHART && EFI_SHAFT_POSITION_INPUT
if (getEngineState()->sensorChartMode == SC_AUX_FAST1) { 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); scAddData(engine->triggerCentral.getCurrentEnginePhase(getTimeNowNt()).value_or(0), voltage);
} }
#endif /* EFI_SENSOR_CHART */ #endif /* EFI_SENSOR_CHART */

4
simulator/simulator/boards.cpp
View File

@ -11,13 +11,13 @@
#include "engine_sniffer.h" #include "engine_sniffer.h"
#include "adc_math.h" #include "adc_math.h"
int getAdcValue(const char * /*msg*/, int /*hwChannel*/) { int adcGetRawValue(const char * /*msg*/, int /*hwChannel*/) {
return 0; return 0;
} }
// voltage in MCU universe, from zero to VDD // voltage in MCU universe, from zero to VDD
float getVoltage(const char *msg, adc_channel_e hwChannel) { 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 // Board voltage, with divider coefficient accounted for

2
simulator/simulator/boards.h
View File

@ -10,7 +10,7 @@
#define ADC_LOGIC_INTAKE_AIR 0 #define ADC_LOGIC_INTAKE_AIR 0
#define ADC_LOGIC_COOLANT 0 #define ADC_LOGIC_COOLANT 0
int getAdcValue(const char *msg, int channel); int adcGetRawValue(const char *msg, int channel);
#define waitForSlowAdc(x) {} #define waitForSlowAdc(x) {}

8
unit_tests/boards.cpp
View File

@ -9,6 +9,10 @@
#include "boards.h" #include "boards.h"
int adcGetRawValue(const char *msg, adc_channel_e hwChannel) {
return 0;
}
float getVoltageDivided(const char *msg, adc_channel_e hwChannel) { float getVoltageDivided(const char *msg, adc_channel_e hwChannel) {
return 0; return 0;
} }
@ -16,7 +20,3 @@ float getVoltageDivided(const char *msg, adc_channel_e hwChannel) {
float getVoltage(const char *msg, adc_channel_e hwChannel) { float getVoltage(const char *msg, adc_channel_e hwChannel) {
return 0; return 0;
} }
int getAdcValue(const char *msg, adc_channel_e hwChannel) {
return 0;
}

2
unit_tests/boards.h
View File

@ -12,4 +12,4 @@
#define ADC_CHANNEL_VREF 0 #define ADC_CHANNEL_VREF 0
int getAdcValue(const char *msg, adc_channel_e channel); int adcGetRawValue(const char *msg, adc_channel_e channel);