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

adc fixed #1979 

partial revert
This commit is contained in:
rusefi 2020-11-22 15:31:33 -05:00
parent 5678190d5a
commit 98605677f6
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +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;
/* We use adc_channel_e as index for following array */ int internalAdcIndexByHardwareIndex[ADC_MAX_CHANNELS_COUNT + 4];
char internalAdcIndexByHardwareIndex[EFI_ADC_LAST + 1];
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);
@ -39,14 +38,13 @@ public:
int getAdcValueByHwChannel(adc_channel_e hwChannel) const; int getAdcValueByHwChannel(adc_channel_e hwChannel) const;
adc_state values; adc_state values;
int channelCount;
private: private:
ADCConversionGroup* hwConfig; ADCConversionGroup* hwConfig;
/** /**
* Number of ADC channels in use * Number of ADC channels in use
*/ */
unsigned char channelCount;
/* 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];
}; };

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

@ -76,7 +76,7 @@ AdcDevice::AdcDevice(ADCConversionGroup* hwConfig, adcsample_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, EFI_ADC_ERROR, sizeof(internalAdcIndexByHardwareIndex)); memset(internalAdcIndexByHardwareIndex, 0xFFFFFFFF, sizeof(internalAdcIndexByHardwareIndex));
} }
#if !defined(GPT_FREQ_FAST) || !defined(GPT_PERIOD_FAST) #if !defined(GPT_FREQ_FAST) || !defined(GPT_PERIOD_FAST)
@ -315,21 +315,13 @@ int AdcDevice::size() const {
return channelCount; return channelCount;
} }
int AdcDevice::getAdcValueByIndex(int internalIndex) const { int AdcDevice::getAdcValueByHwChannel(adc_channel_e hwChannel) const {
if (internalIndex >= size()) { int internalIndex = internalAdcIndexByHardwareIndex[hwChannel];
firmwareError(OBD_PCM_Processor_Fault, "ADC channel index out of range %d", internalIndex);
return 0;
}
return values.adc_data[internalIndex]; return values.adc_data[internalIndex];
} }
int AdcDevice::getAdcValueByHwChannel(adc_channel_e hwChannel) const { int AdcDevice::getAdcValueByIndex(int internalIndex) const {
if (hwChannel >= ARRAY_SIZE(internalAdcIndexByHardwareIndex)) { return values.adc_data[internalIndex];
firmwareError(OBD_PCM_Processor_Fault, "ADC hwChannel out of range");
return 0;
}
int internalIndex = internalAdcIndexByHardwareIndex[hwChannel];
return getAdcValueByIndex(internalIndex);
} }
void AdcDevice::invalidateSamplesCache() { void AdcDevice::invalidateSamplesCache() {
@ -359,7 +351,7 @@ bool AdcDevice::isHwUsed(adc_channel_e hwChannelIndex) const {
} }
void AdcDevice::enableChannel(adc_channel_e hwChannel) { void AdcDevice::enableChannel(adc_channel_e hwChannel) {
if (channelCount >= ADC_MAX_CHANNELS_COUNT) { if (channelCount >= efi::size(values.adc_data)) {
firmwareError(OBD_PCM_Processor_Fault, "Too many ADC channels configured"); firmwareError(OBD_PCM_Processor_Fault, "Too many ADC channels configured");
return; return;
} }