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

ADC: common definitions to common header

This commit is contained in:
Andrey Gusakov 2024-05-09 19:17:50 +03:00
parent be1bbc5cda
commit 3da91ec55d
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,8 +80,8 @@ void removeChannel(const char *name, adc_channel_e hwChannel);
// This callback is called by the ADC driver when a new fast ADC sample is ready
void onFastAdcComplete(adcsample_t* samples);
using FastAdcToken = size_t;
static constexpr FastAdcToken invalidAdcToken = (FastAdcToken)(-1);
FastAdcToken enableFastAdcChannel(const char* msg, adc_channel_e channel);
adcsample_t getFastAdc(FastAdcToken token);

8
firmware/hw_layer/ports/cypress/mpu_util.cpp
View File

@ -253,19 +253,17 @@ bool readSlowAnalogInputs(adcsample_t* convertedSamples) {
return true;
}
static constexpr FastAdcToken invalidToken = (FastAdcToken)(-1);
FastAdcToken enableFastAdcChannel(const char*, adc_channel_e channel) {
if (!isAdcChannelValid(channel)) {
return invalidToken;
return invalidAdcToken;
}
// TODO: implement me!
return invalidToken;
return invalidAdcToken;
}
adcsample_t getFastAdc(FastAdcToken token) {
if (token == invalidToken) {
if (token == invalidAdcToken) {
return 0;
}

8
firmware/hw_layer/ports/kinetis/mpu_util.cpp
View File

@ -260,19 +260,17 @@ bool readSlowAnalogInputs(adcsample_t* convertedSamples) {
return true;
}
static constexpr FastAdcToken invalidToken = (FastAdcToken)(-1);
FastAdcToken enableFastAdcChannel(const char*, adc_channel_e channel) {
if (!isAdcChannelValid(channel)) {
return invalidToken;
return invalidAdcToken;
}
// TODO: implement me!
return invalidToken;
return invalidAdcToken;
}
adcsample_t getFastAdc(FastAdcToken token) {
if (token == invalidToken) {
if (token == invalidAdcToken) {
return 0;
}

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

@ -205,18 +205,16 @@ bool readSlowAnalogInputs(adcsample_t* convertedSamples) {
extern AdcDevice fastAdc;
static constexpr FastAdcToken invalidToken = (FastAdcToken)(-1);
FastAdcToken enableFastAdcChannel(const char*, adc_channel_e channel) {
if (!isAdcChannelValid(channel)) {
return invalidToken;
return invalidAdcToken;
}
return fastAdc.getAdcChannelToken(channel);
}
adcsample_t getFastAdc(FastAdcToken token) {
if (token == invalidToken) {
if (token == invalidAdcToken) {
return 0;
}

6
firmware/hw_layer/ports/stm32/stm32_adc_v4.cpp
View File

@ -170,11 +170,9 @@ bool readSlowAnalogInputs(adcsample_t* convertedSamples) {
return true;
}
static constexpr FastAdcToken invalidToken = (FastAdcToken)(-1);
FastAdcToken enableFastAdcChannel(const char*, adc_channel_e channel) {
if (!isAdcChannelValid(channel)) {
return invalidToken;
return invalidAdcToken;
}
// H7 always samples all fast channels, nothing to do here but compute index
@ -182,7 +180,7 @@ FastAdcToken enableFastAdcChannel(const char*, adc_channel_e channel) {
}
adcsample_t getFastAdc(FastAdcToken token) {
if (token == invalidToken) {
if (token == invalidAdcToken) {
return 0;
}