diff --git a/firmware/Makefile b/firmware/Makefile index 80c4655af8..d4b4afdcba 100644 --- a/firmware/Makefile +++ b/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/sensors \ - controllers/sensors/converters + $(CONTROLLERS_INC) # # Project, sources and paths diff --git a/firmware/controllers/algo/algo.mk b/firmware/controllers/algo/algo.mk index 5646200dda..e150fdcf32 100644 --- a/firmware/controllers/algo/algo.mk +++ b/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 \ diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk index 8a3c4688b4..61f34b284a 100644 --- a/firmware/controllers/controllers.mk +++ b/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 \ diff --git a/firmware/controllers/actuators/lcd_controller.cpp b/firmware/controllers/gauges/lcd_controller.cpp similarity index 100% rename from firmware/controllers/actuators/lcd_controller.cpp rename to firmware/controllers/gauges/lcd_controller.cpp diff --git a/firmware/controllers/actuators/lcd_controller.h b/firmware/controllers/gauges/lcd_controller.h similarity index 100% rename from firmware/controllers/actuators/lcd_controller.h rename to firmware/controllers/gauges/lcd_controller.h diff --git a/firmware/controllers/algo/lcd_menu_tree.cpp b/firmware/controllers/gauges/lcd_menu_tree.cpp similarity index 100% rename from firmware/controllers/algo/lcd_menu_tree.cpp rename to firmware/controllers/gauges/lcd_menu_tree.cpp diff --git a/firmware/controllers/algo/lcd_menu_tree.h b/firmware/controllers/gauges/lcd_menu_tree.h similarity index 100% rename from firmware/controllers/algo/lcd_menu_tree.h rename to firmware/controllers/gauges/lcd_menu_tree.h diff --git a/firmware/controllers/algo/malfunction_central.cpp b/firmware/controllers/gauges/malfunction_central.cpp similarity index 100% rename from firmware/controllers/algo/malfunction_central.cpp rename to firmware/controllers/gauges/malfunction_central.cpp diff --git a/firmware/controllers/algo/malfunction_central.h b/firmware/controllers/gauges/malfunction_central.h similarity index 100% rename from firmware/controllers/algo/malfunction_central.h rename to firmware/controllers/gauges/malfunction_central.h diff --git a/firmware/controllers/actuators/malfunction_indicator.cpp b/firmware/controllers/gauges/malfunction_indicator.cpp similarity index 100% rename from firmware/controllers/actuators/malfunction_indicator.cpp rename to firmware/controllers/gauges/malfunction_indicator.cpp diff --git a/firmware/controllers/actuators/malfunction_indicator.h b/firmware/controllers/gauges/malfunction_indicator.h similarity index 100% rename from firmware/controllers/actuators/malfunction_indicator.h rename to firmware/controllers/gauges/malfunction_indicator.h diff --git a/firmware/controllers/gauges/readme.md b/firmware/controllers/gauges/readme.md new file mode 100644 index 0000000000..e4952d8b09 --- /dev/null +++ b/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. \ No newline at end of file diff --git a/firmware/controllers/actuators/tachometer.cpp b/firmware/controllers/gauges/tachometer.cpp similarity index 100% rename from firmware/controllers/actuators/tachometer.cpp rename to firmware/controllers/gauges/tachometer.cpp diff --git a/firmware/controllers/actuators/tachometer.h b/firmware/controllers/gauges/tachometer.h similarity index 100% rename from firmware/controllers/actuators/tachometer.h rename to firmware/controllers/gauges/tachometer.h diff --git a/firmware/controllers/scheduling/readme.md b/firmware/controllers/scheduling/readme.md new file mode 100644 index 0000000000..6a21cb6bbc --- /dev/null +++ b/firmware/controllers/scheduling/readme.md @@ -0,0 +1 @@ +In this folder we have files related to hubrid hardware/software timer, including PWM generation. \ No newline at end of file diff --git a/simulator/Makefile b/simulator/Makefile index fa3f5c360a..ca5022fd3c 100644 --- a/simulator/Makefile +++ b/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 \ - $(PROJECT_DIR)/controllers/sensors/converters \ + $(CONTROLLERS_INC) \ ${CHIBIOS}/os/various \ $(CHIBIOS)/os/hal/lib/streams \ simulator diff --git a/unit_tests/Makefile b/unit_tests/Makefile index 903e1c89a1..54857e6cf7 100644 --- a/unit_tests/Makefile +++ b/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 \