logging of live data structs was: data points, we are moving away from debug mode #3614

firmware/controllers/algo/engine2.cpp

@@ -167,7 +167,9 @@ void EngineState::periodicFastCallback() {
 	float baseAdvance = getAdvance(rpm, ignitionLoad) * engine->ignitionState.luaTimingMult + engine->ignitionState.luaTimingAdd;
 	float correctedIgnitionAdvance = baseAdvance
 			// Pull any extra timing for knock retard
-			+ engine->module<KnockController>()->getKnockRetard();
+			- engine->module<KnockController>()->getKnockRetard()
+			// Degrees of timing REMOVED from actual timing during soft RPM limit window
+			- getLimpManager()->getLimitingTimingRetard();
 	// these fields are scaled_channel so let's only use for observability, with a local variables holding value while it matters locally
 	engine->ignitionState.baseIgnitionAdvance = baseAdvance;
 	engine->ignitionState.correctedIgnitionAdvance = correctedIgnitionAdvance;

firmware/controllers/engine_cycle/spark_logic.cpp

@@ -100,9 +100,7 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_
 
 	angle_t correctedSparkAngle =
 		// Negate because timing *before* TDC, and we schedule *after* TDC
-		- getEngineState()->timingAdvance[event->cylinderNumber]
-		// Degrees of timing REMOVED from actual timing during soft RPM limit window 
-		+ getLimpManager()->getLimitingTimingRetard();
+		- getEngineState()->timingAdvance[event->cylinderNumber];
 
     engine->ignitionState.perCylinderTiming[event->cylinderIndex] = correctedSparkAngle;