From 6de42dbab609fa8ef45677a6d7606721e7e81677 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sun, 5 Nov 2023 00:18:31 -0400
Subject: [PATCH] better EFI_ENGINE_CONTROL guard

---
 firmware/controllers/algo/advance_map.cpp | 3 ++-
 firmware/controllers/algo/fuel_math.cpp   | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/firmware/controllers/algo/advance_map.cpp b/firmware/controllers/algo/advance_map.cpp
index f9d58bf484..4fc515d9b0 100644
--- a/firmware/controllers/algo/advance_map.cpp
+++ b/firmware/controllers/algo/advance_map.cpp
@@ -31,6 +31,8 @@
 // todo: reset this between cranking attempts?! #2735
 int minCrankingRpm = 0;
 
+#if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT
+
 /**
  * @return ignition timing angle advance before TDC
  */
@@ -107,7 +109,6 @@ static angle_t getRunningAdvance(int rpm, float engineLoad) {
 	return advanceAngle;
 }
 
-#if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT
 static angle_t getAdvanceCorrections(float engineLoad) {
 	auto iat = Sensor::get(SensorType::Iat);
 
diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp
index ed7f0ed869..44371f232c 100644
--- a/firmware/controllers/algo/fuel_math.cpp
+++ b/firmware/controllers/algo/fuel_math.cpp
@@ -168,6 +168,8 @@ float getMaxAirflowAtMap(float map) {
 	return sdAirmass.getAirflow(Sensor::getOrZero(SensorType::Rpm), map, false);
 }
 
+#if EFI_ENGINE_CONTROL
+
 // Per-cylinder base fuel mass
 static float getBaseFuelMass(int rpm) {
 	ScopePerf perf(PE::GetBaseFuel);
@@ -297,7 +299,6 @@ static float getCycleFuelMass(bool isCranking, float baseFuelMass) {
 float getInjectionMass(int rpm) {
 	ScopePerf perf(PE::GetInjectionDuration);
 
-#if EFI_SHAFT_POSITION_INPUT
 	// Always update base fuel - some cranking modes use it
 	float baseFuelMass = getBaseFuelMass(rpm);
 
@@ -326,10 +327,8 @@ float getInjectionMass(int rpm) {
 	float tpsFuelMass = engine->module<InjectorModel>()->getFuelMassForDuration(tpsAccelPerInjection);
 
 	return injectionFuelMass + tpsFuelMass;
-#else
-	return 0;
-#endif
 }
+#endif
 
 /**
  * @brief	Initialize fuel map data structure