From 9a81b7d2c5885b8ae05059624ca9e0f1f14c10a2 Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <matthewkennedy@outlook.com>
Date: Fri, 13 Mar 2020 06:50:43 -0700
Subject: [PATCH] Move can_hw.cpp in to drivers folder (#1184)

* relocate

* include path

* simulator makefile

* fix mre while we're at it

* it would help if I fixed it right
---
 firmware/config/engines/bmw_m73_mre.cpp        | 2 ++
 firmware/hw_layer/{ => drivers/can}/can_hw.cpp | 0
 firmware/hw_layer/{ => drivers/can}/can_hw.h   | 0
 firmware/hw_layer/drivers/drivers.mk           | 4 +++-
 firmware/hw_layer/hw_layer.mk                  | 2 +-
 simulator/Makefile                             | 1 +
 6 files changed, 7 insertions(+), 2 deletions(-)
 rename firmware/hw_layer/{ => drivers/can}/can_hw.cpp (100%)
 rename firmware/hw_layer/{ => drivers/can}/can_hw.h (100%)

diff --git a/firmware/config/engines/bmw_m73_mre.cpp b/firmware/config/engines/bmw_m73_mre.cpp
index acdd55b9ac..4b0aa4e6db 100644
--- a/firmware/config/engines/bmw_m73_mre.cpp
+++ b/firmware/config/engines/bmw_m73_mre.cpp
@@ -40,6 +40,8 @@
 
 #include "bmw_m73.h"
 
+EXTERN_CONFIG;
+
 void setEngineBMW_M73_microRusEfi(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	// 13641435991 injector
 	engineConfiguration->injector.flow = 180; // cc/min, who knows if this number is real - no good source of info
diff --git a/firmware/hw_layer/can_hw.cpp b/firmware/hw_layer/drivers/can/can_hw.cpp
similarity index 100%
rename from firmware/hw_layer/can_hw.cpp
rename to firmware/hw_layer/drivers/can/can_hw.cpp
diff --git a/firmware/hw_layer/can_hw.h b/firmware/hw_layer/drivers/can/can_hw.h
similarity index 100%
rename from firmware/hw_layer/can_hw.h
rename to firmware/hw_layer/drivers/can/can_hw.h
diff --git a/firmware/hw_layer/drivers/drivers.mk b/firmware/hw_layer/drivers/drivers.mk
index 03cbb36909..adbae36569 100644
--- a/firmware/hw_layer/drivers/drivers.mk
+++ b/firmware/hw_layer/drivers/drivers.mk
@@ -3,6 +3,7 @@ DRIVERS_DIR=$(PROJECT_DIR)/hw_layer/drivers
 HW_LAYER_DRIVERS_INC = \
 	$(DRIVERS_DIR) \
 	$(DRIVERS_DIR)/gpio \
+	$(DRIVERS_DIR)/can \
 
 HW_LAYER_DRIVERS_CORE = \
 	$(DRIVERS_DIR)/gpio/core.c \
@@ -13,5 +14,6 @@ HW_LAYER_DRIVERS = \
 	$(DRIVERS_DIR)/gpio/mc33972.c \
 	$(DRIVERS_DIR)/gpio/mc33810.c
 
-HW_LAYER_DRIVERS_CPP =
+HW_LAYER_DRIVERS_CPP = \
+	$(DRIVERS_DIR)/can/can_hw.cpp \
 
diff --git a/firmware/hw_layer/hw_layer.mk b/firmware/hw_layer/hw_layer.mk
index bb60bc0901..17d988d10c 100644
--- a/firmware/hw_layer/hw_layer.mk
+++ b/firmware/hw_layer/hw_layer.mk
@@ -3,7 +3,7 @@ HW_LAYER_EGT = $(PROJECT_DIR)/hw_layer/serial_over_usb/usbcfg.c \
 
 HW_INC = hw_layer/$(CPU_HWLAYER)
 
-HW_LAYER_EGT_CPP = $(PROJECT_DIR)/hw_layer/can_hw.cpp \
+HW_LAYER_EGT_CPP = \
 	$(PROJECT_DIR)/hw_layer/max31855.cpp
 
 HW_LAYER_EMS = $(HW_LAYER_EGT) \
diff --git a/simulator/Makefile b/simulator/Makefile
index 50a11c8764..4073f86510 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -197,6 +197,7 @@ INCDIR = . \
          $(HW_LAYER_DRIVERS_INC) \
           $(PROJECT_DIR)/hw_layer \
           $(PROJECT_DIR)/hw_layer/algo \
+          $(PROJECT_DIR)/hw_layer/drivers/can \
           $(HW_SENSORS_INC) \
  	$(DEVELOPMENT_DIR) \
     $(CONTROLLERS_INC) \