From 7a765f29b91a81d014385541909149385e3d0c74 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Tue, 9 Apr 2019 23:00:17 -0400
Subject: [PATCH] The Big Refactoring of 2019: folder structure #723

---
 firmware/controllers/actuators/alternator_controller.cpp | 4 ++--
 firmware/controllers/actuators/malfunction_indicator.cpp | 4 ++--
 firmware/controllers/engine_controller.cpp               | 2 ++
 firmware/controllers/flash_main.cpp                      | 3 +--
 firmware/controllers/injector_central.cpp                | 3 ++-
 firmware/controllers/persistent_store.cpp                | 4 +++-
 firmware/controllers/settings.cpp                        | 2 ++
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/firmware/controllers/actuators/alternator_controller.cpp b/firmware/controllers/actuators/alternator_controller.cpp
index 7318ebce92..10fdb74177 100644
--- a/firmware/controllers/actuators/alternator_controller.cpp
+++ b/firmware/controllers/actuators/alternator_controller.cpp
@@ -7,7 +7,8 @@
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
-
+#include "global.h"
+#if EFI_ALTERNATOR_CONTROL || defined(__DOXYGEN__)
 #include "engine.h"
 #include "rpm_calculator.h"
 #include "alternator_controller.h"
@@ -16,7 +17,6 @@
 #include "local_version_holder.h"
 #include "periodic_controller.h"
 
-#if EFI_ALTERNATOR_CONTROL || defined(__DOXYGEN__)
 #include "pwm_generator.h"
 #include "pin_repository.h"
 #include "tunerstudio_configuration.h"
diff --git a/firmware/controllers/actuators/malfunction_indicator.cpp b/firmware/controllers/actuators/malfunction_indicator.cpp
index 877ab4db68..742d46f410 100644
--- a/firmware/controllers/actuators/malfunction_indicator.cpp
+++ b/firmware/controllers/actuators/malfunction_indicator.cpp
@@ -26,14 +26,14 @@
  */
 
 #include "global.h"
+
+#if EFI_MALFUNCTION_INDICATOR || defined(__DOXYGEN__)
 #include "io_pins.h"
 #include "malfunction_central.h"
 #include "malfunction_indicator.h"
 #include "efi_gpio.h"
 #include "periodic_controller.h"
 
-#if EFI_MALFUNCTION_INDICATOR || defined(__DOXYGEN__)
-
 #define TEST_MIL_CODE FALSE
 
 EXTERN_ENGINE;
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 0d583cf5e4..8b7f58b80f 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "global.h"
+#if !EFI_UNIT_TEST
 #if EFI_SENSOR_CHART || defined(__DOXYGEN__)
 #include "sensor_chart.h"
 #endif
@@ -811,3 +812,4 @@ int getRusEfiVersion(void) {
 #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
 	return 20190409;
 }
+#endif /* EFI_UNIT_TEST */
diff --git a/firmware/controllers/flash_main.cpp b/firmware/controllers/flash_main.cpp
index 0a7f2c829b..bf65f3eb84 100644
--- a/firmware/controllers/flash_main.cpp
+++ b/firmware/controllers/flash_main.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "global.h"
-
+#if EFI_INTERNAL_FLASH || defined(__DOXYGEN__)
 #include "flash_main.h"
 #include "eficonsole.h"
 #include "flash.h"
@@ -21,7 +21,6 @@
 #include "tunerstudio.h"
 #endif
 
-#if EFI_INTERNAL_FLASH || defined(__DOXYGEN__)
 
 #include "engine_controller.h"
 
diff --git a/firmware/controllers/injector_central.cpp b/firmware/controllers/injector_central.cpp
index b2e945bbae..81378f5475 100644
--- a/firmware/controllers/injector_central.cpp
+++ b/firmware/controllers/injector_central.cpp
@@ -24,6 +24,7 @@
 #include "global.h"
 
 #if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
+#if !EFI_UNIT_TEST
 
 #include "injector_central.h"
 #include "io_pins.h"
@@ -301,9 +302,9 @@ void initInjectorCentral(Logging *sharedLogger) {
 
 	addConsoleActionSSSSS("fuelbench2", fuelbench2);
 	addConsoleActionSSSSS("sparkbench2", sparkbench2);
-
 	instance.setPeriod(200 /*ms*/);
 	instance.Start();
 }
 
+#endif /* EFI_UNIT_TEST */
 #endif
diff --git a/firmware/controllers/persistent_store.cpp b/firmware/controllers/persistent_store.cpp
index 52d67a9e37..8d464ec5ec 100644
--- a/firmware/controllers/persistent_store.cpp
+++ b/firmware/controllers/persistent_store.cpp
@@ -21,8 +21,9 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sensor_chart.h"
 #include "global.h"
+#if !EFI_UNIT_TEST
+#include "sensor_chart.h"
 #include "engine_configuration.h"
 #include "trigger_central.h"
 #include "engine_controller.h"
@@ -40,3 +41,4 @@ const persistent_config_s *config = &persistentState.persistentConfiguration;
 const engine_configuration_s *engineConfiguration = &persistentState.persistentConfiguration.engineConfiguration;
 const board_configuration_s *boardConfiguration = &persistentState.persistentConfiguration.engineConfiguration.bc;
 
+#endif /* EFI_UNIT_TEST */
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index 2bc5478fa3..839d8fd979 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "global.h"
+#if !EFI_UNIT_TEST
 #include "settings.h"
 #include "eficonsole.h"
 #include "engine_configuration.h"
@@ -1409,3 +1410,4 @@ void initSettings(void) {
 #endif /* EFI_PROD_CODE */
 }
 
+#endif /* !EFI_UNIT_TEST */