#616 idle into simulator

firmware/controllers/flash_main.cpp

@@ -12,7 +12,6 @@
 #include "flash_main.h"
 #include "eficonsole.h"
 #include "flash.h"
-#include "rusefi.h"
 #include "engine_math.h"
 
 // this message is part of console API, see FLASH_SUCCESS_MSG in java code

firmware/controllers/idle_thread.cpp

@@ -505,4 +505,4 @@ void startIdleThread(Logging*sharedLogger) {
 	apply();
 }
 
-#endif
+#endif /* EFI_IDLE_CONTROL */

firmware/controllers/lcd_controller.cpp

@@ -17,6 +17,9 @@
  */
 
 #include "global.h"
+
+#if EFI_HD44780_LCD || defined(__DOXYGEN__)
+
 #include "lcd_controller.h"
 #include "lcd_HD44780.h"
 #include "rpm_calculator.h"
@@ -37,7 +40,6 @@
 #include "idle_thread.h"
 #include "fuel_math.h"
 
-#if EFI_HD44780_LCD || defined(__DOXYGEN__)
 
 EXTERN_ENGINE
 ;

firmware/controllers/obd2.cpp

@@ -22,6 +22,10 @@
  */
 
 #include "global.h"
+
+#if EFI_CAN_SUPPORT || defined(__DOXYGEN__)
+
+
 #include "engine.h"
 #include "obd2.h"
 #include "can_hw.h"
@@ -207,3 +211,4 @@ void obdOnCanPacketRx(CANRxFrame *rx) {
 	}
 }
 
+#endif /* EFI_CAN_SUPPORT */

firmware/hw_layer/pin_repository.cpp

@@ -14,7 +14,6 @@
 #include "eficonsole.h"
 #include "memstreams.h"
 #include "chprintf.h"
-#include "rusefi.h"
 
 #define PIN_REPO_SIZE 7 * PORT_SIZE
 // todo: move this into PinRepository class

simulator/Makefile

@@ -130,10 +130,20 @@ CSRC =  ${PORTSRC} \
 CPPSRC = $(UTILSRC_CPP) \
 	$(CONTROLLERS_ALGO_SRC_CPP) \
 	$(PROJECT_DIR)/controllers/settings.cpp \
-	$(PROJECT_DIR)/controllers/engine_controller.cpp \
+	$(PROJECT_DIR)/controllers/electronic_throttle.cpp \
 	$(PROJECT_DIR)/controllers/error_handling.cpp \
-	$(PROJECT_DIR)/controllers/persistent_store.cpp \
 	$(PROJECT_DIR)/controllers/map_averaging.cpp \
+	$(PROJECT_DIR)/controllers/flash_main.cpp \
+	$(PROJECT_DIR)/controllers/injector_central.cpp \
+	$(PROJECT_DIR)/controllers/idle_thread.cpp \
+	$(PROJECT_DIR)/controllers/PwmTester.cpp \
+	$(PROJECT_DIR)/controllers/obd2.cpp \
+	$(PROJECT_DIR)/controllers/malfunction_indicator.cpp \
+	$(PROJECT_DIR)/controllers/alternatorController.cpp \
+	$(PROJECT_DIR)/controllers/lcd_controller.cpp \
+	$(PROJECT_DIR)/controllers/tachometer.cpp \
+	$(PROJECT_DIR)/controllers/engine_controller.cpp \
+	$(PROJECT_DIR)/controllers/persistent_store.cpp \
 	$(PROJECT_DIR)/development/sensor_chart.cpp \
 	$(PROJECT_DIR)/development/trigger_emulator.cpp \
 	$(TRIGGER_SRC_CPP) \