From ee5d0bf07b420a1cb5d67c957732ec8ccfaa52e9 Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <matthewkennedy@outlook.com>
Date: Sun, 18 Oct 2020 17:49:42 -0700
Subject: [PATCH] remove (#1887)

---
 .../actuators/electronic_throttle.cpp         | 26 ++++++++-----------
 firmware/controllers/algo/engine.h            |  5 ----
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp
index 136b412d30..dea7dc53b4 100644
--- a/firmware/controllers/actuators/electronic_throttle.cpp
+++ b/firmware/controllers/actuators/electronic_throttle.cpp
@@ -593,7 +593,7 @@ struct EtbThread final : public PeriodicController<512> {
 
 	void PeriodicTask(efitick_t) override {
 		// Simply update all controllers
-		for (int i = 0 ; i < engine->etbActualCount; i++) {
+		for (int i = 0 ; i < ETB_COUNT; i++) {
 			etbControllers[i].update();
 		}
 	}
@@ -605,10 +605,6 @@ static EtbThread etbThread;
 
 static void showEthInfo(void) {
 #if EFI_PROD_CODE
-	if (engine->etbActualCount == 0) {
-		scheduleMsg(&logger, "ETB DISABLED since no PPS");
-	}
-
 	scheduleMsg(&logger, "etbAutoTune=%d",
 			engine->etbAutoTune);
 
@@ -619,8 +615,8 @@ static void showEthInfo(void) {
 			hwPortname(CONFIG(etbIo[0].controlPin1)),
 			currentEtbDuty,
 			engineConfiguration->etbFreq);
-	int i;
-	for (i = 0; i < engine->etbActualCount; i++) {
+
+	for (int i = 0; i < ETB_COUNT; i++) {
 		scheduleMsg(&logger, "ETB%d", i);
 		scheduleMsg(&logger, " dir1=%s", hwPortname(CONFIG(etbIo[i].directionPin1)));
 		scheduleMsg(&logger, " dir2=%s", hwPortname(CONFIG(etbIo[i].directionPin2)));
@@ -633,8 +629,11 @@ static void showEthInfo(void) {
 }
 
 static void etbPidReset(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
-	for (int i = 0 ; i < engine->etbActualCount; i++) {
-		engine->etbControllers[i]->reset();
+	for (int i = 0 ; i < ETB_COUNT; i++) {
+		if (auto controller = engine->etbControllers[i]) {
+			controller->reset();
+		}
+		
 	}
 }
 
@@ -655,7 +654,7 @@ void setThrottleDutyCycle(percent_t level) {
 
 	float dc = ETB_PERCENT_TO_DUTY(level);
 	directPwmValue = dc;
-	for (int i = 0 ; i < engine->etbActualCount; i++) {
+	for (int i = 0 ; i < ETB_COUNT; i++) {
 		setDcMotorDuty(i, dc);
 	}
 	scheduleMsg(&logger, "duty ETB duty=%f", dc);
@@ -664,7 +663,7 @@ void setThrottleDutyCycle(percent_t level) {
 static void setEtbFrequency(int frequency) {
 	engineConfiguration->etbFreq = frequency;
 
-	for (int i = 0 ; i < engine->etbActualCount; i++) {
+	for (int i = 0 ; i < ETB_COUNT; i++) {
 		setDcMotorFrequency(i, frequency);
 	}
 }
@@ -672,7 +671,7 @@ static void setEtbFrequency(int frequency) {
 static void etbReset() {
 	scheduleMsg(&logger, "etbReset");
 	
-	for (int i = 0 ; i < engine->etbActualCount; i++) {
+	for (int i = 0 ; i < ETB_COUNT; i++) {
 		setDcMotorDuty(i, 0);
 	}
 
@@ -830,9 +829,6 @@ void doInitElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 
 	pedal2tpsMap.init(config->pedalToTpsTable, config->pedalToTpsPedalBins, config->pedalToTpsRpmBins);
 
-	// TODO: remove etbActualCount
-	engine->etbActualCount = ETB_COUNT;
-
 	bool mustHaveEtbConfigured = Sensor::hasSensor(SensorType::AcceleratorPedalPrimary);
 	bool anyEtbConfigured = false;
 
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 6deb8f88e9..ed6e9ba093 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -120,11 +120,6 @@ public:
 	bool applyLaunchControlRetard = false;
 #endif /* EFI_LAUNCH_CONTROL */
 
-	/**
-	 * if 2nd TPS is not configured we do not run 2nd ETB
-	 */
-	int etbActualCount = 0;
-
 	/**
 	 * By the way 32-bit value should hold at least 400 hours of events at 6K RPM x 12 events per revolution
 	 */