From cb30e54b2bc05ba9ad9e4b7707601003fa0f7415 Mon Sep 17 00:00:00 2001
From: rusefillc <48498823+rusefillc@users.noreply.github.com>
Date: Fri, 21 Jul 2023 18:55:57 -0700
Subject: [PATCH] reducing complexity (#5428)

---
 firmware/controllers/actuators/vvt.cpp             | 3 +--
 firmware/controllers/algo/engine_configuration.cpp | 2 +-
 firmware/integration/rusefi_config.txt             | 3 ++-
 firmware/tunerstudio/rusefi.input                  | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/firmware/controllers/actuators/vvt.cpp b/firmware/controllers/actuators/vvt.cpp
index 26fe0b4244..235f2012a1 100644
--- a/firmware/controllers/actuators/vvt.cpp
+++ b/firmware/controllers/actuators/vvt.cpp
@@ -142,8 +142,7 @@ static void turnVvtPidOn(int index) {
 			&engine->executor,
 			engineConfiguration->vvtPins[index],
 			&instances[index].m_pin,
-			// todo: do we need two separate frequencies?
-			engineConfiguration->vvtOutputFrequency[0], 0.1);
+			engineConfiguration->vvtOutputFrequency, 0.1);
 }
 
 void startVvtControlPins() {
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 74a1689223..e5483370a6 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -400,7 +400,7 @@ static void setDefaultEngineConfiguration() {
 	engineConfiguration->auxPid[0].minValue = 10;
 	engineConfiguration->auxPid[0].maxValue = 90;
 
-	engineConfiguration->vvtOutputFrequency[0] = 300; // VVT solenoid control
+	engineConfiguration->vvtOutputFrequency = 300; // VVT solenoid control
 
 	engineConfiguration->isCylinderCleanupEnabled = true;
 
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index c5702054c0..a17426e326 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -1217,7 +1217,8 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\
 	float tChargeMaxRpmMaxTps;;"", 1, 0, 0, 3, 4
 
 custom pwm_freq_t 2 scalar, U16, @OFFSET@, "Hz", 1, 0, 0, 3000, 0
-	pwm_freq_t[CAMS_PER_BANK iterate] vvtOutputFrequency;
+	pwm_freq_t vvtOutputFrequency
+	uint16_t unused1538
 	int alternatorPwmFrequency;;"Hz", 1, 0, 0, 3000, 0
 
 
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index eec571f69b..1b6966de41 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -299,8 +299,7 @@ enable2ndByteCanID = false
 	requiresPowerCycle = idle_solenoidFrequency
 	requiresPowerCycle = boostPwmFrequency
 	requiresPowerCycle = alternatorPwmFrequency
-	requiresPowerCycle = vvtOutputFrequency1
-	requiresPowerCycle = vvtOutputFrequency2
+	requiresPowerCycle = vvtOutputFrequency
 	requiresPowerCycle = vvtPins1
 	requiresPowerCycle = vvtPins2
 	requiresPowerCycle = vvtPins3
@@ -3630,7 +3629,7 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 		field = "VVT solenoid bank 1 exhaust",						vvtPins2
 		field = "VVT solenoid bank 2 intake",						vvtPins3
 		field = "VVT solenoid bank 2 exhaust",						vvtPins4
-		field = "PWM frequency",						vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0}
+		field = "PWM frequency",						vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0}
 		field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 }
 		field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 }