safer file name (#3861)

* safer file name

* safer file name

Co-authored-by: rusefillc <sdfsdfqsf2334234234>

firmware/controllers/actuators/alternator_controller.cpp

@@ -11,7 +11,7 @@
 
 #if EFI_ALTERNATOR_CONTROL
 #include "alternator_controller.h"
-#include "pid.h"
+#include "efi_pid.h"
 #include "local_version_holder.h"
 #include "periodic_task.h"
 

firmware/controllers/actuators/boost_control.h

@@ -8,7 +8,7 @@
 
 #include "periodic_task.h"
 #include "closed_loop_controller.h"
-#include "pid.h"
+#include "efi_pid.h"
 #include "boost_control_generated.h"
 
 struct IPwm;

firmware/controllers/actuators/electronic_throttle_impl.h

@@ -11,7 +11,7 @@
 #include "electronic_throttle.h"
 
 #include "sensor.h"
-#include "pid.h"
+#include "efi_pid.h"
 #include "error_accumulator.h"
 
 /**

firmware/controllers/actuators/idle_thread.h

@@ -11,7 +11,7 @@
 #include "engine_module.h"
 #include "rusefi_types.h"
 #include "periodic_task.h"
-#include "pid.h"
+#include "efi_pid.h"
 
 struct IIdleController {
 	enum class Phase : uint8_t {

firmware/controllers/actuators/vvt.h

@@ -10,7 +10,7 @@
 #include "periodic_task.h"
 #include "closed_loop_controller.h"
 #include "pwm_generator_logic.h"
-#include "pid.h"
+#include "efi_pid.h"
 
 class ValueProvider3D;
 

firmware/controllers/algo/engine_state.h

@@ -10,7 +10,7 @@
 
 #include "global.h"
 #include "engine_parts.h"
-#include "pid.h"
+#include "efi_pid.h"
 #include "engine_state_generated.h"
 
 struct LuaAdjustments {

firmware/hw_layer/sensors/cj125_logic.h

@@ -9,7 +9,7 @@
 
 #include "engine_configuration.h"
 #include "pwm_generator_logic.h"
-#include "pid.h"
+#include "efi_pid.h"
 
 typedef enum {
 	CJ125_LSU_42 = 0,

firmware/util/math/efi_pid.cpp

@@ -10,7 +10,7 @@
 
 #include "pch.h"
 #include "os_access.h"
-#include "pid.h"
+#include "efi_pid.h"
 #include "math.h"
 
 Pid::Pid() {

firmware/util/math/efi_pid.h

@@ -1,5 +1,8 @@
 /**
- * @file pid.h
+ * @file efi_pid.h
+ *
+ * everyone including ChibiOS-Contrib has a version of 'pid.h' so we use unique file name to avoid drama
+ *
  *
  * @date Sep 16, 2014
  * @author Andrey Belomutskiy, (c) 2012-2020

firmware/util/util.mk

@@ -11,7 +11,7 @@ UTILSRC_CPP = \
 	$(UTIL_DIR)/containers/local_version_holder.cpp \
 	$(UTIL_DIR)/math/biquad.cpp \
 	$(UTIL_DIR)/math/error_accumulator.cpp \
-	$(UTIL_DIR)/math/pid.cpp \
+	$(UTIL_DIR)/math/efi_pid.cpp \
 	$(UTIL_DIR)/math/interpolation.cpp \
 	$(PROJECT_DIR)/util/datalogging.cpp \
 	$(PROJECT_DIR)/util/loggingcentral.cpp \

unit_tests/tests/test_idle_controller.cpp

@@ -8,7 +8,7 @@
 #include "pch.h"
 
 #include "advance_map.h"
-#include "pid.h"
+#include "efi_pid.h"
 #include "fsio_impl.h"
 #include "idle_thread.h"
 #include "electronic_throttle.h"

unit_tests/tests/test_pid.cpp

@@ -9,7 +9,7 @@
 
 #include "pch.h"
 
-#include "pid.h"
+#include "efi_pid.h"
 
 TEST(util, pid) {
 	pid_s pidS;