cylinder calculates its own angle offset

firmware/controllers/engine_cycle/spark_logic.cpp

@@ -68,8 +68,10 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_
 	// let's save planned duration so that we can later compare it with reality
 	event->sparkDwell = sparkDwell;
 
+	const auto& cylinder = engine->cylinders[realCylinderNumber];
+
 	// Compute the final ignition timing including all "late" adjustments
-	angle_t finalIgnitionTiming =	engine->cylinders[realCylinderNumber].getIgnitionTimingBtdc()
+	angle_t finalIgnitionTiming =	cylinder.getIgnitionTimingBtdc()
 									// Pull any extra timing for knock retard
 									- engine->module<KnockController>()->getKnockRetard();
 
@@ -90,7 +92,7 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_
 		// Negate because timing *before* TDC, and we schedule *after* TDC
 		- finalIgnitionTiming
 		// Offset by this cylinder's position in the cycle
-		+ getCylinderAngle(event->cylinderIndex, realCylinderNumber);
+		+ cylinder.getAngleOffset();
 
 	efiAssertVoid(ObdCode::CUSTOM_SPARK_ANGLE_1, !std::isnan(sparkAngle), "sparkAngle#1");
 	wrapAngle(sparkAngle, "findAngle#2", ObdCode::CUSTOM_ERR_6550);