From 7ad5b00f2e9d9ad1c9c612025c86886d69bc3f1d Mon Sep 17 00:00:00 2001
From: rusefillc <48498823+rusefillc@users.noreply.github.com>
Date: Wed, 27 Sep 2023 03:59:04 -0400
Subject: [PATCH] refactoring: vvt is not aux (#263)

* refactoring: vvt is not aux

(cherry picked from commit 6b4c4a583316a32d7723c2cfa16cda39fa9afb1b)

* this repo has VVT conditional at small-can-board
---
 firmware/config/stm32f4ems/efifeatures.h   | 4 ++--
 firmware/console/binary/live_data.cpp      | 2 +-
 firmware/controllers/actuators/vvt.cpp     | 2 +-
 firmware/controllers/algo/engine.h         | 4 ++--
 firmware/controllers/engine_controller.cpp | 4 ++--
 firmware/hw_layer/hardware.cpp             | 8 ++++----
 firmware/integration/LiveData.yaml         | 1 +
 simulator/simulator/efifeatures.h          | 2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h
index 7d8bf53966..69dd0482ec 100644
--- a/firmware/config/stm32f4ems/efifeatures.h
+++ b/firmware/config/stm32f4ems/efifeatures.h
@@ -121,8 +121,8 @@
 #define EFI_ALTERNATOR_CONTROL TRUE
 #endif
 
-#ifndef EFI_AUX_PID
-#define EFI_AUX_PID TRUE
+#ifndef EFI_VVT_PID
+#define EFI_VVT_PID TRUE
 #endif
 
 #define EFI_SIGNAL_EXECUTOR_SLEEP FALSE
diff --git a/firmware/console/binary/live_data.cpp b/firmware/console/binary/live_data.cpp
index 8f62dd7bbb..010512fc1f 100644
--- a/firmware/console/binary/live_data.cpp
+++ b/firmware/console/binary/live_data.cpp
@@ -132,7 +132,7 @@ const trigger_state_s* getLiveData(size_t idx) {
 
 template<>
 const vvt_s* getLiveData(size_t idx) {
-#if EFI_AUX_PID
+#if EFI_VVT_PID
 	switch (idx) {
 		case 0: return &engine->module<VvtController1>().unmock();
 		case 1: return &engine->module<VvtController2>().unmock();
diff --git a/firmware/controllers/actuators/vvt.cpp b/firmware/controllers/actuators/vvt.cpp
index 51a6338e1f..758ffe5f4f 100644
--- a/firmware/controllers/actuators/vvt.cpp
+++ b/firmware/controllers/actuators/vvt.cpp
@@ -130,7 +130,7 @@ void VvtController::setOutput(expected<percent_t> outputValue) {
 #endif // EFI_SHAFT_POSITION_INPUT
 }
 
-#if EFI_AUX_PID
+#if EFI_VVT_PID
 
 static const char *vvtOutputNames[CAM_INPUTS_COUNT] = {
 "Vvt Output#1",
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 2d191dbdb2..04563c4f6e 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -156,12 +156,12 @@ public:
 		KnockController,
 		SensorChecker,
 		LimpManager,
-#if EFI_AUX_PID
+#if EFI_VVT_PID
 		VvtController1,
 		VvtController2,
 		VvtController3,
 		VvtController4,
-#endif // EFI_AUX_PID
+#endif // EFI_VVT_PID
 #if EFI_BOOST_CONTROL
 		BoostController,
 #endif // EFI_BOOST_CONTROL
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index b47bd0326e..1b86ae0148 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -627,9 +627,9 @@ void initEngineController() {
 	initAlternatorCtrl();
 #endif /* EFI_ALTERNATOR_CONTROL */
 
-#if EFI_AUX_PID
+#if EFI_VVT_PID
 	initVvtActuators();
-#endif /* EFI_AUX_PID */
+#endif /* EFI_VVT_PID */
 
 #if EFI_MALFUNCTION_INDICATOR
 	initMalfunctionIndicator();
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 5d2420bef5..55ad2cba4c 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -328,9 +328,9 @@ void applyNewHardwareSettings() {
 #if EFI_LOGIC_ANALYZER
 	startLogicAnalyzerPins();
 #endif /* EFI_LOGIC_ANALYZER */
-#if EFI_AUX_PID
+#if EFI_VVT_PID
 	startVvtControlPins();
-#endif /* EFI_AUX_PID */
+#endif /* EFI_VVT_PID */
 
 #if EFI_SENT_SUPPORT
 	startSent();
@@ -398,9 +398,9 @@ void stopHardware() {
 	stopTriggerEmulatorPins();
 #endif /* EFI_EMULATE_POSITION_SENSORS */
 
-#if EFI_AUX_PID
+#if EFI_VVT_PID
 	stopVvtControlPins();
-#endif /* EFI_AUX_PID */
+#endif /* EFI_VVT_PID */
 }
 
 /**
diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml
index 584cabb745..5fd17335f5 100644
--- a/firmware/integration/LiveData.yaml
+++ b/firmware/integration/LiveData.yaml
@@ -144,6 +144,7 @@ Usages:
     folder: controllers/actuators
     constexpr: "___engine.module<VvtController1>()"
     isPtr: true
+    conditional_compilation: "EFI_VVT_PID"
 
   - name: lambda_monitor
     folder: controllers/math
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index dcbb21e65a..7530756bb1 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -91,7 +91,7 @@
 #define EFI_MAX_31855 FALSE
 
 #define EFI_ELECTRONIC_THROTTLE_BODY TRUE
-#define EFI_AUX_PID TRUE
+#define EFI_VVT_PID TRUE
 
 #ifndef HAL_TRIGGER_USE_PAL
 #define HAL_TRIGGER_USE_PAL FALSE