The Big Refactoring of 2019: folder structure #723

firmware/Makefile

@@ -155,13 +155,7 @@ endif
 include $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/board.mk
 include $(PROJECT_DIR)/config/engines/engines.mk
 include $(PROJECT_DIR)/console/console.mk
-include $(PROJECT_DIR)/controllers/algo/algo.mk
 include $(PROJECT_DIR)/controllers/controllers.mk
-include $(PROJECT_DIR)/controllers/core/core.mk
-include $(PROJECT_DIR)/controllers/math/math.mk
-include $(PROJECT_DIR)/controllers/sensors/sensors.mk
-include $(PROJECT_DIR)/controllers/system/system.mk
-include $(PROJECT_DIR)/controllers/trigger/trigger.mk
 include $(PROJECT_DIR)/development/development.mk
 include $(PROJECT_DIR)/hw_layer/hw_layer.mk
 include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
@@ -308,9 +302,7 @@ INCDIR = $(CHIBIOS)/os/license \
 	$(DEVELOPMENT_DIR) \
 	development/hw_layer \
 	development/test \
-	$(CONTROLLERS_INC) \
+	$(CONTROLLERS_INC)
-	controllers/sensors \
-	controllers/sensors/converters
 
 #
 # Project, sources and paths

firmware/controllers/algo/algo.mk

@@ -8,6 +8,6 @@ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \
 	$(PROJECT_DIR)/controllers/algo/engine_configuration.cpp \
 	$(PROJECT_DIR)/controllers/algo/engine.cpp \
 	$(PROJECT_DIR)/controllers/algo/engine2.cpp \
-	$(PROJECT_DIR)/controllers/algo/lcd_menu_tree.cpp \
+	$(PROJECT_DIR)/controllers/gauges/lcd_menu_tree.cpp \
 	$(PROJECT_DIR)/controllers/algo/event_registry.cpp \
 	$(PROJECT_DIR)/controllers/algo/algo.cpp \

firmware/controllers/controllers.mk

@@ -1,3 +1,11 @@
+include $(PROJECT_DIR)/controllers/algo/algo.mk
+include $(PROJECT_DIR)/controllers/core/core.mk
+include $(PROJECT_DIR)/controllers/math/math.mk
+include $(PROJECT_DIR)/controllers/trigger/trigger.mk
+include $(PROJECT_DIR)/controllers/sensors/sensors.mk
+include $(PROJECT_DIR)/controllers/system/system.mk
+#include $(PROJECT_DIR)/controllers/gauges/gauges.mk
+
 CONTROLLERS_DIR=$(PROJECT_DIR)/controllers
 
 CONTROLLERSSRC =
@@ -5,12 +13,12 @@ CONTROLLERSSRC =
 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 \
 	$(CONTROLLERS_DIR)/actuators/idle_thread.cpp \
 	$(CONTROLLERS_DIR)/actuators/pwm_tester.cpp \
 	$(CONTROLLERS_DIR)/actuators/algo/aux_pid.cpp \
-	$(CONTROLLERS_DIR)/actuators/lcd_controller.cpp \
+	$(CONTROLLERS_DIR)/gauges/tachometer.cpp \
+	$(CONTROLLERS_DIR)/gauges/malfunction_indicator.cpp \
+	$(CONTROLLERS_DIR)/gauges/lcd_controller.cpp \
 	$(CONTROLLERS_DIR)/scheduling/signal_executor_sleep.cpp \
 	$(CONTROLLERS_DIR)/scheduling/single_timer_executor.cpp \
 	$(CONTROLLERS_DIR)/scheduling/pwm_generator_logic.cpp \
@@ -32,7 +40,10 @@ CONTROLLERS_INC=\
 	$(CONTROLLERS_DIR)/algo \
 	$(CONTROLLERS_DIR)/trigger/decoders \
 	$(CONTROLLERS_DIR)/trigger \
+    $(CONTROLLERS_DIR)/sensors \
+	$(CONTROLLERS_DIR)/sensors/converters \
 	$(CONTROLLERS_DIR)/core \
+	$(CONTROLLERS_DIR)/gauges \
 	$(CONTROLLERS_DIR)/math \
 	$(CONTROLLERS_DIR)/generated \
 	$(CONTROLLERS_DIR)/actuators \

firmware/controllers/gauges/readme.md

@@ -0,0 +1 @@
+This folder has code related to communication with the human behind the steering wheel: tachometer, check engine light, LCD etc etc.

firmware/controllers/scheduling/readme.md

@@ -0,0 +1 @@
+In this folder we have files related to hubrid hardware/software timer, including PWM generation. 

simulator/Makefile

@@ -125,12 +125,6 @@ include $(PROJECT_DIR)/console/binary/tunerstudio.mk
 include $(PROJECT_DIR)/console/console.mk
 include $(PROJECT_DIR)/config/engines/engines.mk
 include $(PROJECT_DIR)/controllers/controllers.mk
-include $(PROJECT_DIR)/controllers/algo/algo.mk
-include $(PROJECT_DIR)/controllers/core/core.mk
-include $(PROJECT_DIR)/controllers/math/math.mk
-include $(PROJECT_DIR)/controllers/sensors/sensors.mk
-include $(PROJECT_DIR)/controllers/trigger/trigger.mk
-include $(PROJECT_DIR)/controllers/system/system.mk
 include $(PROJECT_DIR)/development/development.mk
 include $(PROJECT_DIR)/hw_layer/hw_layer.mk
 include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
@@ -205,10 +199,8 @@ INCDIR = . \
           $(PROJECT_DIR)/hw_layer \
           $(PROJECT_DIR)/hw_layer/algo \
           $(HW_SENSORS_INC) \
-    $(CONTROLLERS_INC) \
  	$(DEVELOPMENT_DIR) \
-    $(PROJECT_DIR)/controllers/sensors \
+    $(CONTROLLERS_INC) \
-    $(PROJECT_DIR)/controllers/sensors/converters \
           ${CHIBIOS}/os/various \
           $(CHIBIOS)/os/hal/lib/streams \
           simulator

unit_tests/Makefile

@@ -97,12 +97,6 @@ PROJECT = rusefi_test
 # Imported source files and paths
 include $(PROJECT_DIR)/config/engines/engines.mk
 include $(PROJECT_DIR)/controllers/controllers.mk
-include $(PROJECT_DIR)/controllers/algo/algo.mk
-include $(PROJECT_DIR)/controllers/core/core.mk
-include $(PROJECT_DIR)/controllers/math/math.mk
-include $(PROJECT_DIR)/controllers/system/system.mk
-include $(PROJECT_DIR)/controllers/sensors/sensors.mk
-include $(PROJECT_DIR)/controllers/trigger/trigger.mk
 include $(PROJECT_DIR)/development/development.mk
 include $(PROJECT_DIR)/hw_layer/hw_layer.mk
 include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
@@ -176,8 +170,6 @@ INCDIR = . \
 	$(PROJECT_DIR)/config/engines \
 	$(CONTROLLERS_INC) \
 	$(PROJECT_DIR)/console \
-	$(PROJECT_DIR)/controllers/sensors \
-	$(PROJECT_DIR)/controllers/sensors/converters \
  	$(DEVELOPMENT_DIR) \
 	$(PROJECT_DIR)/ext_algo \
 	$(PROJECT_DIR)/hw_layer \