From 67834809d4d0d46cb97c5e06d6eaac3d18704ddf Mon Sep 17 00:00:00 2001 From: rusefillc <48498823+rusefillc@users.noreply.github.com> Date: Tue, 4 Jul 2023 23:42:13 -0400 Subject: [PATCH] Get rid of HW_LAYER_EMS (#5389) Now we have HW_LAYER(_CPP) for common HW stuff And HW_LAYER_PORT(_CPP) for ports stuff Co-authored-by: Andrey Gusakov --- firmware/Makefile | 1 + firmware/bootloader/src/Makefile | 1 + firmware/common.mk | 1 + firmware/hw_layer/hw_layer.mk | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index eeccc2f3e4..5bd0228cd6 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -238,6 +238,7 @@ CSRC = check.c \ $(DEV_SRC) \ $(BOOTLOADERSRC) \ ${HW_MASS_STORAGE_SRC_C} \ + $(HW_LAYER) \ $(HW_LAYER_PORT) \ $(HW_LAYER_DRIVERS_CORE) \ $(HW_LAYER_DRIVERS) \ diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile index 6fdec21185..b9a40cfa25 100644 --- a/firmware/bootloader/src/Makefile +++ b/firmware/bootloader/src/Makefile @@ -174,6 +174,7 @@ include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk CSRC = $(ALLCSRC) \ $(BOARDSRC) \ $(DEV_SRC) \ + $(HW_LAYER) \ $(HW_LAYER_PORT) \ $(HW_LAYER_DRIVERS_CORE) \ $(FATFSSRC) \ diff --git a/firmware/common.mk b/firmware/common.mk index 03dc6e970c..916bdae8d9 100644 --- a/firmware/common.mk +++ b/firmware/common.mk @@ -19,6 +19,7 @@ ALLCPPSRC += \ $(CONTROLLERS_ALGO_SRC_CPP) \ $(CONTROLLERS_SENSORS_SRC_CPP) \ $(TUNERSTUDIO_SRC_CPP) \ + $(HW_LAYER_CPP) \ $(HW_LAYER_PORT_CPP) \ $(HW_SENSORS_CPP) \ $(SYSTEMSRC_CPP) \ diff --git a/firmware/hw_layer/hw_layer.mk b/firmware/hw_layer/hw_layer.mk index 156eda10eb..d909304210 100644 --- a/firmware/hw_layer/hw_layer.mk +++ b/firmware/hw_layer/hw_layer.mk @@ -7,7 +7,7 @@ HW_LAYER_INC= $(PROJECT_DIR)/hw_layer $(PROJECT_DIR)/hw_layer/adc \ HW_INC = hw_layer/$(CPU_HWLAYER) \ $(PROJECT_DIR)/hw_layer/ports -HW_LAYER_PORT_CPP = \ +HW_LAYER_CPP = \ $(PROJECT_DIR)/hw_layer/pin_repository.cpp \ $(PROJECT_DIR)/hw_layer/microsecond_timer/microsecond_timer.cpp \ $(PROJECT_DIR)/hw_layer/digital_input/digital_input_exti.cpp \ @@ -32,7 +32,7 @@ HW_LAYER_PORT_CPP = \ $(PROJECT_DIR)/hw_layer/adc/mcp3208.cpp ifeq ($(USE_OPENBLT),yes) - HW_LAYER_PORT += \ + HW_LAYER += \ $(PROJECT_DIR)/hw_layer/openblt/shared_params.c endif