The Big Refactoring of 2019: folder structure #723

rusefi · Apr 5, 2019 · e0c9493 · e0c9493
1 parent 2f47681
commit e0c9493
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 24 deletions.
diff --git a/firmware/Makefile b/firmware/Makefile
@@ -144,11 +144,11 @@ include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
 include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
 include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk
 include $(PROJECT_DIR)/development/development.mk
-include $(PROJECT_DIR)/controllers/controllers.mk
 
 include $(PROJECT_DIR)/util/util.mk
 include $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/board.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

diff --git a/firmware/controllers/algo/aux_pid.cpp → firmware/controllers/actuators/aux_pid.cpp b/firmware/controllers/algo/aux_pid.cpp → firmware/controllers/actuators/aux_pid.cpp
diff --git a/firmware/controllers/algo/aux_pid.h → firmware/controllers/actuators/aux_pid.h b/firmware/controllers/algo/aux_pid.h → firmware/controllers/actuators/aux_pid.h
diff --git a/firmware/controllers/idle_thread.cpp → ...are/controllers/actuators/idle_thread.cpp b/firmware/controllers/idle_thread.cpp → ...are/controllers/actuators/idle_thread.cpp
diff --git a/firmware/controllers/idle_thread.h → firmware/controllers/actuators/idle_thread.h b/firmware/controllers/idle_thread.h → firmware/controllers/actuators/idle_thread.h
diff --git a/firmware/controllers/pwm_tester.cpp → ...ware/controllers/actuators/pwm_tester.cpp b/firmware/controllers/pwm_tester.cpp → ...ware/controllers/actuators/pwm_tester.cpp
diff --git a/firmware/controllers/pwm_tester.h → firmware/controllers/actuators/pwm_tester.h b/firmware/controllers/pwm_tester.h → firmware/controllers/actuators/pwm_tester.h
diff --git a/firmware/controllers/algo/algo.mk b/firmware/controllers/algo/algo.mk
@@ -13,5 +13,4 @@ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \
 	$(PROJECT_DIR)/controllers/algo/lcd_menu_tree.cpp \
 	$(PROJECT_DIR)/controllers/algo/event_registry.cpp \
 	$(PROJECT_DIR)/controllers/algo/algo.cpp \
-	$(PROJECT_DIR)/controllers/algo/aux_pid.cpp \
 	$(PROJECT_DIR)/controllers/algo/signal_executor.cpp
diff --git a/firmware/controllers/algo/signal_executor.cpp b/firmware/controllers/algo/signal_executor.cpp
@@ -46,10 +46,3 @@ InjectionSignalPair::InjectionSignalPair() {
 	memset(outputs, 0, sizeof(outputs));
 	event = NULL;
 }
-
-void initSignalExecutor(void) {
-}
-
-#if FUEL_MATH_EXTREME_LOGGING
-extern LoggingWithStorage sharedLogger;
-#endif /* FUEL_MATH_EXTREME_LOGGING */
diff --git a/firmware/controllers/algo/signal_executor.h b/firmware/controllers/algo/signal_executor.h
@@ -41,8 +41,4 @@ class InjectionSignalPair {
 	InjectionEvent *event;
 };
 
-void initSignalExecutor(void);
-
-void initSignalExecutorImpl(void);
-
 #endif /* SIGNAL_EXECUTOR_H_ */
diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk
@@ -7,19 +7,23 @@ CONTROLLERS_SRC_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)/system/signal_executor_sleep.cpp \
+	$(CONTROLLERS_DIR)/scheduling/single_timer_executor.cpp \
 	$(PROJECT_DIR)/controllers/settings.cpp \
 	$(PROJECT_DIR)/controllers/error_handling.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/pwm_tester.cpp \
 	$(PROJECT_DIR)/controllers/obd2.cpp \
 	$(PROJECT_DIR)/controllers/lcd_controller.cpp \
  	$(PROJECT_DIR)/controllers/engine_controller.cpp \
 	$(PROJECT_DIR)/controllers/persistent_store.cpp
 
 CONTROLLERS_INC=\
 	$(CONTROLLERS_DIR) \
+	$(CONTROLLERS_DIR)/scheduling \
 	$(CONTROLLERS_DIR)/actuators \
 
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
@@ -603,10 +603,6 @@ void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S
 	initMockVoltage();
 #endif /* EFI_ENABLE_MOCK_ADC */
 
-#if EFI_PROD_CODE || EFI_SIMULATOR || defined(__DOXYGEN__)
-	initSignalExecutor();
-#endif
-
 #if EFI_SENSOR_CHART || defined(__DOXYGEN__)
 	initSensorChart();
 #endif /* EFI_SENSOR_CHART */

diff --git a/firmware/controllers/system/scheduler.h → firmware/controllers/scheduling/scheduler.h b/firmware/controllers/system/scheduler.h → firmware/controllers/scheduling/scheduler.h
diff --git a/...trollers/system/single_timer_executor.cpp → ...lers/scheduling/single_timer_executor.cpp b/...trollers/system/single_timer_executor.cpp → ...lers/scheduling/single_timer_executor.cpp
diff --git a/...ontrollers/system/single_timer_executor.h → ...ollers/scheduling/single_timer_executor.h b/...ontrollers/system/single_timer_executor.h → ...ollers/scheduling/single_timer_executor.h
diff --git a/firmware/controllers/system/system.mk b/firmware/controllers/system/system.mk
@@ -2,8 +2,7 @@
 SYSTEMSRC =
 
 SYSTEMSRC_CPP =	$(PROJECT_DIR)/controllers/system/pwm_generator_logic.cpp \
-	$(PROJECT_DIR)/controllers/system/signal_executor_sleep.cpp \
 	$(PROJECT_DIR)/controllers/system/event_queue.cpp \
 	$(PROJECT_DIR)/controllers/system/efi_gpio.cpp \
-	$(PROJECT_DIR)/controllers/system/dc_motor.cpp \
-	$(PROJECT_DIR)/controllers/system/single_timer_executor.cpp
+	$(PROJECT_DIR)/controllers/system/dc_motor.cpp
+
diff --git a/firmware/controllers/system/thread_controller.h b/firmware/controllers/system/thread_controller.h
@@ -7,9 +7,10 @@
 
 #pragma once
 
+#include "global.h"
 #include "controller_base.h"
 
-#include "ch.h"
+#if ! EFI_UNIT_TEST
 
 /**
  * @brief A base class for a controller that requires its own thread.
@@ -60,3 +61,5 @@ class ThreadController : public ControllerBase
         m_thread->name = GetName();
     }
 };
+
+#endif
diff --git a/unit_tests/Makefile b/unit_tests/Makefile
@@ -72,6 +72,7 @@ PROJECT = rusefi_test
 # Imported source files and paths
 include $(PROJECT_DIR)/util/util.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
@@ -145,7 +146,7 @@ ASMSRC = $(PORTASM)
 INCDIR = . \
 	$(UTIL_INC) \
 	$(PROJECT_DIR)/config/engines \
-	$(PROJECT_DIR)/controllers \
+	$(CONTROLLERS_INC) \
 	$(PROJECT_DIR)/controllers/sensors \
 	$(PROJECT_DIR)/controllers/algo \
 	$(PROJECT_DIR)/controllers/core \