The Big Refactoring of 2019: folder structure #723

firmware/controllers/actuators/electronic_throttle.cpp

@@ -65,6 +65,9 @@
  */
 
 #include "global.h"
+
+#if EFI_ELECTRONIC_THROTTLE_BODY || defined(__DOXYGEN__)
+
 #include "electronic_throttle.h"
 #include "tps.h"
 #include "io_pins.h"
@@ -76,7 +79,6 @@
 
 #define ETB_MAX_COUNT 2
 
-#if EFI_ELECTRONIC_THROTTLE_BODY || defined(__DOXYGEN__)
 #include "pin_repository.h"
 #include "pwm_generator.h"
 #include "dc_motor.h"

firmware/controllers/actuators/idle_thread.cpp

@@ -25,6 +25,8 @@
  */
 
 #include "global.h"
+
+#if EFI_IDLE_CONTROL || defined(__DOXYGEN__)
 #include "engine_configuration.h"
 #include "rpm_calculator.h"
 #include "pwm_generator.h"
@@ -33,8 +35,6 @@
 #include "engine.h"
 #include "periodic_controller.h"
 #include "stepper.h"
-
-#if EFI_IDLE_CONTROL || defined(__DOXYGEN__)
 #include "allsensors.h"
 
 static Logging *logger;

firmware/controllers/actuators/tachometer.cpp

@@ -13,6 +13,8 @@
 #include "tachometer.h"
 #include "trigger_central.h"
 
+#if !EFI_UNIT_TEST
+
 EXTERN_ENGINE;
 
 static scheduling_s tachTurnSignalOff;
@@ -48,3 +50,5 @@ void initTachometer(void) {
 	addTriggerEventListener(tachSignalCallback, "tach", engine);
 #endif /* EFI_SHAFT_POSITION_INPUT */
 }
+
+#endif /* EFI_UNIT_TEST */

firmware/hw_layer/pin_repository.h

@@ -34,8 +34,10 @@ EXTERNC bool brain_pin_markUsed(brain_pin_e brainPin, const char *msg);
 EXTERNC void brain_pin_markUnused(brain_pin_e brainPin);
 const char * getPinFunction(brain_input_pin_e brainPin);
 
+#if !EFI_UNIT_TEST
 /* For on-chip gpios only */
 EXTERNC bool gpio_pin_markUsed(ioportid_t port, ioportmask_t pin, const char *msg);
 EXTERNC void gpio_pin_markUnused(ioportid_t port, ioportmask_t pin);
+#endif /* EFI_UNIT_TEST */
 
 #endif /* PIN_REPOSITORY_H_ */