From f483535a39f26c617298738fb1985612b8dde57f Mon Sep 17 00:00:00 2001
From: Andrey <rusefillc@gmail.com>
Date: Sun, 5 Mar 2023 01:53:11 -0500
Subject: [PATCH] progress: bringing simulator closer to real code
 only:hellen-honda-k

---
 firmware/controllers/engine_controller.cpp   | 21 ++++++++++++++++++++
 firmware/rusefi.cpp                          | 19 ------------------
 simulator/simulator/efifeatures.h            |  2 ++
 simulator/simulator/rusEfiFunctionalTest.cpp |  5 -----
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 622ed287b1..98a1130a48 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -41,6 +41,7 @@
 #include "speed_density.h"
 #include "local_version_holder.h"
 #include "alternator_controller.h"
+#include "engine_emulator.h"
 #include "fuel_math.h"
 #include "spark_logic.h"
 #include "status_loop.h"
@@ -52,6 +53,7 @@
 #include "tachometer.h"
 #include "gppwm.h"
 #include "date_stamp.h"
+#include "rusefi_lua.h"
 #include "buttonshift.h"
 #include "start_stop.h"
 #include "dynoview.h"
@@ -623,6 +625,25 @@ void commonEarlyInit() {
 #if EFI_FILE_LOGGING
 	initMmcCard();
 #endif /* EFI_FILE_LOGGING */
+
+#if EFI_ENGINE_EMULATOR
+	initEngineEmulator();
+#endif
+
+#if EFI_LUA
+	startLua();
+#endif // EFI_LUA
+
+#if EFI_CAN_SERIAL
+	// needs to be called after initCan() inside initHardware()
+	startCanConsole();
+#endif /* EFI_CAN_SERIAL */
+
+#if HW_CHECK_ALWAYS_STIMULATE
+	// we need a special binary for final assembly check. We cannot afford to require too much software or too many steps
+	// to be executed at the place of assembly
+	enableTriggerStimulator();
+#endif // HW_CHECK_ALWAYS_STIMULATE
 }
 
 void initEngineController() {
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index d4cb051e9a..d1854336bc 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -253,25 +253,6 @@ void runRusEfiWithConfig() {
 
 	commonEarlyInit();
 
-#if EFI_ENGINE_EMULATOR
-	initEngineEmulator();
-#endif
-
-#if EFI_LUA
-	startLua();
-#endif // EFI_LUA
-
-#if EFI_CAN_SERIAL
-	// needs to be called after initCan() inside initHardware()
-	startCanConsole();
-#endif /* EFI_CAN_SERIAL */
-
-#if HW_CHECK_ALWAYS_STIMULATE
-	// we need a special binary for final assembly check. We cannot afford to require too much software or too many steps
-	// to be executed at the place of assembly
-	enableTriggerStimulator();
-#endif // HW_CHECK_ALWAYS_STIMULATE
-
 
 	// Config could be completely bogus - don't start anything else!
 	if (validateConfig()) {
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index 50163c3cf7..4c12bdbe2a 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -16,6 +16,8 @@
 
 #define EFI_TCU FALSE
 
+#define EFI_ENGINE_EMULATOR TRUE
+
 /**
  * todo: we *plan* an (integration) test
  */
diff --git a/simulator/simulator/rusEfiFunctionalTest.cpp b/simulator/simulator/rusEfiFunctionalTest.cpp
index 29f13b2b2f..cb5135c444 100644
--- a/simulator/simulator/rusEfiFunctionalTest.cpp
+++ b/simulator/simulator/rusEfiFunctionalTest.cpp
@@ -108,13 +108,8 @@ void rusEfiFunctionalTest(void) {
 
 	commonInitEngineController();
 
-	initTriggerCentral();
-	initTriggerEmulator();
-
 	commonEarlyInit();
 
-	startLua();
-
 	initStatusLoop();
 
     /**