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

ADC: encapsulation

This commit is contained in:
Andrey Gusakov 2024-05-09 19:05:31 +03:00 committed by rusefillc
parent 123d66b29a
commit 6a0eb0b0c8
3 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,8 @@ public:
explicit AdcDevice(ADCConversionGroup* p_hwConfig, adcsample_t *p_buf); explicit AdcDevice(ADCConversionGroup* p_hwConfig, adcsample_t *p_buf);
void enableChannel(adc_channel_e hwChannel); void enableChannel(adc_channel_e hwChannel);
adc_channel_e getAdcChannelByInternalIndex(int index) const; adc_channel_e getAdcChannelByInternalIndex(int index) const;
uint8_t internalAdcIndexByHardwareIndex[EFI_ADC_TOTAL_CHANNELS]; adcsample_t getAvgAdcValue(adc_channel_e hwChannel, size_t bufDepth);
FastAdcToken getAdcChannelToken(adc_channel_e hwChannel);
int size() const; int size() const;
void init(void); void init(void);
uint32_t conversionCount = 0; uint32_t conversionCount = 0;
@ -39,6 +40,7 @@ public:
adcsample_t *samples; adcsample_t *samples;
private: private:
ADCConversionGroup* hwConfig; ADCConversionGroup* hwConfig;
uint8_t internalAdcIndexByHardwareIndex[EFI_ADC_TOTAL_CHANNELS];
/** /**
* Number of ADC channels in use * Number of ADC channels in use
*/ */

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

@ -80,30 +80,6 @@ static uint32_t slowAdcCounter = 0;
static int adcDebugReporting = false; static int adcDebugReporting = false;
#if EFI_USE_FAST_ADC #if EFI_USE_FAST_ADC
static adcsample_t getAvgAdcValue(int index, adcsample_t *samples, int bufDepth, int numChannels) {
uint32_t result = 0;
for (int i = 0; i < bufDepth; i++) {
adcsample_t sample = samples[index];
// if (sample > 0x1FFF) {
// // 12bit ADC expected right now, make this configurable one day
// criticalError("fast ADC unexpected sample %d", sample);
// } else
if (sample > 0xFFF) {
if (!engineConfiguration->skipADC12bitAssert) {
criticalError("fast ADC unexpected sample %d. Please report and use skipADC12bitAssert to disable", sample);
}
engine->outputChannels.unexpectedAdcSample = sample;
sample = sample & 0xFFF; // sad hack which works around https://github.com/rusefi/rusefi/issues/6376 which we do not understand
engine->outputChannels.adc13bitCounter++;
}
result += sample;
index += numChannels;
}
// this truncation is guaranteed to not be lossy - the average can't be larger than adcsample_t
return static_cast<adcsample_t>(result / bufDepth);
}
// See https://github.com/rusefi/rusefi/issues/976 for discussion on this value // See https://github.com/rusefi/rusefi/issues/976 for discussion on this value
#ifndef ADC_SAMPLING_FAST #ifndef ADC_SAMPLING_FAST
@ -208,11 +184,9 @@ int getInternalAdcValue(const char *msg, adc_channel_e hwChannel) {
#if EFI_USE_FAST_ADC #if EFI_USE_FAST_ADC
if (adcHwChannelMode[hwChannel] == ADC_FAST) { if (adcHwChannelMode[hwChannel] == ADC_FAST) {
int internalIndex = fastAdc.internalAdcIndexByHardwareIndex[hwChannel]; /* todo if ADC_BUF_DEPTH_FAST EQ 1
// todo if ADC_BUF_DEPTH_FAST EQ 1 * return fastAdc.samples[internalIndex]; */
// return fastAdc.samples[internalIndex]; return fastAdc.getAvgAdcValue(hwChannel, ADC_BUF_DEPTH_FAST);
int value = getAvgAdcValue(internalIndex, fastAdc.samples, ADC_BUF_DEPTH_FAST, fastAdc.size());
return value;
} }
#endif // EFI_USE_FAST_ADC #endif // EFI_USE_FAST_ADC
@ -275,6 +249,33 @@ void AdcDevice::enableChannel(adc_channel_e hwChannel) {
#endif /* ADC_MAX_CHANNELS_COUNT */ #endif /* ADC_MAX_CHANNELS_COUNT */
} }
adcsample_t AdcDevice::getAvgAdcValue(adc_channel_e hwChannel, size_t bufDepth) {
uint32_t result = 0;
int numChannels = size();
int index = fastAdc.internalAdcIndexByHardwareIndex[hwChannel];
for (size_t i = 0; i < bufDepth; i++) {
adcsample_t sample = samples[index];
// if (sample > 0x1FFF) {
// // 12bit ADC expected right now, make this configurable one day
// criticalError("fast ADC unexpected sample %d", sample);
// } else
if (sample > 0xFFF) {
if (!engineConfiguration->skipADC12bitAssert) {
criticalError("fast ADC unexpected sample %d. Please report and use skipADC12bitAssert to disable", sample);
}
engine->outputChannels.unexpectedAdcSample = sample;
sample = sample & 0xFFF; // sad hack which works around https://github.com/rusefi/rusefi/issues/6376 which we do not understand
engine->outputChannels.adc13bitCounter++;
}
result += sample;
index += numChannels;
}
// this truncation is guaranteed to not be lossy - the average can't be larger than adcsample_t
return static_cast<adcsample_t>(result / bufDepth);
}
adc_channel_e AdcDevice::getAdcChannelByInternalIndex(int hwChannel) const { adc_channel_e AdcDevice::getAdcChannelByInternalIndex(int hwChannel) const {
for (size_t idx = EFI_ADC_0; idx < EFI_ADC_TOTAL_CHANNELS; idx++) { for (size_t idx = EFI_ADC_0; idx < EFI_ADC_TOTAL_CHANNELS; idx++) {
if (internalAdcIndexByHardwareIndex[idx] == hwChannel) { if (internalAdcIndexByHardwareIndex[idx] == hwChannel) {
@ -284,6 +285,10 @@ adc_channel_e AdcDevice::getAdcChannelByInternalIndex(int hwChannel) const {
return EFI_ADC_NONE; return EFI_ADC_NONE;
} }
FastAdcToken AdcDevice::getAdcChannelToken(adc_channel_e hwChannel) {
return fastAdc.internalAdcIndexByHardwareIndex[hwChannel];
}
#endif // EFI_USE_FAST_ADC #endif // EFI_USE_FAST_ADC
static void printAdcValue(int channel) { static void printAdcValue(int channel) {

2
firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp
View File

@ -212,7 +212,7 @@ FastAdcToken enableFastAdcChannel(const char*, adc_channel_e channel) {
return invalidToken; return invalidToken;
} }
return fastAdc.internalAdcIndexByHardwareIndex[static_cast<size_t>(channel)]; return fastAdc.getAdcChannelToken(channel);
} }
adcsample_t getFastAdc(FastAdcToken token) { adcsample_t getFastAdc(FastAdcToken token) {