From 0faa8a0166f069441ca6546684ceae9731e4cf84 Mon Sep 17 00:00:00 2001 From: Andrey G Date: Sun, 16 May 2021 14:11:28 +0300 Subject: [PATCH] Hw layer rearrangement (#2705) * Fix simulator compilation * HW_SENSORS_SRC -> HW_SENSORS_CPP --- firmware/Makefile | 2 +- firmware/hw_layer/sensors/{gps_uart.c => gps_uart.cpp} | 0 firmware/hw_layer/sensors/sensors.mk | 5 ++--- simulator/Makefile | 4 +++- 4 files changed, 6 insertions(+), 5 deletions(-) rename firmware/hw_layer/sensors/{gps_uart.c => gps_uart.cpp} (100%) diff --git a/firmware/Makefile b/firmware/Makefile index 5a3ff443bf..29fff00cd8 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -234,7 +234,7 @@ CPPSRC = $(ALLCPPSRC) \ $(HW_LAYER_EMS_CPP) \ $(HW_LAYER_DRIVERS_CORE_CPP) \ $(HW_LAYER_DRIVERS_CPP) \ - $(HW_SENSORS_SRC) \ + $(HW_SENSORS_CPP) \ $(TUNERSTUDIO_SRC_CPP) \ $(CONSOLE_SRC_CPP) \ $(CONTROLLERS_SENSORS_SRC_CPP) \ diff --git a/firmware/hw_layer/sensors/gps_uart.c b/firmware/hw_layer/sensors/gps_uart.cpp similarity index 100% rename from firmware/hw_layer/sensors/gps_uart.c rename to firmware/hw_layer/sensors/gps_uart.cpp diff --git a/firmware/hw_layer/sensors/sensors.mk b/firmware/hw_layer/sensors/sensors.mk index 280733ed00..3a22819510 100644 --- a/firmware/hw_layer/sensors/sensors.mk +++ b/firmware/hw_layer/sensors/sensors.mk @@ -2,7 +2,7 @@ HW_SENSORS_DIR=$(PROJECT_DIR)/hw_layer/sensors HW_SENSORS_INC=$(HW_SENSORS_DIR) -HW_SENSORS_SRC = \ +HW_SENSORS_CPP = \ $(HW_SENSORS_DIR)/cj125.cpp \ $(HW_SENSORS_DIR)/cj125_logic.cpp \ $(HW_SENSORS_DIR)/yaw_rate_sensor.cpp \ @@ -10,5 +10,4 @@ HW_SENSORS_SRC = \ $(HW_SENSORS_DIR)/joystick.cpp \ $(HW_SENSORS_DIR)/lps25.cpp \ $(HW_SENSORS_DIR)/max31855.cpp \ - $(HW_SENSORS_DIR)/gps_uart.c - \ No newline at end of file + $(HW_SENSORS_DIR)/gps_uart.cpp diff --git a/simulator/Makefile b/simulator/Makefile index b722005c43..4aff32acdf 100644 --- a/simulator/Makefile +++ b/simulator/Makefile @@ -140,6 +140,7 @@ include $(PROJECT_DIR)/config/engines/engines.mk include $(PROJECT_DIR)/controllers/controllers.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 @@ -166,7 +167,8 @@ CPPSRC = $(ALLCPPSRC) \ $(CONTROLLERS_SRC_CPP) \ $(PROJECT_DIR)/development/sensor_chart.cpp \ $(HW_LAYER_EMS_CPP) \ - $(HW_SENSORS_SRC) \ + $(HW_SENSORS_CPP) \ + $(HW_LAYER_DRIVERS_CPP) \ $(TRIGGER_SRC_CPP) \ $(TRIGGER_DECODERS_SRC_CPP) \ $(SYSTEMSRC_CPP) \