The Big Refactoring of 2019: folder structure #723

firmware/Makefile

@@ -295,7 +295,7 @@ INCDIR = $(CHIBIOS)/os/license \
 	development \
 	development/hw_layer \
 	development/test \
-	controllers \
+	$(CONTROLLERS_INC) \
 	controllers/sensors \
 	controllers/system \
 	controllers/algo \

firmware/controllers/controllers.mk

@@ -1,8 +1,13 @@
+CONTROLLERS_DIR=$(PROJECT_DIR)/controllers
 
 CONTROLLERSSRC =
 	
-CONTROLLERS_SRC_CPP = $(PROJECT_DIR)/controllers/settings.cpp \
-	$(PROJECT_DIR)/controllers/electronic_throttle.cpp \
+CONTROLLERS_SRC_CPP = \
+	$(CONTROLLERS_DIR)/actuators/electronic_throttle.cpp \
+	$(CONTROLLERS_DIR)/actuators/alternator_controller.cpp \
+	$(CONTROLLERS_DIR)/actuators/malfunction_indicator.cpp \
+	$(CONTROLLERS_DIR)/actuators/tachometer.cpp \
+	$(PROJECT_DIR)/controllers/settings.cpp \
 	$(PROJECT_DIR)/controllers/error_handling.cpp \
 	$(PROJECT_DIR)/controllers/map_averaging.cpp \
 	$(PROJECT_DIR)/controllers/flash_main.cpp \
@@ -10,9 +15,11 @@ CONTROLLERS_SRC_CPP = $(PROJECT_DIR)/controllers/settings.cpp \
 	$(PROJECT_DIR)/controllers/idle_thread.cpp \
 	$(PROJECT_DIR)/controllers/pwm_tester.cpp \
 	$(PROJECT_DIR)/controllers/obd2.cpp \
-	$(PROJECT_DIR)/controllers/malfunction_indicator.cpp \
-	$(PROJECT_DIR)/controllers/alternator_controller.cpp \
 	$(PROJECT_DIR)/controllers/lcd_controller.cpp \
-	$(PROJECT_DIR)/controllers/tachometer.cpp \
  	$(PROJECT_DIR)/controllers/engine_controller.cpp \
 	$(PROJECT_DIR)/controllers/persistent_store.cpp
+
+CONTROLLERS_INC=\
+	$(CONTROLLERS_DIR) \
+	$(CONTROLLERS_DIR)/actuators \
+

simulator/Makefile

@@ -182,6 +182,7 @@ INCDIR = . \
           $(PROJECT_DIR)/hw_layer \
           $(PROJECT_DIR)/hw_layer/algo \
           $(HW_SENSORS_INC) \
+          $(CONTROLLERS_INC) \
           $(PROJECT_DIR)/development \
           $(PROJECT_DIR)/controllers/algo \
           $(PROJECT_DIR)/controllers/core \