From d28eeaaac23d80ce9a9c24645501be813143c389 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 18 May 2017 15:57:55 -0400 Subject: [PATCH] #58 --- firmware/console/binary/tunerstudio_configuration.h | 10 +++++----- firmware/console/status_loop.cpp | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/firmware/console/binary/tunerstudio_configuration.h b/firmware/console/binary/tunerstudio_configuration.h index b54948a547..569e04c574 100644 --- a/firmware/console/binary/tunerstudio_configuration.h +++ b/firmware/console/binary/tunerstudio_configuration.h @@ -74,7 +74,7 @@ typedef struct { unsigned int knockNowIndicator : 1; // bit 14 unsigned int brakePedalState : 1; // bit 15. 0 - not pressed, 1 = pressed float vehicleSpeedKph; // 76 - unsigned int isTpsError : 1; // bit 0 + unsigned int isTpsError : 1; // bit 0, 80 unsigned int isCltError : 1; // bit 1 unsigned int isMapError : 1; // bit 2 unsigned int isIatError : 1; // bit 3 @@ -82,10 +82,10 @@ typedef struct { unsigned int isTriggerError : 1; // bit 5 unsigned int hasFatalError : 1; // bit 6 unsigned int isWarnNow : 1; // bit 7 - int tsConfigVersion; - egt_values_s egtValues; - float rpmAcceleration; - float massAirFlow; + int tsConfigVersion; // 84 + egt_values_s egtValues; // 88 + float unusedOffset104; // 104 + float massAirFlow; // 108 /** * Current volumetric efficiency */ diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index a3dc07403c..081a35c1aa 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -702,7 +702,11 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ tsOutputChannels->baroPressure = hasBaroSensor() ? getBaroPressure() : 0; #endif /* EFI_ANALOG_SENSORS */ tsOutputChannels->engineLoad = engineLoad; - tsOutputChannels->rpmAcceleration = engine->rpmCalculator.getRpmAcceleration(); + + if (engineConfiguration->debugMode == DBG_TRIGGER_INPUT) { + tsOutputChannels->debugFloatField4 = engine->rpmCalculator.getRpmAcceleration(); + } + tsOutputChannels->triggerErrorsCounter = engine->triggerCentral.triggerState.totalTriggerErrorCounter; tsOutputChannels->baroCorrection = engine->engineState.baroCorrection; tsOutputChannels->pedalPosition = hasPedalPositionSensor(PASS_ENGINE_PARAMETER_SIGNATURE) ? getPedalPosition(PASS_ENGINE_PARAMETER_SIGNATURE) : 0;