From 4f358c40d1b1f8d698383f7bf6b17f33f1617a91 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 22 Sep 2019 04:37:36 -0700 Subject: [PATCH 1/2] hook up rpm acceleration (#946) --- firmware/console/binary/tunerstudio_configuration.h | 2 +- firmware/console/status_loop.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/firmware/console/binary/tunerstudio_configuration.h b/firmware/console/binary/tunerstudio_configuration.h index 62d8ea4ff2..b743985d65 100644 --- a/firmware/console/binary/tunerstudio_configuration.h +++ b/firmware/console/binary/tunerstudio_configuration.h @@ -89,7 +89,7 @@ typedef struct { unsigned int isKnockChipOk : 1; // bit 9 int tsConfigVersion; // 84 egt_values_s egtValues; // 88 - float unusedOffset104; // 104 + float rpmAcceleration; // 104 float massAirFlow; // 108 /** * Current volumetric efficiency diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index d6254be5cb..432d6572dd 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -740,6 +740,8 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ tsOutputChannels->actualLastInjection = ENGINE(actualLastInjection); + // 104 + tsOutputChannels->rpmAcceleration engine->rpmCalculator.getRpmAcceleration(); // offset 108 // For air-interpolated tCharge mode, we calculate a decent massAirFlow approximation, so we can show it to users even without MAF sensor! tsOutputChannels->massAirFlow = getAirFlowGauge(PASS_ENGINE_PARAMETER_SIGNATURE); @@ -932,7 +934,6 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ tsOutputChannels->debugFloatField1 = engine->triggerCentral.getHwEventCounter((int)SHAFT_PRIMARY_RISING); tsOutputChannels->debugFloatField2 = engine->triggerCentral.getHwEventCounter((int)SHAFT_SECONDARY_RISING); tsOutputChannels->debugFloatField3 = engine->triggerCentral.getHwEventCounter((int)SHAFT_3RD_RISING); - tsOutputChannels->debugFloatField4 = engine->rpmCalculator.getRpmAcceleration(); break; case DBG_FSIO_ADC: // todo: implement a proper loop From 196a57f8133efd6f001d29d5cac13b4fca8105b8 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 22 Sep 2019 07:49:26 -0400 Subject: [PATCH 2/2] fixing build --- firmware/console/status_loop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 432d6572dd..4bed4cb854 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -741,7 +741,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ // 104 - tsOutputChannels->rpmAcceleration engine->rpmCalculator.getRpmAcceleration(); + tsOutputChannels->rpmAcceleration = engine->rpmCalculator.getRpmAcceleration(); // offset 108 // For air-interpolated tCharge mode, we calculate a decent massAirFlow approximation, so we can show it to users even without MAF sensor! tsOutputChannels->massAirFlow = getAirFlowGauge(PASS_ENGINE_PARAMETER_SIGNATURE);