mirror of https://github.com/rusefi/rusefi-1.git
The Big Refactoring of 2019: folder structure #723
This commit is contained in:
parent
2f47681356
commit
e0c9493dd9
|
@ -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/sensors/sensors.mk
|
||||||
include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk
|
include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk
|
||||||
include $(PROJECT_DIR)/development/development.mk
|
include $(PROJECT_DIR)/development/development.mk
|
||||||
include $(PROJECT_DIR)/controllers/controllers.mk
|
|
||||||
|
|
||||||
include $(PROJECT_DIR)/util/util.mk
|
include $(PROJECT_DIR)/util/util.mk
|
||||||
include $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/board.mk
|
include $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/board.mk
|
||||||
include $(PROJECT_DIR)/config/engines/engines.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/algo/algo.mk
|
||||||
include $(PROJECT_DIR)/controllers/core/core.mk
|
include $(PROJECT_DIR)/controllers/core/core.mk
|
||||||
include $(PROJECT_DIR)/controllers/math/math.mk
|
include $(PROJECT_DIR)/controllers/math/math.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/lcd_menu_tree.cpp \
|
||||||
$(PROJECT_DIR)/controllers/algo/event_registry.cpp \
|
$(PROJECT_DIR)/controllers/algo/event_registry.cpp \
|
||||||
$(PROJECT_DIR)/controllers/algo/algo.cpp \
|
$(PROJECT_DIR)/controllers/algo/algo.cpp \
|
||||||
$(PROJECT_DIR)/controllers/algo/aux_pid.cpp \
|
|
||||||
$(PROJECT_DIR)/controllers/algo/signal_executor.cpp
|
$(PROJECT_DIR)/controllers/algo/signal_executor.cpp
|
||||||
|
|
|
@ -46,10 +46,3 @@ InjectionSignalPair::InjectionSignalPair() {
|
||||||
memset(outputs, 0, sizeof(outputs));
|
memset(outputs, 0, sizeof(outputs));
|
||||||
event = NULL;
|
event = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void initSignalExecutor(void) {
|
|
||||||
}
|
|
||||||
|
|
||||||
#if FUEL_MATH_EXTREME_LOGGING
|
|
||||||
extern LoggingWithStorage sharedLogger;
|
|
||||||
#endif /* FUEL_MATH_EXTREME_LOGGING */
|
|
||||||
|
|
|
@ -41,8 +41,4 @@ public:
|
||||||
InjectionEvent *event;
|
InjectionEvent *event;
|
||||||
};
|
};
|
||||||
|
|
||||||
void initSignalExecutor(void);
|
|
||||||
|
|
||||||
void initSignalExecutorImpl(void);
|
|
||||||
|
|
||||||
#endif /* SIGNAL_EXECUTOR_H_ */
|
#endif /* SIGNAL_EXECUTOR_H_ */
|
||||||
|
|
|
@ -7,13 +7,16 @@ CONTROLLERS_SRC_CPP = \
|
||||||
$(CONTROLLERS_DIR)/actuators/alternator_controller.cpp \
|
$(CONTROLLERS_DIR)/actuators/alternator_controller.cpp \
|
||||||
$(CONTROLLERS_DIR)/actuators/malfunction_indicator.cpp \
|
$(CONTROLLERS_DIR)/actuators/malfunction_indicator.cpp \
|
||||||
$(CONTROLLERS_DIR)/actuators/tachometer.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/settings.cpp \
|
||||||
$(PROJECT_DIR)/controllers/error_handling.cpp \
|
$(PROJECT_DIR)/controllers/error_handling.cpp \
|
||||||
$(PROJECT_DIR)/controllers/map_averaging.cpp \
|
$(PROJECT_DIR)/controllers/map_averaging.cpp \
|
||||||
$(PROJECT_DIR)/controllers/flash_main.cpp \
|
$(PROJECT_DIR)/controllers/flash_main.cpp \
|
||||||
$(PROJECT_DIR)/controllers/injector_central.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/obd2.cpp \
|
||||||
$(PROJECT_DIR)/controllers/lcd_controller.cpp \
|
$(PROJECT_DIR)/controllers/lcd_controller.cpp \
|
||||||
$(PROJECT_DIR)/controllers/engine_controller.cpp \
|
$(PROJECT_DIR)/controllers/engine_controller.cpp \
|
||||||
|
@ -21,5 +24,6 @@ CONTROLLERS_SRC_CPP = \
|
||||||
|
|
||||||
CONTROLLERS_INC=\
|
CONTROLLERS_INC=\
|
||||||
$(CONTROLLERS_DIR) \
|
$(CONTROLLERS_DIR) \
|
||||||
|
$(CONTROLLERS_DIR)/scheduling \
|
||||||
$(CONTROLLERS_DIR)/actuators \
|
$(CONTROLLERS_DIR)/actuators \
|
||||||
|
|
||||||
|
|
|
@ -603,10 +603,6 @@ void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S
|
||||||
initMockVoltage();
|
initMockVoltage();
|
||||||
#endif /* EFI_ENABLE_MOCK_ADC */
|
#endif /* EFI_ENABLE_MOCK_ADC */
|
||||||
|
|
||||||
#if EFI_PROD_CODE || EFI_SIMULATOR || defined(__DOXYGEN__)
|
|
||||||
initSignalExecutor();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if EFI_SENSOR_CHART || defined(__DOXYGEN__)
|
#if EFI_SENSOR_CHART || defined(__DOXYGEN__)
|
||||||
initSensorChart();
|
initSensorChart();
|
||||||
#endif /* EFI_SENSOR_CHART */
|
#endif /* EFI_SENSOR_CHART */
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
SYSTEMSRC =
|
SYSTEMSRC =
|
||||||
|
|
||||||
SYSTEMSRC_CPP = $(PROJECT_DIR)/controllers/system/pwm_generator_logic.cpp \
|
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/event_queue.cpp \
|
||||||
$(PROJECT_DIR)/controllers/system/efi_gpio.cpp \
|
$(PROJECT_DIR)/controllers/system/efi_gpio.cpp \
|
||||||
$(PROJECT_DIR)/controllers/system/dc_motor.cpp \
|
$(PROJECT_DIR)/controllers/system/dc_motor.cpp
|
||||||
$(PROJECT_DIR)/controllers/system/single_timer_executor.cpp
|
|
|
@ -7,9 +7,10 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "global.h"
|
||||||
#include "controller_base.h"
|
#include "controller_base.h"
|
||||||
|
|
||||||
#include "ch.h"
|
#if ! EFI_UNIT_TEST
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief A base class for a controller that requires its own thread.
|
* @brief A base class for a controller that requires its own thread.
|
||||||
|
@ -60,3 +61,5 @@ public:
|
||||||
m_thread->name = GetName();
|
m_thread->name = GetName();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -72,6 +72,7 @@ PROJECT = rusefi_test
|
||||||
# Imported source files and paths
|
# Imported source files and paths
|
||||||
include $(PROJECT_DIR)/util/util.mk
|
include $(PROJECT_DIR)/util/util.mk
|
||||||
include $(PROJECT_DIR)/config/engines/engines.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/algo/algo.mk
|
||||||
include $(PROJECT_DIR)/controllers/core/core.mk
|
include $(PROJECT_DIR)/controllers/core/core.mk
|
||||||
include $(PROJECT_DIR)/controllers/math/math.mk
|
include $(PROJECT_DIR)/controllers/math/math.mk
|
||||||
|
@ -145,7 +146,7 @@ ASMSRC = $(PORTASM)
|
||||||
INCDIR = . \
|
INCDIR = . \
|
||||||
$(UTIL_INC) \
|
$(UTIL_INC) \
|
||||||
$(PROJECT_DIR)/config/engines \
|
$(PROJECT_DIR)/config/engines \
|
||||||
$(PROJECT_DIR)/controllers \
|
$(CONTROLLERS_INC) \
|
||||||
$(PROJECT_DIR)/controllers/sensors \
|
$(PROJECT_DIR)/controllers/sensors \
|
||||||
$(PROJECT_DIR)/controllers/algo \
|
$(PROJECT_DIR)/controllers/algo \
|
||||||
$(PROJECT_DIR)/controllers/core \
|
$(PROJECT_DIR)/controllers/core \
|
||||||
|
|
Loading…
Reference in New Issue