From 7c0fd37dfe5c0dfd143d85a60d1bfc2581572a85 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 6 Jan 2022 19:02:35 -0500 Subject: [PATCH] Live Data progress --- firmware/Makefile | 5 +---- firmware/common.mk | 6 ++++++ firmware/console/console.mk | 1 - simulator/Makefile | 5 +---- unit_tests/Makefile | 6 +----- 5 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 firmware/common.mk diff --git a/firmware/Makefile b/firmware/Makefile index d90445a6be..93216cadc7 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -197,12 +197,9 @@ include $(PROJECT_DIR)/console/console.mk include $(PROJECT_DIR)/controllers/controllers.mk include $(PROJECT_DIR)/controllers/lua/lua.mk include $(PROJECT_DIR)/development/development.mk -include $(PROJECT_DIR)/hw_layer/hw_layer.mk include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk -include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk -include $(PROJECT_DIR)/init/init.mk -include $(PROJECT_DIR)/util/util.mk +include $(PROJECT_DIR)/common.mk ifeq ($(BOOTLOADERINC),) # include default bootloader code diff --git a/firmware/common.mk b/firmware/common.mk new file mode 100644 index 0000000000..e7818725f6 --- /dev/null +++ b/firmware/common.mk @@ -0,0 +1,6 @@ +include $(PROJECT_DIR)/init/init.mk +include $(PROJECT_DIR)/util/util.mk +include $(PROJECT_DIR)/hw_layer/hw_layer.mk +include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk + +ALLINC += $(PROJECT_DIR)/console/binary/generated \ No newline at end of file diff --git a/firmware/console/console.mk b/firmware/console/console.mk index 4ac881f9b1..7a8cc21c25 100644 --- a/firmware/console/console.mk +++ b/firmware/console/console.mk @@ -13,7 +13,6 @@ CONSOLE_SRC_CPP = $(PROJECT_DIR)/console/status_loop.cpp \ CONSOLE_INC=\ - $(PROJECT_DIR)/console/binary/generated \ $(PROJECT_DIR)/console/binary \ $(PROJECT_DIR)/console \ $(PROJECT_DIR)/console/binary_log diff --git a/simulator/Makefile b/simulator/Makefile index 726731c59d..801b754a62 100644 --- a/simulator/Makefile +++ b/simulator/Makefile @@ -156,11 +156,8 @@ include $(PROJECT_DIR)/config/engines/engines.mk include $(PROJECT_DIR)/controllers/controllers.mk include $(PROJECT_DIR)/controllers/lua/lua.mk include $(PROJECT_DIR)/development/development.mk -include $(PROJECT_DIR)/hw_layer/hw_layer.mk include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk -include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk -include $(PROJECT_DIR)/init/init.mk -include $(PROJECT_DIR)/util/util.mk +include $(PROJECT_DIR)/common.mk # C sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/unit_tests/Makefile b/unit_tests/Makefile index 0990cd0772..b12164558e 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -13,15 +13,11 @@ include $(PROJECT_DIR)/controllers/lua/lua.mk include $(PROJECT_DIR)/development/development.mk include $(PROJECT_DIR)/console/console.mk include $(PROJECT_DIR)/console/binary/tunerstudio.mk -include $(PROJECT_DIR)/hw_layer/hw_layer.mk include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk -include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk -include $(PROJECT_DIR)/util/util.mk -include $(PROJECT_DIR)/init/init.mk include $(UNIT_TESTS_DIR)/test.mk include $(UNIT_TESTS_DIR)/tests/tests.mk include $(PROJECT_DIR)/../unit_tests/tests/util/test_util.mk - +include $(PROJECT_DIR)/common.mk # C sources that can be compiled in ARM or THUMB mode depending on the global # setting.