The Big Refactoring of 2019: folder structure #723

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"

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;

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 */

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"
 

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

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 */

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 */