Hw layer rearrangement (#2703)

* max31855: move to sensors

* uart GPS driver: move to sensors and rename

* i2c_bb: move to drivers

* LCD HD44780: move to drivers

* ping?

firmware/console/status_loop.cpp

@@ -69,7 +69,7 @@ extern bool main_loop_started;
 #if EFI_PROD_CODE
 // todo: move this logic to algo folder!
 #include "rtc_helper.h"
-#include "lcd_HD44780.h"
+#include "HD44780.h"
 #include "rusefi.h"
 #include "pin_repository.h"
 #include "flash_main.h"

firmware/controllers/core/error_handling.cpp

@@ -13,7 +13,7 @@ static critical_msg_t warningBuffer;
 static critical_msg_t criticalErrorMessageBuffer;
 
 #if EFI_HD44780_LCD
-#include "lcd_HD44780.h"
+#include "HD44780.h"
 #endif /* EFI_HD44780_LCD */
 
 EXTERN_ENGINE;

firmware/controllers/gauges/lcd_controller.cpp

@@ -22,7 +22,7 @@
 #include "os_access.h"
 
 #include "lcd_controller.h"
-#include "lcd_HD44780.h"
+#include "HD44780.h"
 #include "rpm_calculator.h"
 #include "allsensors.h"
 #include "engine.h"

firmware/hw_layer/drivers/drivers.mk

@@ -5,6 +5,8 @@ HW_LAYER_DRIVERS_INC = \
 	$(DRIVERS_DIR)/gpio \
 	$(DRIVERS_DIR)/can \
 	$(DRIVERS_DIR)/serial \
+	$(DRIVERS_DIR)/i2c \
+	$(DRIVERS_DIR)/lcd \
 
 HW_LAYER_DRIVERS_CORE = \
 	$(DRIVERS_DIR)/gpio/core.c \
@@ -21,4 +23,6 @@ HW_LAYER_DRIVERS = \
 HW_LAYER_DRIVERS_CPP = \
 	$(DRIVERS_DIR)/can/can_hw.cpp \
 	$(DRIVERS_DIR)/can/can_msg_tx.cpp \
-	$(DRIVERS_DIR)/serial/serial_hw.cpp
+	$(DRIVERS_DIR)/serial/serial_hw.cpp \
+	$(DRIVERS_DIR)/i2c/i2c_bb.cpp \
+	$(DRIVERS_DIR)/lcd/HD44780.cpp

firmware/hw_layer/drivers/lcd/HD44780.cpp

@@ -1,5 +1,5 @@
 /**
- * @file lcd_HD44780.cpp
+ * @file HD44780.cpp
  * @brief HD44780 character display driver
  *
  * see http://en.wikipedia.org/wiki/Hitachi_HD44780_LCD_controller
@@ -11,7 +11,7 @@
 
 #if EFI_HD44780_LCD
 
-#include "lcd_HD44780.h"
+#include "HD44780.h"
 #include "pin_repository.h"
 #include "string.h"
 

firmware/hw_layer/drivers/lcd/HD44780.h

@@ -1,5 +1,5 @@
 /**
- * @file lcd_HD44780.h
+ * @file HD44780.h
  *
  * @date 13.12.2013
  * @author Andrey Belomutskiy, (c) 2012-2020

firmware/hw_layer/hardware.cpp

@@ -39,8 +39,8 @@
 #include "mcp3208.h"
 #include "hip9011.h"
 #include "histogram.h"
-#include "neo6m.h"
-#include "lcd_HD44780.h"
+#include "gps_uart.h"
+#include "HD44780.h"
 #include "settings.h"
 #include "joystick.h"
 #include "cdm_ion_sense.h"

firmware/hw_layer/hw_layer.mk

@@ -7,14 +7,11 @@ 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_EGT_CPP = \
-	$(PROJECT_DIR)/hw_layer/max31855.cpp
-
 HW_LAYER_EMS = $(HW_LAYER_EGT) \
 	$(PROJECT_DIR)/hw_layer/adc/mcp3208.c \
 	$(PROJECT_DIR)/hw_layer/mc33816_data.c
 
-HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
+HW_LAYER_EMS_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.cpp \
@@ -25,10 +22,8 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
 	$(PROJECT_DIR)/hw_layer/digital_input/trigger/trigger_input_exti.cpp \
 	$(PROJECT_DIR)/hw_layer/hardware.cpp \
 	$(PROJECT_DIR)/hw_layer/smart_gpio.cpp \
-	$(PROJECT_DIR)/hw_layer/neo6m.cpp \
 	$(PROJECT_DIR)/hw_layer/mmc_card.cpp \
 	$(PROJECT_DIR)/hw_layer/mmc_card_access.cpp \
-	$(PROJECT_DIR)/hw_layer/lcd/lcd_HD44780.cpp \
 	$(PROJECT_DIR)/hw_layer/adc/adc_inputs.cpp \
 	$(PROJECT_DIR)/hw_layer/adc/adc_subscription.cpp \
 	$(PROJECT_DIR)/hw_layer/adc/ads1015.cpp \
@@ -43,7 +38,6 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
 	$(PROJECT_DIR)/hw_layer/rtc_helper.cpp \
 	$(PROJECT_DIR)/hw_layer/cdm_ion_sense.cpp \
 	$(PROJECT_DIR)/hw_layer/debounce.cpp \
-	$(PROJECT_DIR)/hw_layer/i2c_bb.cpp \
 
 
 #

firmware/hw_layer/sensors/gps_uart.c

@@ -1,9 +1,9 @@
 /**
- * @file	neo6m.cpp
- * @brief	Ublox 6M hardware UART driver
+ * @file	gps_uart.cpp
+ * @brief	GPS receiver hardware UART driver
  *
+ * Tested and developed for NEO-6M
  * http://www.u-blox.com/en/gps-modules/pvt-modules/previous-generations/neo-6-family.html
- *
  * Technically any UART GPS should work with this driver since NMEA protocol is pretty common anyway
  *
  * @date Dec 28, 2013
@@ -22,7 +22,7 @@
 #include "eficonsole.h"
 #include "pin_repository.h"
 #include "nmea.h"
-#include "neo6m.h"
+#include "gps_uart.h"
 #include "rtc_helper.h"
 #include "engine.h"
 

firmware/hw_layer/sensors/gps_uart.h

@@ -1,5 +1,5 @@
 /*
- * @file    neo6m.h
+ * @file    gps_uart.h
  *
  *
  * @date Dec 30, 2013

firmware/hw_layer/sensors/sensors.mk

@@ -9,4 +9,6 @@ HW_SENSORS_SRC = \
 	$(HW_SENSORS_DIR)/accelerometer.cpp \
 	$(HW_SENSORS_DIR)/joystick.cpp \
 	$(HW_SENSORS_DIR)/lps25.cpp \
+	$(HW_SENSORS_DIR)/max31855.cpp \
+	$(HW_SENSORS_DIR)/gps_uart.c
 	

firmware/rusefi.cpp

@@ -129,10 +129,6 @@
 #include "trigger_emulator_algo.h"
 #include "rusefi_lua.h"
 
-#if EFI_HD44780_LCD
-#include "lcd_HD44780.h"
-#endif /* EFI_HD44780_LCD */
-
 #if EFI_ENGINE_EMULATOR
 #include "engine_emulator.h"
 #endif /* EFI_ENGINE_EMULATOR */