From 6fc52a14305f8bf819565ae93faace43ae3749ac Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 29 Aug 2024 13:26:57 -0700 Subject: [PATCH] move map averaging to module --- firmware/controllers/controllers.mk | 1 - .../map_averaging}/map_averaging.cpp | 0 .../{engine_cycle => modules/map_averaging}/map_averaging.h | 0 firmware/controllers/modules/map_averaging/map_averaging.mk | 6 ++++++ firmware/controllers/modules/modules.mk | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) rename firmware/controllers/{engine_cycle => modules/map_averaging}/map_averaging.cpp (100%) rename firmware/controllers/{engine_cycle => modules/map_averaging}/map_averaging.h (100%) create mode 100644 firmware/controllers/modules/map_averaging/map_averaging.mk diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk index 37116cdac5..9c85be5b65 100644 --- a/firmware/controllers/controllers.mk +++ b/firmware/controllers/controllers.mk @@ -30,7 +30,6 @@ CONTROLLERS_SRC_CPP = \ $(CONTROLLERS_DIR)/system/timer/event_queue.cpp \ $(CONTROLLERS_DIR)/settings.cpp \ $(CONTROLLERS_DIR)/core/error_handling.cpp \ - $(CONTROLLERS_DIR)/engine_cycle/map_averaging.cpp \ $(CONTROLLERS_DIR)/engine_cycle/high_pressure_fuel_pump.cpp \ $(CONTROLLERS_DIR)/engine_cycle/rpm_calculator.cpp \ $(CONTROLLERS_DIR)/engine_cycle/spark_logic.cpp \ diff --git a/firmware/controllers/engine_cycle/map_averaging.cpp b/firmware/controllers/modules/map_averaging/map_averaging.cpp similarity index 100% rename from firmware/controllers/engine_cycle/map_averaging.cpp rename to firmware/controllers/modules/map_averaging/map_averaging.cpp diff --git a/firmware/controllers/engine_cycle/map_averaging.h b/firmware/controllers/modules/map_averaging/map_averaging.h similarity index 100% rename from firmware/controllers/engine_cycle/map_averaging.h rename to firmware/controllers/modules/map_averaging/map_averaging.h diff --git a/firmware/controllers/modules/map_averaging/map_averaging.mk b/firmware/controllers/modules/map_averaging/map_averaging.mk new file mode 100644 index 0000000000..75663c8291 --- /dev/null +++ b/firmware/controllers/modules/map_averaging/map_averaging.mk @@ -0,0 +1,6 @@ +MODULES_INC += $(PROJECT_DIR)/controllers/modules/map_averaging +MODULES_CPPSRC += $(PROJECT_DIR)/controllers/modules/map_averaging/map_averaging.cpp +MODULES_INCLUDE += \#include "map_averaging.h"\n +# MODULES_LIST += MapSampler, + +DDEFS += -DMODULE_MAP_AVERAGING diff --git a/firmware/controllers/modules/modules.mk b/firmware/controllers/modules/modules.mk index d643605015..c149ca5d9f 100644 --- a/firmware/controllers/modules/modules.mk +++ b/firmware/controllers/modules/modules.mk @@ -1,4 +1,5 @@ include $(PROJECT_DIR)/controllers/modules/fan/fan.mk include $(PROJECT_DIR)/controllers/modules/fuel_pump/fuel_pump.mk include $(PROJECT_DIR)/controllers/modules/gear_detector/gear_detector.mk +include $(PROJECT_DIR)/controllers/modules/map_averaging/map_averaging.mk include $(PROJECT_DIR)/controllers/modules/trip_odometer/trip_odometer.mk