moving sensors files a bit

firmware/common.mk

@@ -41,6 +41,7 @@ ALLINC += \
 	$(HW_LAYER_INC) \
   	$(HW_SENSORS_INC) \
 	$(UTIL_INC) \
+	$(CONTROLLERS_SENSORS_INC) \
 	$(CONTROLLERS_INC) \
 	$(PROJECT_DIR)/console/binary/generated \
 	

firmware/controllers/controllers.mk

@@ -4,12 +4,9 @@ include $(PROJECT_DIR)/controllers/math/math.mk
 include $(PROJECT_DIR)/controllers/trigger/trigger.mk
 include $(PROJECT_DIR)/controllers/sensors/sensors.mk
 include $(PROJECT_DIR)/controllers/system/system.mk
-#include $(PROJECT_DIR)/controllers/gauges/gauges.mk
 
 CONTROLLERS_DIR=$(PROJECT_DIR)/controllers
 
-CONTROLLERSSRC =
-	
 CONTROLLERS_SRC_CPP = \
 	$(CONTROLLERS_DIR)/actuators/electronic_throttle.cpp \
 	$(CONTROLLERS_DIR)/actuators/ac_control.cpp \
@@ -81,8 +78,6 @@ CONTROLLERS_INC=\
 	$(CONTROLLERS_DIR)/trigger/decoders \
 	$(CONTROLLERS_DIR)/tcu \
 	$(CONTROLLERS_DIR)/trigger \
-    $(CONTROLLERS_DIR)/sensors \
-	$(CONTROLLERS_DIR)/sensors/converters \
 	$(CONTROLLERS_DIR)/can \
 	$(CONTROLLERS_DIR)/core \
 	$(CONTROLLERS_DIR)/gauges \

firmware/controllers/sensors/core/readme.md

@@ -0,0 +1 @@
+Folder for fancy sensor framework

firmware/controllers/sensors/impl/readme.md

@@ -0,0 +1 @@
+Folder for boring details related to specific sensors

firmware/controllers/sensors/sensors.mk

@@ -1,23 +1,31 @@
 
-CONTROLLERS_SENSORS_SRC_CPP = 	$(PROJECT_DIR)/controllers/sensors/thermistors.cpp \
+CONTROLLERS_SENSORS_SRC_CPP = \
+	$(PROJECT_DIR)/controllers/sensors/core/functional_sensor.cpp \
+	$(PROJECT_DIR)/controllers/sensors/core/sensor.cpp \
+ 	$(PROJECT_DIR)/controllers/sensors/thermistors.cpp \
 	$(PROJECT_DIR)/controllers/sensors/allsensors.cpp \
 	$(PROJECT_DIR)/controllers/sensors/auto_generated_sensor.cpp \
-	$(PROJECT_DIR)/controllers/sensors/map.cpp \
-	$(PROJECT_DIR)/controllers/sensors/maf.cpp \
+	$(PROJECT_DIR)/controllers/sensors/impl/AemXSeriesLambda.cpp \
+	$(PROJECT_DIR)/controllers/sensors/impl/map.cpp \
+	$(PROJECT_DIR)/controllers/sensors/impl/maf.cpp \
+	$(PROJECT_DIR)/controllers/sensors/impl/Lps25Sensor.cpp \
 	$(PROJECT_DIR)/controllers/sensors/tps.cpp \
-	$(PROJECT_DIR)/controllers/sensors/ego.cpp \
-	$(PROJECT_DIR)/controllers/sensors/sensor.cpp \
+	$(PROJECT_DIR)/controllers/sensors/impl/ego.cpp \
 	$(PROJECT_DIR)/controllers/sensors/sensor_info_printing.cpp \
 	$(PROJECT_DIR)/controllers/sensors/sensor_checker.cpp \
-	$(PROJECT_DIR)/controllers/sensors/functional_sensor.cpp \
 	$(PROJECT_DIR)/controllers/sensors/redundant_sensor.cpp \
 	$(PROJECT_DIR)/controllers/sensors/redundant_ford_tps.cpp \
-	$(PROJECT_DIR)/controllers/sensors/AemXSeriesLambda.cpp \
 	$(PROJECT_DIR)/controllers/sensors/frequency_sensor.cpp \
-	$(PROJECT_DIR)/controllers/sensors/software_knock.cpp \
-	$(PROJECT_DIR)/controllers/sensors/Lps25Sensor.cpp \
+	$(PROJECT_DIR)/controllers/sensors/impl/software_knock.cpp \
 	$(PROJECT_DIR)/controllers/sensors/converters/linear_func.cpp \
 	$(PROJECT_DIR)/controllers/sensors/converters/resistance_func.cpp \
 	$(PROJECT_DIR)/controllers/sensors/converters/thermistor_func.cpp \
 	$(PROJECT_DIR)/controllers/sensors/converters/identity_func.cpp \
 	$(PROJECT_DIR)/controllers/sensors/vr_pwm.cpp
+
+
+CONTROLLERS_SENSORS_INC=\
+    $(CONTROLLERS_DIR)/sensors \
+    $(CONTROLLERS_DIR)/sensors/core \
+    $(CONTROLLERS_DIR)/sensors/impl \
+	$(CONTROLLERS_DIR)/sensors/converters