From 8d924a2f49a2d4907f39ccd67bbb67af40ae24df Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 9 Apr 2019 23:17:09 -0400 Subject: [PATCH] The Big Refactoring of 2019: folder structure #723 --- firmware/controllers/controllers.mk | 2 +- firmware/controllers/core/core.mk | 7 ++++--- firmware/controllers/{ => core}/error_handling.cpp | 0 firmware/controllers/{ => core}/error_handling.h | 0 firmware/{controllers/core => util/containers}/fl_stack.h | 0 .../{controllers/core => util/containers}/table_helper.cpp | 0 .../{controllers/core => util/containers}/table_helper.h | 1 - firmware/util/util.mk | 1 + 8 files changed, 6 insertions(+), 5 deletions(-) rename firmware/controllers/{ => core}/error_handling.cpp (100%) rename firmware/controllers/{ => core}/error_handling.h (100%) rename firmware/{controllers/core => util/containers}/fl_stack.h (100%) rename firmware/{controllers/core => util/containers}/table_helper.cpp (100%) rename firmware/{controllers/core => util/containers}/table_helper.h (99%) diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk index a63ec4904c..be4a5ef03c 100644 --- a/firmware/controllers/controllers.mk +++ b/firmware/controllers/controllers.mk @@ -17,7 +17,7 @@ CONTROLLERS_SRC_CPP = \ $(CONTROLLERS_DIR)/scheduling/pwm_generator_logic.cpp \ $(CONTROLLERS_DIR)/scheduling/event_queue.cpp \ $(PROJECT_DIR)/controllers/settings.cpp \ - $(PROJECT_DIR)/controllers/error_handling.cpp \ + $(PROJECT_DIR)/controllers/core/error_handling.cpp \ $(PROJECT_DIR)/controllers/map_averaging.cpp \ $(PROJECT_DIR)/controllers/flash_main.cpp \ $(PROJECT_DIR)/controllers/injector_central.cpp \ diff --git a/firmware/controllers/core/core.mk b/firmware/controllers/core/core.mk index 19269da57a..1d3a00902c 100644 --- a/firmware/controllers/core/core.mk +++ b/firmware/controllers/core/core.mk @@ -1,5 +1,6 @@ -CONTROLLERS_CORE_SRC_CPP = $(PROJECT_DIR)/controllers/core/efi_wave.cpp \ - $(PROJECT_DIR)/controllers/core/table_helper.cpp \ +CONTROLLERS_CORE_SRC_CPP = \ + $(PROJECT_DIR)/controllers/core/efi_wave.cpp \ $(PROJECT_DIR)/controllers/core/fsio_core.cpp \ - $(PROJECT_DIR)/controllers/core/fsio_impl.cpp + $(PROJECT_DIR)/controllers/core/fsio_impl.cpp \ + diff --git a/firmware/controllers/error_handling.cpp b/firmware/controllers/core/error_handling.cpp similarity index 100% rename from firmware/controllers/error_handling.cpp rename to firmware/controllers/core/error_handling.cpp diff --git a/firmware/controllers/error_handling.h b/firmware/controllers/core/error_handling.h similarity index 100% rename from firmware/controllers/error_handling.h rename to firmware/controllers/core/error_handling.h diff --git a/firmware/controllers/core/fl_stack.h b/firmware/util/containers/fl_stack.h similarity index 100% rename from firmware/controllers/core/fl_stack.h rename to firmware/util/containers/fl_stack.h diff --git a/firmware/controllers/core/table_helper.cpp b/firmware/util/containers/table_helper.cpp similarity index 100% rename from firmware/controllers/core/table_helper.cpp rename to firmware/util/containers/table_helper.cpp diff --git a/firmware/controllers/core/table_helper.h b/firmware/util/containers/table_helper.h similarity index 99% rename from firmware/controllers/core/table_helper.h rename to firmware/util/containers/table_helper.h index 5f0c235aad..8740506cdb 100644 --- a/firmware/controllers/core/table_helper.h +++ b/firmware/util/containers/table_helper.h @@ -48,7 +48,6 @@ Table2D::Table2D() { bin = NULL; } - template void Table2D::preCalc(float *bin, float *values) { this->bin = bin; diff --git a/firmware/util/util.mk b/firmware/util/util.mk index 34b9d2dd55..43e94d91a6 100644 --- a/firmware/util/util.mk +++ b/firmware/util/util.mk @@ -11,6 +11,7 @@ UTILSRC_CPP = \ $(UTIL_DIR)/containers/listener_array.cpp \ $(UTIL_DIR)/containers/counter64.cpp \ $(UTIL_DIR)/containers/local_version_holder.cpp \ + $(UTIL_DIR)/containers/table_helper.cpp \ $(UTIL_DIR)/math/pid.cpp \ $(UTIL_DIR)/math/avg_values.cpp \ $(UTIL_DIR)/math/interpolation.cpp \