The Big Refactoring of 2019: folder structure #723

firmware/controllers/algo/aux_pid.cpp

@@ -1,14 +1,14 @@
 /*
  * @file aux_pid.cpp
  *
- * This class is a copy-paste of alternatorController.cpp TODO: do something about it? extract more common logic?
+ * This class is a copy-paste of alternator_controller.cpp TODO: do something about it? extract more common logic?
  *
  * @date Jun 26, 2016
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
 #include "aux_pid.h"
-#include "LocalVersionHolder.h"
+#include "local_version_holder.h"
 #include "allsensors.h"
 
 #if EFI_AUX_PID || defined(__DOXYGEN__)
@@ -24,7 +24,7 @@ EXTERN_ENGINE
 
 extern fsio8_Map3D_f32t fsioTable1;
 
-// todo: this is to some extent a copy-paste of alternatorController. maybe same loop
+// todo: this is to some extent a copy-paste of alternator_controller. maybe same loop
 // for all PIDs?
 
 #if EFI_TUNER_STUDIO || defined(__DOXYGEN__)

firmware/controllers/algo/engine_configuration.cpp

@@ -86,7 +86,7 @@
 #endif /* EFI_IDLE_CONTROL */
 
 #if EFI_ALTERNATOR_CONTROL || defined(__DOXYGEN__)
-#include "alternatorController.h"
+#include "alternator_controller.h"
 #endif
 
 #if EFI_ELECTRONIC_THROTTLE_BODY || defined(__DOXYGEN__)

firmware/controllers/alternator_controller.cpp

@@ -1,5 +1,5 @@
 /**
- * @file    alternatorController.cpp
+ * @file    alternator_controller.cpp
  * @brief   alternator controller - some newer vehicles control alternator with ECU
  *
  * @date Apr 6, 2014
@@ -7,12 +7,13 @@
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
+
 #include "engine.h"
 #include "rpm_calculator.h"
-#include "alternatorController.h"
+#include "alternator_controller.h"
 #include "voltage.h"
 #include "pid.h"
-#include "LocalVersionHolder.h"
+#include "local_version_holder.h"
 #include "periodic_controller.h"
 
 #if EFI_ALTERNATOR_CONTROL || defined(__DOXYGEN__)

firmware/controllers/alternator_controller.h

@@ -1,5 +1,5 @@
 /**
- * @file    alternatorController.h
+ * @file    alternator_controller.h
  * @brief   alternator controller
  *
  * @date Apr 6, 2014
@@ -10,7 +10,7 @@
 #ifndef ALTERNATORCONTROLLER_H_
 #define ALTERNATORCONTROLLER_H_
 
-#include "global.h"
+#include "engine.h"
 void initAlternatorCtrl(Logging *sharedLogger);
 void setAltPFactor(float p);
 void setAltIFactor(float p);

firmware/controllers/controllers.mk

@@ -11,7 +11,7 @@ CONTROLLERS_SRC_CPP = $(PROJECT_DIR)/controllers/settings.cpp \
 	$(PROJECT_DIR)/controllers/pwm_tester.cpp \
 	$(PROJECT_DIR)/controllers/obd2.cpp \
 	$(PROJECT_DIR)/controllers/malfunction_indicator.cpp \
-	$(PROJECT_DIR)/controllers/alternatorController.cpp \
+	$(PROJECT_DIR)/controllers/alternator_controller.cpp \
 	$(PROJECT_DIR)/controllers/lcd_controller.cpp \
 	$(PROJECT_DIR)/controllers/tachometer.cpp \
  	$(PROJECT_DIR)/controllers/engine_controller.cpp \

firmware/controllers/engine_controller.cpp

@@ -52,8 +52,8 @@
 #include "malfunction_indicator.h"
 #include "engine.h"
 #include "algo.h"
-#include "LocalVersionHolder.h"
-#include "alternatorController.h"
+#include "local_version_holder.h"
+#include "alternator_controller.h"
 #include "fuel_math.h"
 #include "settings.h"
 #include "aux_pid.h"

firmware/controllers/settings.cpp

@@ -22,9 +22,9 @@
 #include "engine.h"
 #include "efi_gpio.h"
 #include "engine_math.h"
-#include "alternatorController.h"
 #include "idle_thread.h"
 #include "allsensors.h"
+#include "alternator_controller.h"
 #include "trigger_emulator.h"
 
 #if EFI_PROD_CODE || defined(__DOXYGEN__)

firmware/controllers/trigger/main_trigger_callback.cpp

@@ -48,7 +48,7 @@
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
 #include "rfiutil.h"
 #endif /* EFI_HISTOGRAMS */
-#include "LocalVersionHolder.h"
+#include "local_version_holder.h"
 #include "event_queue.h"
 #include "engine.h"
 #include "efilib2.h"

firmware/controllers/trigger/trigger_central.cpp

@@ -19,7 +19,7 @@
 #include "efilib2.h"
 #include "settings.h"
 #include "engine_math.h"
-#include "LocalVersionHolder.h"
+#include "local_version_holder.h"
 #include "trigger_simulator.h"
 
 #include "rpm_calculator.h"

firmware/util/containers/local_version_holder.cpp

@@ -1,11 +1,11 @@
 /**
- * @file	LocalVersionHolder.cpp
+ * @file	local_version_holder.cpp
  *
  * @date Mar 19, 2014
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
-#include "LocalVersionHolder.h"
+#include "local_version_holder.h"
 
 LocalVersionHolder::LocalVersionHolder() {
 	/**

firmware/util/containers/local_version_holder.h

@@ -1,5 +1,5 @@
 /**
- * @file	LocalVersionHolder.h
+ * @file	local_version_holder.h
  *
  * @date Mar 19, 2014
  * @author Andrey Belomutskiy, (c) 2012-2017

firmware/util/util.mk

@@ -5,16 +5,16 @@ UTILSRC = $(UTIL_DIR)/crc.c \
 	$(UTIL_DIR)/rfiutil.c \
 	$(UTIL_DIR)/histogram.c
 
-UTILSRC_CPP = $(UTIL_DIR)/cyclic_buffer.cpp \
+UTILSRC_CPP = $(UTIL_DIR)/containers/cyclic_buffer.cpp \
 	$(PROJECT_DIR)/util/datalogging.cpp \
 	$(PROJECT_DIR)/util/loggingcentral.cpp \
-	$(PROJECT_DIR)/util/listener_array.cpp \
+	$(UTIL_DIR)/containers/listener_array.cpp \
 	$(PROJECT_DIR)/util/cli_registry.cpp \
 	$(PROJECT_DIR)/util/pid.cpp \
 	$(PROJECT_DIR)/util/biquad.cpp \
 	$(PROJECT_DIR)/util/efilib.cpp \
 	$(PROJECT_DIR)/util/efilib2.cpp \
-	$(PROJECT_DIR)/util/LocalVersionHolder.cpp
+	$(UTIL_DIR)/containers/local_version_holder.cpp
 	
 UTIL_INC = \
 	$(UTIL_DIR) \