From a81655216bad6e7df08c157aee28d4256775feb3 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Mon, 23 Dec 2019 22:40:23 -0500
Subject: [PATCH] adding simplicity

---
 firmware/controllers/algo/algo.cpp           | 4 ----
 firmware/controllers/algo/algo.h             | 5 ++---
 firmware/controllers/engine_controller.cpp   | 4 ++--
 firmware/controllers/engine_controller.h     | 2 +-
 simulator/simulator/rusEfiFunctionalTest.cpp | 1 -
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/firmware/controllers/algo/algo.cpp b/firmware/controllers/algo/algo.cpp
index c9043fa298..b7ebe74079 100644
--- a/firmware/controllers/algo/algo.cpp
+++ b/firmware/controllers/algo/algo.cpp
@@ -34,7 +34,3 @@ void initDataStructures(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	initTimingMap(PASS_ENGINE_PARAMETER_SIGNATURE);
 	initSpeedDensity(PASS_ENGINE_PARAMETER_SIGNATURE);
 }
-
-void initAlgo(Logging *sharedLogger) {
-	initInterpolation(sharedLogger);
-}
diff --git a/firmware/controllers/algo/algo.h b/firmware/controllers/algo/algo.h
index f08b8d1497..515cf61d91 100644
--- a/firmware/controllers/algo/algo.h
+++ b/firmware/controllers/algo/algo.h
@@ -2,12 +2,11 @@
  * @file	algo.h
  *
  * @date Mar 2, 2014
- * @author Andrey Belomutskiy, (c) 2012-2017
+ * @author Andrey Belomutskiy, (c) 2012-2019
  */
 
 #pragma once
 
 #include "global.h"
-#include "engine_configuration.h"
+
 void initDataStructures(DECLARE_ENGINE_PARAMETER_SIGNATURE);
-void initAlgo(Logging *sharedLogger);
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index da5e99d610..8ec8d8f14f 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -660,6 +660,8 @@ static void getKnockInfo(void) {
 
 // this method is used by real firmware and simulator and unit test
 void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
+	initInterpolation(sharedLogger);
+
 #if EFI_SIMULATOR
 	printf("commonInitEngineController\n");
 #endif
@@ -708,8 +710,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX)
 	initPwmGenerator();
 #endif
 
-	initAlgo(sharedLogger);
-
 #if EFI_LOGIC_ANALYZER
 	if (engineConfiguration->isWaveAnalyzerEnabled) {
 		initWaveAnalyzer(sharedLogger);
diff --git a/firmware/controllers/engine_controller.h b/firmware/controllers/engine_controller.h
index 5998855921..3f9c0eef6b 100644
--- a/firmware/controllers/engine_controller.h
+++ b/firmware/controllers/engine_controller.h
@@ -3,7 +3,7 @@
  * @brief   Controllers package entry point header
  *
  * @date Feb 7, 2013
- * @author Andrey Belomutskiy, (c) 2012-2017
+ * @author Andrey Belomutskiy, (c) 2012-2019
  */
 
 #pragma once
diff --git a/simulator/simulator/rusEfiFunctionalTest.cpp b/simulator/simulator/rusEfiFunctionalTest.cpp
index c1d9c3ceab..3e25884cd0 100644
--- a/simulator/simulator/rusEfiFunctionalTest.cpp
+++ b/simulator/simulator/rusEfiFunctionalTest.cpp
@@ -121,7 +121,6 @@ void rusEfiFunctionalTest(void) {
 	resetConfigurationExt(NULL, FORD_ESCORT_GT PASS_ENGINE_PARAMETER_SUFFIX);
 	prepareShapes(PASS_ENGINE_PARAMETER_SIGNATURE);
 
-	initAlgo(&sharedLogger);
 	commonInitEngineController(&sharedLogger);
 
 	initRpmCalculator(&sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);