From c3e1435f39e663972a8e19bcce30293c948a26ac Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <matthewkennedy@outlook.com>
Date: Tue, 3 Sep 2024 16:28:54 -0700
Subject: [PATCH] move tachometer to modules dir

---
 firmware/controllers/algo/engine.cpp                        | 1 -
 firmware/controllers/controllers.mk                         | 1 -
 firmware/controllers/engine_controller.cpp                  | 1 -
 firmware/controllers/modules/modules.mk                     | 1 +
 .../{gauges => modules/tachometer}/tachometer.cpp           | 2 --
 .../controllers/{gauges => modules/tachometer}/tachometer.h | 3 +++
 firmware/controllers/modules/tachometer/tachometer.mk       | 6 ++++++
 7 files changed, 10 insertions(+), 5 deletions(-)
 rename firmware/controllers/{gauges => modules/tachometer}/tachometer.cpp (98%)
 rename firmware/controllers/{gauges => modules/tachometer}/tachometer.h (72%)
 create mode 100644 firmware/controllers/modules/tachometer/tachometer.mk

diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 4cfaa00a0a..eb6c205e5c 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -22,7 +22,6 @@
 #include "idle_thread.h"
 #include "idle_hardware.h"
 #include "gppwm.h"
-#include "tachometer.h"
 #include "speedometer.h"
 #include "dynoview.h"
 #include "boost_control.h"
diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk
index 9c85be5b65..77a0151c90 100644
--- a/firmware/controllers/controllers.mk
+++ b/firmware/controllers/controllers.mk
@@ -22,7 +22,6 @@ CONTROLLERS_SRC_CPP = \
 	$(CONTROLLERS_DIR)/actuators/vvt.cpp \
 	$(CONTROLLERS_DIR)/actuators/gppwm/gppwm_channel.cpp \
 	$(CONTROLLERS_DIR)/actuators/gppwm/gppwm.cpp \
-	$(CONTROLLERS_DIR)/gauges/tachometer.cpp \
 	$(CONTROLLERS_DIR)/gauges/speedometer.cpp \
 	$(CONTROLLERS_DIR)/gauges/malfunction_indicator.cpp \
 	$(CONTROLLERS_DIR)/system/timer/single_timer_executor.cpp \
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 068ad14386..feb3827ae3 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -44,7 +44,6 @@
 #include "vvt.h"
 #include "boost_control.h"
 #include "launch_control.h"
-#include "tachometer.h"
 #include "speedometer.h"
 #include "gppwm.h"
 #include "date_stamp.h"
diff --git a/firmware/controllers/modules/modules.mk b/firmware/controllers/modules/modules.mk
index e9097266c6..69158fd850 100644
--- a/firmware/controllers/modules/modules.mk
+++ b/firmware/controllers/modules/modules.mk
@@ -1,6 +1,7 @@
 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/tachometer/tachometer.mk
 include $(PROJECT_DIR)/controllers/modules/trip_odometer/trip_odometer.mk
 
 ifeq ($(NO_MAP_AVERAGING),)
diff --git a/firmware/controllers/gauges/tachometer.cpp b/firmware/controllers/modules/tachometer/tachometer.cpp
similarity index 98%
rename from firmware/controllers/gauges/tachometer.cpp
rename to firmware/controllers/modules/tachometer/tachometer.cpp
index 739379617f..de0b42b059 100644
--- a/firmware/controllers/gauges/tachometer.cpp
+++ b/firmware/controllers/modules/tachometer/tachometer.cpp
@@ -10,8 +10,6 @@
 
 #include "pch.h"
 
-#include "tachometer.h"
-
 static SimplePwm tachControl("tach"); 
 static float tachFreq;  
 static float duty;   
diff --git a/firmware/controllers/gauges/tachometer.h b/firmware/controllers/modules/tachometer/tachometer.h
similarity index 72%
rename from firmware/controllers/gauges/tachometer.h
rename to firmware/controllers/modules/tachometer/tachometer.h
index c285d59513..5810b5cbcc 100644
--- a/firmware/controllers/gauges/tachometer.h
+++ b/firmware/controllers/modules/tachometer/tachometer.h
@@ -9,3 +9,6 @@
 
 void initTachometer();
 void tachUpdate();
+
+// TODO
+struct TachometerModule : public EngineModule { };
diff --git a/firmware/controllers/modules/tachometer/tachometer.mk b/firmware/controllers/modules/tachometer/tachometer.mk
new file mode 100644
index 0000000000..4f04299f5c
--- /dev/null
+++ b/firmware/controllers/modules/tachometer/tachometer.mk
@@ -0,0 +1,6 @@
+MODULES_INC += $(PROJECT_DIR)/controllers/modules/tachometer
+MODULES_CPPSRC += $(PROJECT_DIR)/controllers/modules/tachometer/tachometer.cpp
+MODULES_INCLUDE += \#include "tachometer.h"\n
+MODULES_LIST += TachometerModule,
+
+DDEFS += -DMODULE_TACHOMETER