From 266e50f4ca9c2d88a2273f0687c3df5e08317116 Mon Sep 17 00:00:00 2001
From: Andrey <rusefillc@gmail.com>
Date: Fri, 25 Jun 2021 11:50:23 -0400
Subject: [PATCH] Trigger: warning code on normal engine start up #669

making more code unit-testable
---
 .../controllers/algo/engine_configuration.cpp  |  2 +-
 .../trigger/trigger_emulator_algo.cpp          | 18 +++++++++++-------
 .../trigger/trigger_emulator_algo.h            |  2 +-
 unit_tests/efifeatures.h                       |  2 ++
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index ff489ff9ea..0052f8b193 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -198,7 +198,7 @@ void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 #if EFI_SHAFT_POSITION_INPUT
 	onConfigurationChangeTriggerCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
 #endif /* EFI_SHAFT_POSITION_INPUT */
-#if EFI_EMULATE_POSITION_SENSORS
+#if EFI_EMULATE_POSITION_SENSORS && ! EFI_UNIT_TEST
 	onConfigurationChangeRpmEmulatorCallback(&activeConfiguration);
 #endif /* EFI_EMULATE_POSITION_SENSORS */
 
diff --git a/firmware/controllers/trigger/trigger_emulator_algo.cpp b/firmware/controllers/trigger/trigger_emulator_algo.cpp
index eadc932ee8..c3b97d3617 100644
--- a/firmware/controllers/trigger/trigger_emulator_algo.cpp
+++ b/firmware/controllers/trigger/trigger_emulator_algo.cpp
@@ -107,7 +107,7 @@ void setTriggerEmulatorRPM(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX) {
 	efiPrintf("Emulating position sensor(s). RPM=%d", rpm);
 }
 
-static void updateTriggerWaveformIfNeeded(PwmConfig *state) {
+static void updateTriggerWaveformIfNeeded(PwmConfig *state DECLARE_ENGINE_PARAMETER_SUFFIX) {
 	if (atTriggerVersion < engine->triggerCentral.triggerShape.version) {
 		atTriggerVersion = engine->triggerCentral.triggerShape.version;
 		efiPrintf("Stimulator: updating trigger shape: %d/%d %d", atTriggerVersion,
@@ -127,6 +127,10 @@ static void updateTriggerWaveformIfNeeded(PwmConfig *state) {
 static TriggerEmulatorHelper helper;
 static bool hasStimPins = false;
 
+static bool hasInitTriggerEmulator = false;
+
+# if !EFI_UNIT_TEST
+
 static void emulatorApplyPinState(int stateIndex, PwmConfig *state) /* pwm_gen_callback */ {
 	if (engine->directSelfStimulation) {
 		/**
@@ -143,9 +147,7 @@ static void emulatorApplyPinState(int stateIndex, PwmConfig *state) /* pwm_gen_c
 #endif /* EFI_PROD_CODE */
 }
 
-static bool hasInitTriggerEmulator = false;
-
-static void initTriggerPwm() {
+static void initTriggerPwm(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	// No need to start more than once
 	if (hasInitTriggerEmulator) {
 		return;
@@ -195,15 +197,17 @@ void onConfigurationChangeRpmEmulatorCallback(engine_configuration_s *previousCo
 	setTriggerEmulatorRPM(engineConfiguration->triggerSimulatorFrequency);
 }
 
+#endif /* EFI_UNIT_TEST */
+
 void initTriggerEmulator(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	efiPrintf("Emulating %s", getConfigurationName(engineConfiguration->engineType));
 
-	startTriggerEmulatorPins();
+	startTriggerEmulatorPins(PASS_ENGINE_PARAMETER_SIGNATURE);
 
-	initTriggerEmulatorLogic();
+	initTriggerEmulatorLogic(PASS_ENGINE_PARAMETER_SIGNATURE);
 }
 
-void startTriggerEmulatorPins() {
+void startTriggerEmulatorPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	hasStimPins = false;
 	for (size_t i = 0; i < efi::size(emulatorOutputs); i++) {
 		triggerSignal.outputPins[i] = &emulatorOutputs[i];
diff --git a/firmware/controllers/trigger/trigger_emulator_algo.h b/firmware/controllers/trigger/trigger_emulator_algo.h
index b369e7c95a..96cd8fd7dd 100644
--- a/firmware/controllers/trigger/trigger_emulator_algo.h
+++ b/firmware/controllers/trigger/trigger_emulator_algo.h
@@ -13,7 +13,7 @@ class PwmConfig;
 class MultiChannelStateSequence;
 
 void initTriggerEmulator(DECLARE_ENGINE_PARAMETER_SIGNATURE);
-void startTriggerEmulatorPins();
+void startTriggerEmulatorPins(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 void stopTriggerEmulatorPins();
 void setTriggerEmulatorRPM(int value DECLARE_ENGINE_PARAMETER_SUFFIX);
 void onConfigurationChangeRpmEmulatorCallback(engine_configuration_s *previousConfiguration);
diff --git a/unit_tests/efifeatures.h b/unit_tests/efifeatures.h
index 2e2e955180..1cba07c663 100644
--- a/unit_tests/efifeatures.h
+++ b/unit_tests/efifeatures.h
@@ -11,6 +11,8 @@
 
 #define EFI_ENABLE_ASSERTS TRUE
 
+#define EFI_EMULATE_POSITION_SENSORS TRUE
+
 #define EFI_ENGINE_SNIFFER TRUE
 
 #define EFI_PRINTF_FUEL_DETAILS TRUE