rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adc fixes (#2691) 

* ADC: save few bytes

* ADC: fix limit checking, add note for futher users

* ADC: not used anymore
This commit is contained in:
Andrey G 2021-05-13 22:51:18 +03:00 committed by GitHub
parent 0217ca8af0
commit 636c68efe2
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ public:
void enableChannel(adc_channel_e hwChannelIndex); void enableChannel(adc_channel_e hwChannelIndex);
void enableChannelAndPin(const char *msg, adc_channel_e hwChannelIndex); void enableChannelAndPin(const char *msg, adc_channel_e hwChannelIndex);
adc_channel_e getAdcHardwareIndexByInternalIndex(int index) const; adc_channel_e getAdcHardwareIndexByInternalIndex(int index) const;
int internalAdcIndexByHardwareIndex[EFI_ADC_LAST_CHANNEL]; uint8_t internalAdcIndexByHardwareIndex[EFI_ADC_LAST_CHANNEL];
bool isHwUsed(adc_channel_e hwChannel) const; bool isHwUsed(adc_channel_e hwChannel) const;
int size() const; int size() const;
void init(void); void init(void);
@ -38,13 +38,14 @@ public:
int getAdcValueByHwChannel(adc_channel_e hwChannel) const; int getAdcValueByHwChannel(adc_channel_e hwChannel) const;
adc_state values; adc_state values;
size_t channelCount = 0;
private: private:
ADCConversionGroup* hwConfig; ADCConversionGroup* hwConfig;
/** /**
* Number of ADC channels in use * Number of ADC channels in use
*/ */
size_t channelCount = 0;
/* STM32 has up-to 4 additional channels routed to internal voltage sources */
adc_channel_e hardwareIndexByIndernalAdcIndex[ADC_MAX_CHANNELS_COUNT + 4]; adc_channel_e hardwareIndexByIndernalAdcIndex[ADC_MAX_CHANNELS_COUNT + 4];
}; };

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

@ -74,7 +74,7 @@ AdcDevice::AdcDevice(ADCConversionGroup* hwConfig, adcsample_t *buf, size_t buf_
hwConfig->sqr5 = 0; hwConfig->sqr5 = 0;
#endif /* ADC_MAX_CHANNELS_COUNT */ #endif /* ADC_MAX_CHANNELS_COUNT */
memset(hardwareIndexByIndernalAdcIndex, EFI_ADC_NONE, sizeof(hardwareIndexByIndernalAdcIndex)); memset(hardwareIndexByIndernalAdcIndex, EFI_ADC_NONE, sizeof(hardwareIndexByIndernalAdcIndex));
memset(internalAdcIndexByHardwareIndex, 0xFFFFFFFF, sizeof(internalAdcIndexByHardwareIndex)); memset(internalAdcIndexByHardwareIndex, 0xFF, sizeof(internalAdcIndexByHardwareIndex));
} }
#if !defined(GPT_FREQ_FAST) || !defined(GPT_PERIOD_FAST) #if !defined(GPT_FREQ_FAST) || !defined(GPT_PERIOD_FAST)
@ -114,8 +114,7 @@ static adcsample_t getAvgAdcValue(int index, adcsample_t *samples, int bufDepth,
} }
// See https://github.com/rusefi/rusefi/issues/976 for discussion on these values // See https://github.com/rusefi/rusefi/issues/976 for discussion on this value
#define ADC_SAMPLING_SLOW ADC_SAMPLE_56
#define ADC_SAMPLING_FAST ADC_SAMPLE_28 #define ADC_SAMPLING_FAST ADC_SAMPLE_28
#if EFI_USE_FAST_ADC #if EFI_USE_FAST_ADC
@ -221,7 +220,7 @@ int getInternalAdcValue(const char *msg, adc_channel_e hwChannel) {
} }
#endif // EFI_USE_FAST_ADC #endif // EFI_USE_FAST_ADC
return slowAdcSamples[hwChannel - 1]; return slowAdcSamples[hwChannel - EFI_ADC_0];
} }
#if EFI_USE_FAST_ADC #if EFI_USE_FAST_ADC
@ -273,14 +272,17 @@ bool AdcDevice::isHwUsed(adc_channel_e hwChannelIndex) const {
} }
void AdcDevice::enableChannel(adc_channel_e hwChannel) { void AdcDevice::enableChannel(adc_channel_e hwChannel) {
if (channelCount >= efi::size(values.adc_data)) { if ((channelCount + 1) >= ADC_MAX_CHANNELS_COUNT) {
firmwareError(OBD_PCM_Processor_Fault, "Too many ADC channels configured"); firmwareError(OBD_PCM_Processor_Fault, "Too many ADC channels configured");
return; return;
} }
int logicChannel = channelCount++; int logicChannel = channelCount++;
size_t channelAdcIndex = hwChannel - 1; /* TODO: following is correct for STM32 ADC1/2.
* ADC3 has another input to gpio mapping
* and should be handled separately */
size_t channelAdcIndex = hwChannel - EFI_ADC_0;
internalAdcIndexByHardwareIndex[hwChannel] = logicChannel; internalAdcIndexByHardwareIndex[hwChannel] = logicChannel;
hardwareIndexByIndernalAdcIndex[logicChannel] = hwChannel; hardwareIndexByIndernalAdcIndex[logicChannel] = hwChannel;