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

if you need this command you need a debugger

This commit is contained in:
Matthew Kennedy 2024-07-03 01:06:28 -07:00
parent adfbb283be
commit 4554e099f4
4 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/console/status_loop.cpp
View File

@ -208,10 +208,6 @@ void updateDevConsoleState() {
}
#endif /* EFI_PROD_CODE */
#if HAL_USE_ADC
printFullAdcReportIfNeeded();
#endif /* HAL_USE_ADC */
#if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT
systime_t nowSeconds = getTimeNowS();

2
firmware/controllers/settings.cpp
View File

@ -537,8 +537,6 @@ void initSettings() {
addConsoleActionS(CMD_ALTERNATOR_PIN, setAlternatorPin);
addConsoleActionS(CMD_IDLE_PIN, setIdlePin);
addConsoleAction("adc_report", printFullAdcReport);
#if HAL_USE_ADC
addConsoleActionSS("set_analog_input_pin", setAnalogInputPin);
#endif // HAL_USE_ADC

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

@ -78,9 +78,6 @@ AdcDevice::AdcDevice(ADCConversionGroup* hwConfig, adcsample_t *buf, size_t buf_
static uint32_t slowAdcCounter = 0;
// todo: move this flag to Engine god object
static int adcDebugReporting = false;
static adcsample_t getAvgAdcValue(int index, adcsample_t *samples, int bufDepth, int numChannels) {
uint32_t result = 0;
for (int i = 0; i < bufDepth; i++) {
@ -295,50 +292,6 @@ static void printAdcValue(int channel) {
efiPrintf("adc voltage : %.2f", volts);
}
static uint32_t slowAdcConversionCount = 0;
static uint32_t slowAdcErrorsCount = 0;
void printFullAdcReport(void) {
#if EFI_USE_FAST_ADC
efiPrintf("fast %lu samples", fastAdc.conversionCount);
for (int internalIndex = 0; internalIndex < fastAdc.size(); internalIndex++) {
adc_channel_e hwIndex = fastAdc.getAdcHardwareIndexByInternalIndex(internalIndex);
if (isAdcChannelValid(hwIndex)) {
ioportid_t port = getAdcChannelPort("print", hwIndex);
int pin = getAdcChannelPin(hwIndex);
int adcValue = getAvgAdcValue(internalIndex, fastAdc.m_samples, ADC_BUF_DEPTH_FAST, fastAdc.size());
float volts = adcToVolts(adcValue);
/* Human index starts from 1 */
efiPrintf(" F ch[%2d] @ %s%d ADC%d 12bit=%4d %.2fV",
internalIndex, portname(port), pin, hwIndex - EFI_ADC_0 + 1, adcValue, volts);
}
}
#endif // EFI_USE_FAST_ADC
efiPrintf("slow %lu samples", slowAdcConversionCount);
/* we assume that all slow ADC channels are enabled */
for (int internalIndex = 0; internalIndex < ADC_MAX_CHANNELS_COUNT; internalIndex++) {
adc_channel_e hwIndex = static_cast<adc_channel_e>(internalIndex + EFI_ADC_0);
if (isAdcChannelValid(hwIndex)) {
ioportid_t port = getAdcChannelPort("print", hwIndex);
int pin = getAdcChannelPin(hwIndex);
int adcValue = slowAdcSamples[internalIndex];
float volts = adcToVolts(adcValue);
/* Human index starts from 1 */
efiPrintf(" S ch[%2d] @ %s%d ADC%d 12bit=%4d %.2fV",
internalIndex, portname(port), pin, hwIndex - EFI_ADC_0 + 1, adcValue, volts);
}
}
}
static void setAdcDebugReporting(int value) {
adcDebugReporting = value;
efiPrintf("adcDebug=%d", adcDebugReporting);
}
void waitForSlowAdc(uint32_t lastAdcCounter) {
// we use slowAdcCounter instead of slowAdc.conversionCount because we need ADC_COMPLETE state
// todo: use sync.objects?
@ -363,9 +316,7 @@ public:
{
ScopePerf perf(PE::AdcConversionSlow);
slowAdcConversionCount++;
if (!readSlowAnalogInputs(slowAdcSamples)) {
slowAdcErrorsCount++;
return;
}
@ -438,9 +389,6 @@ void initAdcInputs() {
configureInputs();
// migrate to 'enable adcdebug'
addConsoleActionI("adcdebug", &setAdcDebugReporting);
#if EFI_INTERNAL_ADC
portInitAdc();
@ -460,12 +408,6 @@ void initAdcInputs() {
#endif
}
void printFullAdcReportIfNeeded(void) {
if (!adcDebugReporting)
return;
printFullAdcReport();
}
#else /* not HAL_USE_ADC */
__attribute__((weak)) float getVoltageDivided(const char*, adc_channel_e) {

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

@ -59,7 +59,6 @@ int getSlowAdcCounter();
int getAdcHardwareIndexByInternalIndex(int index);
void printFullAdcReportIfNeeded(void);
int getInternalAdcValue(const char *msg, adc_channel_e index);
float getMCUInternalTemperature(void);
@ -90,5 +89,3 @@ using FastAdcToken = size_t;
FastAdcToken enableFastAdcChannel(const char* msg, adc_channel_e channel);
adcsample_t getFastAdc(FastAdcToken token);
#endif // HAL_USE_ADC
void printFullAdcReport(void);