more FSIO logging

This commit is contained in:
rusefi 2017-12-17 00:17:55 -05:00
parent cc052b9e19
commit 95824c2c91
4 changed files with 21 additions and 6 deletions

View File

@ -73,7 +73,11 @@ extern bool main_loop_started;
#include "max31855.h"
#include "vehicle_speed.h"
#include "SingleTimerExecutor.h"
#endif
#endif /* EFI_PROD_CODE */
#if EFI_FSIO || defined(__DOXYGEN__)
#include "fsio_impl.h"
#endif /* EFI_FSIO */
static bool subscription[(int) RO_LAST_ELEMENT];
@ -780,6 +784,17 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->debugFloatField1 = getVoltage("fsio", engineConfiguration->fsioAdc[0]);
}
break;
case DBG_FSIO_EXPRESSION:
#if EFI_FSIO || defined(__DOXYGEN__)
tsOutputChannels->debugFloatField1 = getFsioOutputValue(0 PASS_ENGINE_PARAMETER_SUFFIX);
tsOutputChannels->debugFloatField2 = getFsioOutputValue(1 PASS_ENGINE_PARAMETER_SUFFIX);
tsOutputChannels->debugFloatField3 = getFsioOutputValue(2 PASS_ENGINE_PARAMETER_SUFFIX);
tsOutputChannels->debugFloatField4 = getFsioOutputValue(3 PASS_ENGINE_PARAMETER_SUFFIX);
tsOutputChannels->debugFloatField5 = getFsioOutputValue(4 PASS_ENGINE_PARAMETER_SUFFIX);
tsOutputChannels->debugFloatField6 = getFsioOutputValue(5 PASS_ENGINE_PARAMETER_SUFFIX);
tsOutputChannels->debugFloatField7 = getFsioOutputValue(6 PASS_ENGINE_PARAMETER_SUFFIX);
#endif /* EFI_FSIO */
break;
case DBG_VEHICLE_SPEED_SENSOR:
tsOutputChannels->debugIntField1 = engine->engineState.vssEventCounter;
break;
@ -804,7 +819,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->debugFloatField6 = (engineConfiguration->iat.adcChannel != EFI_ADC_NONE) ? getVoltageDivided("iat", engineConfiguration->iat.adcChannel) : 0.0f;
tsOutputChannels->debugFloatField7 = (engineConfiguration->afr.hwChannel != EFI_ADC_NONE) ? getVoltageDivided("ego", engineConfiguration->afr.hwChannel) : 0.0f;
break;
case DBG_22:
case DBG_INSTANT_RPM:
int prevIndex;
{
float instantRpm = engine->triggerCentral.triggerState.instantRpm;

View File

@ -726,8 +726,8 @@ typedef enum {
DBG_AUX_VALVES = 20,
DBG_ADC = 21,
DBG_22 = 22,
DBG_23 = 23,
DBG_INSTANT_RPM = 22,
DBG_FSIO_EXPRESSION = 23,
DBG_24 = 24,
DBG_25 = 25,
DBG_26 = 26,

View File

@ -242,7 +242,7 @@ float TriggerStateWithRunningStatistics::calculateInstantRpm(int *prevIndex, efi
}
void TriggerStateWithRunningStatistics::runtimeStatistics(efitime_t nowNt DECLARE_ENGINE_PARAMETER_SUFFIX) {
if (engineConfiguration->debugMode == DBG_22) {
if (engineConfiguration->debugMode == DBG_INSTANT_RPM) {
int prevIndex;
instantRpm = calculateInstantRpm(&prevIndex, nowNt PASS_ENGINE_PARAMETER_SUFFIX);
}

View File

@ -260,5 +260,5 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20171208;
return 20171217;
}