From a7b7fd1005103656889eb4a4808a72a758e7e7d4 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Wed, 20 Nov 2019 02:18:17 -0500
Subject: [PATCH] making more code testable

---
 .../actuators/alternator_controller.cpp       |  9 +++++--
 .../actuators/electronic_throttle.cpp         | 27 ++++++++++---------
 firmware/controllers/settings.cpp             |  5 +++-
 simulator/simulator/efifeatures.h             |  8 +++---
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/firmware/controllers/actuators/alternator_controller.cpp b/firmware/controllers/actuators/alternator_controller.cpp
index 9a6495be7a..a904422368 100644
--- a/firmware/controllers/actuators/alternator_controller.cpp
+++ b/firmware/controllers/actuators/alternator_controller.cpp
@@ -8,6 +8,11 @@
  */
 
 #include "global.h"
+
+#if EFI_TUNER_STUDIO
+#include "tunerstudio_configuration.h"
+#endif /* EFI_TUNER_STUDIO */
+
 #if EFI_ALTERNATOR_CONTROL
 #include "engine.h"
 #include "rpm_calculator.h"
@@ -19,11 +24,11 @@
 
 #include "pwm_generator.h"
 #include "pin_repository.h"
-#include "tunerstudio_configuration.h"
+
 
 #if defined(HAS_OS_ACCESS)
 #error "Unexpected OS ACCESS HERE"
-#endif
+#endif /* HAS_OS_ACCESS */
 
 EXTERN_ENGINE
 ;
diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp
index 30049bc332..99195303c1 100644
--- a/firmware/controllers/actuators/electronic_throttle.cpp
+++ b/firmware/controllers/actuators/electronic_throttle.cpp
@@ -343,8 +343,8 @@ void setThrottleDutyCycle(percent_t level) {
 	scheduleMsg(&logger, "duty ETB duty=%f", dc);
 }
 
-#if EFI_PROD_CODE
 static void showEthInfo(void) {
+#if EFI_PROD_CODE
 	static char pinNameBuffer[16];
 
 	scheduleMsg(&logger, "etbAutoTune=%d",
@@ -366,16 +366,10 @@ static void showEthInfo(void) {
 	scheduleMsg(&logger, "dir1=%s", hwPortname(CONFIGB(etb1.directionPin1)));
 	scheduleMsg(&logger, "dir2=%s", hwPortname(CONFIGB(etb1.directionPin2)));
 	etbPid.showPidStatus(&logger, "ETB");
+#endif /* EFI_PROD_CODE */
 }
 
-/**
- * set etb_p X
- */
-void setEtbPFactor(float value) {
-	engineConfiguration->etb.pFactor = value;
-	etbPid.reset();
-	showEthInfo();
-}
+#if EFI_PROD_CODE
 
 static void setEtbFrequency(int frequency) {
 	engineConfiguration->etbFreq = frequency;
@@ -391,6 +385,16 @@ static void etbReset() {
 
 	mockPedalPosition = MOCK_UNDEFINED;
 }
+#endif /* EFI_PROD_CODE */
+
+/**
+ * set etb_p X
+ */
+void setEtbPFactor(float value) {
+	engineConfiguration->etb.pFactor = value;
+	etbPid.reset();
+	showEthInfo();
+}
 
 /**
  * set etb_i X
@@ -418,7 +422,6 @@ void setEtbOffset(int value) {
 	etbPid.reset();
 	showEthInfo();
 }
-#endif /* EFI_PROD_CODE */
 
 void setBoschVNH2SP30Curve(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->etbBiasBins[0] = 0;
@@ -539,7 +542,7 @@ static void setAutoOffset(int offset) {
 	tuneWorkingPidSettings.offset = offset;
 	autoTune.reset();
 }
-#endif
+#endif /* EFI_PROD_CODE */
 
 void setDefaultEtbBiasCurve(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->etbBiasBins[0] = 0;
@@ -625,7 +628,7 @@ void initElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 
 	// manual duty cycle control without PID. Percent value from 0 to 100
 	addConsoleActionNANF(CMD_ETB_DUTY, setThrottleDutyCycle);
-#endif
+#endif /* EFI_PROD_CODE */
 
 #if EFI_PROD_CODE && 0
 	tuneWorkingPidSettings.pFactor = 1;
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index edd6cf8f7b..78a2d94d44 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -30,7 +30,6 @@
 
 #if EFI_PROD_CODE
 #include "vehicle_speed.h"
-#include "electronic_throttle.h"
 #include "rtc_helper.h"
 #include "can_hw.h"
 #include "rusefi.h"
@@ -38,6 +37,10 @@
 #include "hardware.h"
 #endif /* EFI_PROD_CODE */
 
+#if EFI_ELECTRONIC_THROTTLE_BODY
+#include "electronic_throttle.h"
+#endif /* EFI_ELECTRONIC_THROTTLE_BODY */
+
 #if EFI_INTERNAL_FLASH
 #include "flash_main.h"
 #endif /* EFI_INTERNAL_FLASH */
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index 7738db68be..fe40bc75ec 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -2,7 +2,7 @@
  * efifeatures.h
  *
  * @date Mar 7, 2014
- * @author Andrey Belomutskiy, (c) 2012-2016
+ * @author Andrey Belomutskiy, (c) 2012-2019
  */
 
 #ifndef EFIFEATURES_H_
@@ -61,7 +61,7 @@
 #define TS_UART_DMA_MODE FALSE
 
 #define EFI_MAP_AVERAGING TRUE
-#define EFI_ALTERNATOR_CONTROL FALSE
+#define EFI_ALTERNATOR_CONTROL TRUE
 
 #define EFI_SUPPORT_DODGE_NEON TRUE
 #define EFI_SUPPORT_FORD_ASPIRE TRUE
@@ -98,8 +98,8 @@
 #define BOARD_MC33972_COUNT			0
 #define BOARD_TLE8888_COUNT 	0
 
-#define EFI_ELECTRONIC_THROTTLE_BODY FALSE
-#define EFI_AUX_PID FALSE
+#define EFI_ELECTRONIC_THROTTLE_BODY TRUE
+#define EFI_AUX_PID TRUE
 #define EFI_ICU_INPUTS FALSE
 
 #ifndef HAL_TRIGGER_USE_PAL