The Big Refactoring of 2019: folder structure #723

firmware/controllers/algo/advance_map.cpp

@@ -23,7 +23,7 @@
 #include "engine.h"
 #include "advance_map.h"
 #include "interpolation.h"
-#include "efilib2.h"
+#include "rfiutil.h"
 #include "engine_math.h"
 #include "tps.h"
 #include "idle_thread.h"

firmware/controllers/algo/engine.cpp

@@ -19,7 +19,7 @@
 #include "advance_map.h"
 #include "speed_density.h"
 #include "advance_map.h"
-#include "efilib2.h"
+#include "rfiutil.h"
 #include "settings.h"
 #include "aux_valves.h"
 #include "map_averaging.h"

firmware/controllers/core/core.mk

@@ -1,7 +1,5 @@
 
 CONTROLLERS_CORE_SRC_CPP = $(PROJECT_DIR)/controllers/core/efi_wave.cpp \
-	$(PROJECT_DIR)/controllers/core/avg_values.cpp \
 	$(PROJECT_DIR)/controllers/core/table_helper.cpp \
 	$(PROJECT_DIR)/controllers/core/fsio_core.cpp \
-	$(PROJECT_DIR)/controllers/core/interpolation.cpp \
 	$(PROJECT_DIR)/controllers/core/fsio_impl.cpp

firmware/controllers/engine_controller.cpp

@@ -67,7 +67,7 @@
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
 #include "pwm_generator.h"
 #include "adc_inputs.h"
-#include "efilib2.h"
+
 #include "pwm_tester.h"
 #include "pwm_generator.h"
 #include "lcd_controller.h"

firmware/controllers/error_handling.cpp

@@ -7,7 +7,7 @@
 
 #include "engine.h"
 #include "io_pins.h"
-#include "efilib2.h"
+
 
 #if EFI_SIMULATOR || EFI_PROD_CODE
 //todo: move into simulator global

firmware/controllers/map_averaging.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "global.h"
-#include "efilib2.h"
+
 #include "map.h"
 
 #if EFI_MAP_AVERAGING || defined(__DOXYGEN__)

firmware/controllers/math/efitime.h

@@ -59,4 +59,10 @@ efitimesec_t getTimeNowSeconds(void);
 }
 #endif /* __cplusplus */
 
+#if (EFI_PROD_CODE || EFI_SIMULATOR)
+ #define GET_TIMESTAMP() port_rt_get_counter_value()
+#else
+ #define GET_TIMESTAMP() 0
+#endif
+
 #endif /* EFITIME_H_ */

firmware/controllers/system/event_queue.cpp

@@ -14,7 +14,7 @@
 #include "global.h"
 #include "event_queue.h"
 #include "efitime.h"
-#include "efilib2.h"
+#include "rfiutil.h"
 
 uint32_t maxSchedulingPrecisionLoss = 0;
 

firmware/controllers/system/single_timer_executor.cpp

@@ -19,7 +19,7 @@
 
 #include "single_timer_executor.h"
 #include "efitime.h"
-#include "efilib2.h"
+
 
 #if EFI_SIGNAL_EXECUTOR_ONE_TIMER || defined(__DOXYGEN__)
 #include "microsecond_timer.h"

firmware/controllers/trigger/main_trigger_callback.cpp

@@ -51,7 +51,7 @@
 #include "local_version_holder.h"
 #include "event_queue.h"
 #include "engine.h"
-#include "efilib2.h"
+
 #include "aux_valves.h"
 #include "backup_ram.h"
 

firmware/controllers/trigger/rpm_calculator.cpp

@@ -26,7 +26,7 @@
 #include "sensor_chart.h"
 #endif
 
-#include "efilib2.h"
+
 
 #if EFI_ENGINE_SNIFFER
 #include "engine_sniffer.h"

firmware/controllers/trigger/spark_logic.cpp

@@ -8,7 +8,7 @@
 #include "engine_math.h"
 #include "utlist.h"
 #include "event_queue.h"
-#include "efilib2.h"
+#include "rfiutil.h"
 
 EXTERN_ENGINE;
 

firmware/controllers/trigger/trigger_central.cpp

@@ -16,7 +16,7 @@
 #include "data_buffer.h"
 #include "histogram.h"
 #include "pwm_generator_logic.h"
-#include "efilib2.h"
+
 #include "settings.h"
 #include "engine_math.h"
 #include "local_version_holder.h"

firmware/development/rfi_perftest.cpp

@@ -13,7 +13,7 @@
 #include "eficonsole.h"
 #include "time.h"
 #include "efi_gpio.h"
-#include "efilib2.h"
+
 #include "console_io.h"
 #include "engine.h"
 

firmware/hw_layer/hip9011.cpp

@@ -42,7 +42,7 @@
 #include "hip9011_lookup.h"
 #include "HIP9011.h"
 #include "adc_inputs.h"
-#include "efilib2.h"
+
 #include "engine_controller.h"
 
 #if EFI_PROD_CODE

firmware/hw_layer/microsecond_timer.cpp

@@ -19,7 +19,7 @@
 // https://my.st.com/public/STe2ecommunities/mcu/Lists/cortex_mx_stm32/Flat.aspx?RootFolder=https%3a%2f%2fmy.st.com%2fpublic%2fSTe2ecommunities%2fmcu%2fLists%2fcortex_mx_stm32%2fInterrupt%20on%20CEN%20bit%20setting%20in%20TIM7&FolderCTID=0x01200200770978C69A1141439FE559EB459D7580009C4E14902C3CDE46A77F0FFD06506F5B&currentviews=474
 
 #if (EFI_PROD_CODE && HAL_USE_GPT) || defined(__DOXYGEN__)
-#include "efilib2.h"
+
 #include "periodic_controller.h"
 
 /**

firmware/util/efilib2.cpp

@@ -1,26 +0,0 @@
-/**
- * @file	efilib2.cpp
- *
- * @date Apr 14, 2014
- * @author Andrey Belomutskiy, (c) 2012-2018
- */
-
-#include "efilib2.h"
-
-/**
- * See also getRemainingStack()
- */
-int getMaxUsedStack(uint8_t *ptr, int size) {
-	/**
-	 * maximum used stack size total stack buffer size minus position of first modified byte
-	 */
-#if ! EFI_UNIT_TEST
-	int used = 0;
-	for (int i = 0; i < size; i++) {
-		if (ptr[i] != CH_DBG_STACK_FILL_VALUE) {
-			return size - i;
-		}
-	}
-#endif /* EFI_UNIT_TEST */
-	return 0;
-}

firmware/util/efilib2.h

@@ -1,24 +0,0 @@
-/**
- * @file	efilib2.h
- *
- * @date Apr 14, 2014
- * @author Andrey Belomutskiy, (c) 2012-2017
- */
-
-#ifndef EFILIB2_H_
-#define EFILIB2_H_
-
-#include "global.h"
-
-/**
- * @return for a given stack memory region returns how much stack was ever used
- */
-int getMaxUsedStack(uint8_t *ptr, int size);
-
-#if (EFI_PROD_CODE || EFI_SIMULATOR)
- #define GET_TIMESTAMP() port_rt_get_counter_value()
-#else
- #define GET_TIMESTAMP() 0
-#endif
-
-#endif /* EFILIB2_H_ */

firmware/util/math/interpolation.cpp

@@ -12,7 +12,7 @@
 
 #include "global.h"
 
-#include "efilib2.h"
+
 #include "interpolation.h"
 
 bool needInterpolationLoggingValue = true;

firmware/util/rfiutil.c

@@ -109,5 +109,24 @@ void unlockAnyContext(void) {
 #endif /* #if USE_PORT_LOCK */
 }
 
-#endif
+#endif /* EFI_UNIT_TEST */
+
+
+/**
+ * See also getRemainingStack()
+ */
+int getMaxUsedStack(uint8_t *ptr, int size) {
+	/**
+	 * maximum used stack size total stack buffer size minus position of first modified byte
+	 */
+#if ! EFI_UNIT_TEST
+	int used = 0;
+	for (int i = 0; i < size; i++) {
+		if (ptr[i] != CH_DBG_STACK_FILL_VALUE) {
+			return size - i;
+		}
+	}
+#endif /* EFI_UNIT_TEST */
+	return 0;
+}
 

firmware/util/rfiutil.h

@@ -11,6 +11,11 @@
 
 #include "global.h"
 
+/**
+ * @return for a given stack memory region returns how much stack was ever used
+ */
+int getMaxUsedStack(uint8_t *ptr, int size);
+
 #if !EFI_UNIT_TEST
 
 #include "histogram.h"

firmware/util/util.mk

@@ -1,23 +1,28 @@
 UTIL_DIR=$(PROJECT_DIR)/util
 
-UTILSRC = $(UTIL_DIR)/crc.c \
+UTILSRC = \
 	$(UTIL_DIR)/containers/data_buffer.c \
+	$(UTIL_DIR)/math/crc.c \
 	$(UTIL_DIR)/rfiutil.c \
 	$(UTIL_DIR)/histogram.c
 
-UTILSRC_CPP = $(UTIL_DIR)/containers/cyclic_buffer.cpp \
-	$(PROJECT_DIR)/util/datalogging.cpp \
-	$(PROJECT_DIR)/util/loggingcentral.cpp \
+UTILSRC_CPP = \
+    $(UTIL_DIR)/containers/cyclic_buffer.cpp \
 	$(UTIL_DIR)/containers/listener_array.cpp \
 	$(UTIL_DIR)/containers/counter64.cpp \
+	$(UTIL_DIR)/containers/local_version_holder.cpp \
+	$(UTIL_DIR)/math/pid.cpp \
+	$(UTIL_DIR)/math/avg_values.cpp \
+	$(UTIL_DIR)/math/interpolation.cpp \
+	$(UTIL_DIR)/math/biquad.cpp \
+	$(PROJECT_DIR)/util/datalogging.cpp \
+	$(PROJECT_DIR)/util/loggingcentral.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 \
-	$(UTIL_DIR)/containers/local_version_holder.cpp
+	
 	
 UTIL_INC = \
 	$(UTIL_DIR) \
 	$(UTIL_DIR)/containers \
+	$(UTIL_DIR)/math \
 	

unit_tests/tests/test_util.cpp

@@ -17,7 +17,7 @@
 #include "engine_controller.h"
 
 #include "nmea.h"
-#include "efilib2.h"
+
 #include "lcd_menu_tree.h"
 #include "crc.h"
 #include "fl_stack.h"