From d895f4dfa49424a47fa08797ecfb711605fe177f Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 13 Jul 2024 19:45:37 -0400 Subject: [PATCH] hellen on a bike: both TS and SD card logs report -32v on secondary TPS and secondary PPS #6376 only:clean-up --- firmware/console/binary/output_channels.txt | 4 ++-- firmware/hw_layer/adc/adc_inputs_onchip.cpp | 8 +------- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/tunerstudio.template.ini | 1 - 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index 5167f4e612..732ca11e3f 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -393,11 +393,11 @@ float mapFast uint16_t autoscale actualLastInjectionStage2;@@GAUGE_NAME_FUEL_LAST_INJECTION_STAGE_2@@;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 3 uint8_t autoscale injectorDutyCycleStage2;@@GAUGE_NAME_FUEL_INJ_DUTY_STAGE_2@@;"%",{1/2}, 0, 0, 0, 0 - uint8_t adc13bitCounter + uint8_t unusedByteHere uint8_t fastAdcErrorsCount uint8_t deviceUid - uint16_t unexpectedAdcSample + uint16_t unusedAdcSample uint8_t sadDwellRatioCounter uint8_t injectionPrimingCounter diff --git a/firmware/hw_layer/adc/adc_inputs_onchip.cpp b/firmware/hw_layer/adc/adc_inputs_onchip.cpp index 9f2f881e00..38fe52f890 100644 --- a/firmware/hw_layer/adc/adc_inputs_onchip.cpp +++ b/firmware/hw_layer/adc/adc_inputs_onchip.cpp @@ -240,15 +240,9 @@ adcsample_t AdcDevice::getAvgAdcValue(adc_channel_e hwChannel) { // criticalError("fast ADC unexpected sample %d", sample); // } else if (sample > ADC_MAX_VALUE) { - if (!engineConfiguration->skipADC12bitAssert) { - criticalError("ADC unexpected sample %d at %ld uptime. Please report and use skipADC12bitAssert to disable.", + criticalError("ADC unexpected sample %d at %ld uptime.", sample, (uint32_t)getTimeNowS()); - } - engine->outputChannels.unexpectedAdcSample = sample; - // sad hack which works around https://github.com/rusefi/rusefi/issues/6376 which we do not understand - sample = sample & ADC_MAX_VALUE; - engine->outputChannels.adc13bitCounter++; } result += sample; index += numChannels; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index cd3dfb7069..bdc85408ce 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1212,7 +1212,7 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\ bit devBit5 bit devBit6 bit devBit7 - bit skipADC12bitAssert + bit unusedSkipWasHere bit invertExhaustCamVVTSignal,"Falling","Rising" bit enableKnockSpectrogram diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index e38c9a6b17..bbbe27e5f1 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -3117,7 +3117,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Turbo Speed Multiplier", turboSpeedSensorMultiplier field = "Throttle inlet pressure sensor", throttleInletPressureChannel field = "Compressor discharge pressure sensor", compressorDischargePressureChannel - field = skipADC12bitAssert, skipADC12bitAssert dialog = fuelLevelDialog, "Fuel Level Sensor" field = "Input channel", fuelLevelSensor