From 62481d7fe8f2e2b5fe709f36a300738dac3953ad Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 8 Dec 2019 13:21:35 -0500 Subject: [PATCH] The Big Refactoring of 2019: folder structure #723 --- firmware/controllers/controllers.mk | 4 ++ .../{trigger => engine_cycle}/aux_valves.cpp | 0 .../{trigger => engine_cycle}/aux_valves.h | 0 .../main_trigger_callback.cpp | 0 .../main_trigger_callback.h | 0 .../rpm_calculator.cpp | 0 .../rpm_calculator.h | 0 .../{trigger => engine_cycle}/spark_logic.cpp | 0 .../{trigger => engine_cycle}/spark_logic.h | 0 firmware/controllers/trigger/trigger.mk | 40 +++++++++---------- 10 files changed, 22 insertions(+), 22 deletions(-) rename firmware/controllers/{trigger => engine_cycle}/aux_valves.cpp (100%) rename firmware/controllers/{trigger => engine_cycle}/aux_valves.h (100%) rename firmware/controllers/{trigger => engine_cycle}/main_trigger_callback.cpp (100%) rename firmware/controllers/{trigger => engine_cycle}/main_trigger_callback.h (100%) rename firmware/controllers/{trigger => engine_cycle}/rpm_calculator.cpp (100%) rename firmware/controllers/{trigger => engine_cycle}/rpm_calculator.h (100%) rename firmware/controllers/{trigger => engine_cycle}/spark_logic.cpp (100%) rename firmware/controllers/{trigger => engine_cycle}/spark_logic.h (100%) diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk index 2a06fc155a..56783f376a 100644 --- a/firmware/controllers/controllers.mk +++ b/firmware/controllers/controllers.mk @@ -26,6 +26,10 @@ CONTROLLERS_SRC_CPP = \ $(CONTROLLERS_DIR)/settings.cpp \ $(CONTROLLERS_DIR)/core/error_handling.cpp \ $(CONTROLLERS_DIR)/engine_cycle/map_averaging.cpp \ + $(CONTROLLERS_DIR)/engine_cycle/rpm_calculator.cpp \ + $(CONTROLLERS_DIR)/engine_cycle/spark_logic.cpp \ + $(CONTROLLERS_DIR)/engine_cycle/main_trigger_callback.cpp \ + $(CONTROLLERS_DIR)/engine_cycle/aux_valves.cpp \ $(CONTROLLERS_DIR)/flash_main.cpp \ $(CONTROLLERS_DIR)/injector_central.cpp \ $(CONTROLLERS_DIR)/obd2.cpp \ diff --git a/firmware/controllers/trigger/aux_valves.cpp b/firmware/controllers/engine_cycle/aux_valves.cpp similarity index 100% rename from firmware/controllers/trigger/aux_valves.cpp rename to firmware/controllers/engine_cycle/aux_valves.cpp diff --git a/firmware/controllers/trigger/aux_valves.h b/firmware/controllers/engine_cycle/aux_valves.h similarity index 100% rename from firmware/controllers/trigger/aux_valves.h rename to firmware/controllers/engine_cycle/aux_valves.h diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp similarity index 100% rename from firmware/controllers/trigger/main_trigger_callback.cpp rename to firmware/controllers/engine_cycle/main_trigger_callback.cpp diff --git a/firmware/controllers/trigger/main_trigger_callback.h b/firmware/controllers/engine_cycle/main_trigger_callback.h similarity index 100% rename from firmware/controllers/trigger/main_trigger_callback.h rename to firmware/controllers/engine_cycle/main_trigger_callback.h diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/engine_cycle/rpm_calculator.cpp similarity index 100% rename from firmware/controllers/trigger/rpm_calculator.cpp rename to firmware/controllers/engine_cycle/rpm_calculator.cpp diff --git a/firmware/controllers/trigger/rpm_calculator.h b/firmware/controllers/engine_cycle/rpm_calculator.h similarity index 100% rename from firmware/controllers/trigger/rpm_calculator.h rename to firmware/controllers/engine_cycle/rpm_calculator.h diff --git a/firmware/controllers/trigger/spark_logic.cpp b/firmware/controllers/engine_cycle/spark_logic.cpp similarity index 100% rename from firmware/controllers/trigger/spark_logic.cpp rename to firmware/controllers/engine_cycle/spark_logic.cpp diff --git a/firmware/controllers/trigger/spark_logic.h b/firmware/controllers/engine_cycle/spark_logic.h similarity index 100% rename from firmware/controllers/trigger/spark_logic.h rename to firmware/controllers/engine_cycle/spark_logic.h diff --git a/firmware/controllers/trigger/trigger.mk b/firmware/controllers/trigger/trigger.mk index f3bf94da84..9aaa261b2d 100644 --- a/firmware/controllers/trigger/trigger.mk +++ b/firmware/controllers/trigger/trigger.mk @@ -1,26 +1,22 @@ TRIGGER_DECODERS_SRC_CPP = \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_bmw.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_mazda.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_chrysler.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_structure.cpp \ - $(PROJECT_DIR)/controllers/trigger/trigger_decoder.cpp \ - $(PROJECT_DIR)/controllers/trigger/trigger_simulator.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_mitsubishi.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_nissan.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_subaru.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_toyota.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_gm.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_honda.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_rover.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_vw.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_misc.cpp \ - $(PROJECT_DIR)/controllers/trigger/decoders/trigger_universal.cpp + $(CONTROLLERS_DIR)/trigger/decoders/trigger_bmw.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_mazda.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_chrysler.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_structure.cpp \ + $(CONTROLLERS_DIR)/trigger/trigger_decoder.cpp \ + $(CONTROLLERS_DIR)/trigger/trigger_simulator.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_mitsubishi.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_nissan.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_subaru.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_toyota.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_gm.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_honda.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_rover.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_vw.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_misc.cpp \ + $(CONTROLLERS_DIR)/trigger/decoders/trigger_universal.cpp TRIGGER_SRC_CPP = \ - $(PROJECT_DIR)/controllers/trigger/trigger_emulator_algo.cpp \ - $(PROJECT_DIR)/controllers/trigger/rpm_calculator.cpp \ - $(PROJECT_DIR)/controllers/trigger/trigger_central.cpp \ - $(PROJECT_DIR)/controllers/trigger/spark_logic.cpp \ - $(PROJECT_DIR)/controllers/trigger/main_trigger_callback.cpp \ - $(PROJECT_DIR)/controllers/trigger/aux_valves.cpp + $(CONTROLLERS_DIR)/trigger/trigger_emulator_algo.cpp \ + $(CONTROLLERS_DIR)/trigger/trigger_central.cpp