From 25beb610b07a8000031be3182ba6a4e4914ce301 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 2 Dec 2021 16:22:33 -0800 Subject: [PATCH] log actual tooth angle (#3646) --- firmware/console/status_loop.cpp | 10 ---------- firmware/console/status_loop.h | 1 - firmware/controllers/trigger/trigger_central.cpp | 4 +++- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 7b226983b2..fe404a8c7c 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -872,16 +872,6 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels) { } } -void updateCurrentEnginePhase() { - if (auto phase = engine->triggerCentral.getCurrentEnginePhase(getTimeNowNt())) { - angle_t angle = phase.Value - tdcPosition(); - wrapAngle(angle, "updateCurrentEnginePhase", CUSTOM_ERR_6555); - tsOutputChannels.currentEnginePhase = angle; - } else { - tsOutputChannels.currentEnginePhase = 0; - } -} - void prepareTunerStudioOutputs(void) { // sensor state for EFI Analytics Tuner Studio updateTunerStudioState(&tsOutputChannels); diff --git a/firmware/console/status_loop.h b/firmware/console/status_loop.h index f37d6a1e03..c6553afc3e 100644 --- a/firmware/console/status_loop.h +++ b/firmware/console/status_loop.h @@ -11,7 +11,6 @@ void updateDevConsoleState(void); void prepareTunerStudioOutputs(void); -void updateCurrentEnginePhase(); void startStatusThreads(void); void initStatusLoop(void); diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 641ba4b724..87794077cd 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -656,7 +656,9 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal, efitick_t timesta mainTriggerCallback(triggerIndexForListeners, timestamp); #if EFI_TUNER_STUDIO - updateCurrentEnginePhase(); + auto toothAngle = engine->triggerCentral.triggerFormDetails.eventAngles[triggerIndexForListeners] - tdcPosition(); + wrapAngle(toothAngle, "currentEnginePhase", CUSTOM_ERR_6555); + tsOutputChannels.currentEnginePhase = toothAngle; #endif } }