From efb232223f5b0b805b105c49bbe32287ae29f7b0 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Fri, 16 Sep 2022 00:06:57 -0400
Subject: [PATCH] moving acceleration around

---
 firmware/controllers/engine_cycle/main_trigger_callback.cpp | 4 ----
 firmware/controllers/trigger/trigger_central.cpp            | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
index 60c569ed67..c354b29a8c 100644
--- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp
+++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
@@ -225,10 +225,6 @@ static void handleFuel(uint32_t trgEventIndex, int rpm, efitick_t nowNt, float c
 	efiAssertVoid(CUSTOM_STACK_6627, getCurrentRemainingStack() > 128, "lowstck#3");
 	efiAssertVoid(CUSTOM_ERR_6628, trgEventIndex < getTriggerCentral()->engineCycleEventCount, "handleFuel/event index");
 
-	if (trgEventIndex == 0) {
-		engine->tpsAccelEnrichment.onEngineCycleTps();
-	}
-
 	LimpState limitedFuelState = getLimpManager()->allowInjection();
 	engine->outputChannels.fuelCutReason = (int8_t)limitedFuelState.reason;
 	bool limitedFuel = !limitedFuelState.value;
diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
index 84eb97f006..d8c1d3bb97 100644
--- a/firmware/controllers/trigger/trigger_central.cpp
+++ b/firmware/controllers/trigger/trigger_central.cpp
@@ -751,6 +751,10 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal, efitick_t timesta
 	}
 #endif /* EFI_CDM_INTEGRATION */
 
+	if (engine->rpmCalculator.getCachedRpm() > 0 && triggerIndexForListeners == 0) {
+		engine->tpsAccelEnrichment.onEngineCycleTps();
+	}
+
 		// Handle ignition and injection
 		mainTriggerCallback(triggerIndexForListeners, timestamp, currentPhase, nextPhase);