extracting prime_injection

firmware/controllers/algo/engine.h

@@ -43,6 +43,7 @@
 #include "fan_control.h"
 #include "sensor_checker.h"
 #include "fuel_schedule.h"
+#include "prime_injection.h"
 
 #ifndef EFI_UNIT_TEST
 #error EFI_UNIT_TEST must be defined!
@@ -113,34 +114,6 @@ protected:
 	trigger_config_s getType() const override;
 };
 
-class PrimeController : public EngineModule {
-public:
-	void onIgnitionStateChanged(bool ignitionOn) override;
-
-	floatms_t getPrimeDuration() const;
-
-	void onPrimeStart();
-	void onPrimeEnd();
-
-	bool isPriming() const {
-		return m_isPriming;
-	}
-
-private:
-	scheduling_s m_start;
-	scheduling_s m_end;
-
-	bool m_isPriming = false;
-
-	static void onPrimeStartAdapter(PrimeController* instance) {
-		instance->onPrimeStart();
-	}
-
-	static void onPrimeEndAdapter(PrimeController* instance) {
-		instance->onPrimeEnd();
-	}
-};
-
 class Engine final : public TriggerStateListener {
 public:
 	Engine();

firmware/controllers/controllers.mk

@@ -42,6 +42,7 @@ CONTROLLERS_SRC_CPP = \
 	$(CONTROLLERS_DIR)/engine_cycle/spark_logic.cpp \
 	$(CONTROLLERS_DIR)/engine_cycle/knock_controller.cpp \
 	$(CONTROLLERS_DIR)/engine_cycle/main_trigger_callback.cpp \
+	$(CONTROLLERS_DIR)/engine_cycle/prime_injection.cpp \
 	$(CONTROLLERS_DIR)/engine_cycle/aux_valves.cpp \
 	$(CONTROLLERS_DIR)/engine_cycle/fuel_schedule.cpp \
 	$(CONTROLLERS_DIR)/flash_main.cpp \

firmware/controllers/core/engine_module.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "engine_configuration.h"
+
 class EngineModule {
 public:
 	// Called when 'Burn' is invoked

firmware/controllers/engine_cycle/main_trigger_callback.cpp

@@ -59,7 +59,7 @@ void startSimultaneousInjection(void*) {
 	}
 }
 
-static void endSimultaneousInjectionOnlyTogglePins() {
+void endSimultaneousInjectionOnlyTogglePins() {
 	efitick_t nowNt = getTimeNowNt();
 	for (size_t i = 0; i < engineConfiguration->specs.cylindersCount; i++) {
 		enginePins.injectors[i].close(nowNt);

firmware/controllers/engine_cycle/main_trigger_callback.h

@@ -13,7 +13,6 @@
 
 void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp, angle_t currentPhase, angle_t nextPhase);
 
-void startSimultaneousInjection(void* = nullptr);
 void endSimultaneousInjection(InjectionEvent *event);
 void turnInjectionPinHigh(InjectionEvent *event);
 void turnInjectionPinLow(InjectionEvent *event);

firmware/controllers/engine_cycle/prime_injection.cpp

@@ -0,0 +1,7 @@
+/*
+ * @file prime_injection.cpp
+ */
+
+#include "prime_injection.h"
+
+

firmware/controllers/engine_cycle/prime_injection.h

@@ -0,0 +1,38 @@
+/*
+ * @file prime_injection.h
+
+ */
+
+#pragma once
+
+#include "engine_module.h"
+#include "rusefi_types.h"
+#include "scheduler.h"
+
+class PrimeController : public EngineModule {
+public:
+	void onIgnitionStateChanged(bool ignitionOn) override;
+
+	floatms_t getPrimeDuration() const;
+
+	void onPrimeStart();
+	void onPrimeEnd();
+
+	bool isPriming() const {
+		return m_isPriming;
+	}
+
+private:
+	scheduling_s m_start;
+	scheduling_s m_end;
+
+	bool m_isPriming = false;
+
+	static void onPrimeStartAdapter(PrimeController* instance) {
+		instance->onPrimeStart();
+	}
+
+	static void onPrimeEndAdapter(PrimeController* instance) {
+		instance->onPrimeEnd();
+	}
+};

firmware/controllers/system/efi_gpio.h

@@ -115,6 +115,9 @@ public:
 	const char *shortName = nullptr;
 };
 
+void startSimultaneousInjection(void* = nullptr);
+void endSimultaneousInjectionOnlyTogglePins();
+
 class InjectorOutputPin final : public NamedOutputPin {
 public:
 	InjectorOutputPin();