diff --git a/firmware/common.mk b/firmware/common.mk index 084ac27805..7062b53bb2 100644 --- a/firmware/common.mk +++ b/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 \ diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk index 12f0e6fb16..7f2892c34c 100644 --- a/firmware/controllers/controllers.mk +++ b/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 \ diff --git a/firmware/controllers/sensors/fallback_sensor.h b/firmware/controllers/sensors/core/fallback_sensor.h similarity index 100% rename from firmware/controllers/sensors/fallback_sensor.h rename to firmware/controllers/sensors/core/fallback_sensor.h diff --git a/firmware/controllers/sensors/function_pointer_sensor.h b/firmware/controllers/sensors/core/function_pointer_sensor.h similarity index 100% rename from firmware/controllers/sensors/function_pointer_sensor.h rename to firmware/controllers/sensors/core/function_pointer_sensor.h diff --git a/firmware/controllers/sensors/functional_sensor.cpp b/firmware/controllers/sensors/core/functional_sensor.cpp similarity index 100% rename from firmware/controllers/sensors/functional_sensor.cpp rename to firmware/controllers/sensors/core/functional_sensor.cpp diff --git a/firmware/controllers/sensors/functional_sensor.h b/firmware/controllers/sensors/core/functional_sensor.h similarity index 100% rename from firmware/controllers/sensors/functional_sensor.h rename to firmware/controllers/sensors/core/functional_sensor.h diff --git a/firmware/controllers/sensors/proxy_sensor.h b/firmware/controllers/sensors/core/proxy_sensor.h similarity index 100% rename from firmware/controllers/sensors/proxy_sensor.h rename to firmware/controllers/sensors/core/proxy_sensor.h diff --git a/firmware/controllers/sensors/core/readme.md b/firmware/controllers/sensors/core/readme.md new file mode 100644 index 0000000000..f9498ed5dd --- /dev/null +++ b/firmware/controllers/sensors/core/readme.md @@ -0,0 +1 @@ +Folder for fancy sensor framework \ No newline at end of file diff --git a/firmware/controllers/sensors/sensor.cpp b/firmware/controllers/sensors/core/sensor.cpp similarity index 100% rename from firmware/controllers/sensors/sensor.cpp rename to firmware/controllers/sensors/core/sensor.cpp diff --git a/firmware/controllers/sensors/sensor.h b/firmware/controllers/sensors/core/sensor.h similarity index 100% rename from firmware/controllers/sensors/sensor.h rename to firmware/controllers/sensors/core/sensor.h diff --git a/firmware/controllers/sensors/stored_value_sensor.h b/firmware/controllers/sensors/core/stored_value_sensor.h similarity index 100% rename from firmware/controllers/sensors/stored_value_sensor.h rename to firmware/controllers/sensors/core/stored_value_sensor.h diff --git a/firmware/controllers/sensors/AemXSeriesLambda.cpp b/firmware/controllers/sensors/impl/AemXSeriesLambda.cpp similarity index 100% rename from firmware/controllers/sensors/AemXSeriesLambda.cpp rename to firmware/controllers/sensors/impl/AemXSeriesLambda.cpp diff --git a/firmware/controllers/sensors/AemXSeriesLambda.h b/firmware/controllers/sensors/impl/AemXSeriesLambda.h similarity index 100% rename from firmware/controllers/sensors/AemXSeriesLambda.h rename to firmware/controllers/sensors/impl/AemXSeriesLambda.h diff --git a/firmware/controllers/sensors/Lps25Sensor.cpp b/firmware/controllers/sensors/impl/Lps25Sensor.cpp similarity index 100% rename from firmware/controllers/sensors/Lps25Sensor.cpp rename to firmware/controllers/sensors/impl/Lps25Sensor.cpp diff --git a/firmware/controllers/sensors/Lps25Sensor.h b/firmware/controllers/sensors/impl/Lps25Sensor.h similarity index 100% rename from firmware/controllers/sensors/Lps25Sensor.h rename to firmware/controllers/sensors/impl/Lps25Sensor.h diff --git a/firmware/controllers/sensors/ego.cpp b/firmware/controllers/sensors/impl/ego.cpp similarity index 100% rename from firmware/controllers/sensors/ego.cpp rename to firmware/controllers/sensors/impl/ego.cpp diff --git a/firmware/controllers/sensors/ego.h b/firmware/controllers/sensors/impl/ego.h similarity index 100% rename from firmware/controllers/sensors/ego.h rename to firmware/controllers/sensors/impl/ego.h diff --git a/firmware/controllers/sensors/maf.cpp b/firmware/controllers/sensors/impl/maf.cpp similarity index 100% rename from firmware/controllers/sensors/maf.cpp rename to firmware/controllers/sensors/impl/maf.cpp diff --git a/firmware/controllers/sensors/maf.h b/firmware/controllers/sensors/impl/maf.h similarity index 100% rename from firmware/controllers/sensors/maf.h rename to firmware/controllers/sensors/impl/maf.h diff --git a/firmware/controllers/sensors/map.cpp b/firmware/controllers/sensors/impl/map.cpp similarity index 100% rename from firmware/controllers/sensors/map.cpp rename to firmware/controllers/sensors/impl/map.cpp diff --git a/firmware/controllers/sensors/map.h b/firmware/controllers/sensors/impl/map.h similarity index 100% rename from firmware/controllers/sensors/map.h rename to firmware/controllers/sensors/impl/map.h diff --git a/firmware/controllers/sensors/impl/readme.md b/firmware/controllers/sensors/impl/readme.md new file mode 100644 index 0000000000..a5b73690c2 --- /dev/null +++ b/firmware/controllers/sensors/impl/readme.md @@ -0,0 +1 @@ +Folder for boring details related to specific sensors \ No newline at end of file diff --git a/firmware/controllers/sensors/software_knock.cpp b/firmware/controllers/sensors/impl/software_knock.cpp similarity index 100% rename from firmware/controllers/sensors/software_knock.cpp rename to firmware/controllers/sensors/impl/software_knock.cpp diff --git a/firmware/controllers/sensors/software_knock.h b/firmware/controllers/sensors/impl/software_knock.h similarity index 100% rename from firmware/controllers/sensors/software_knock.h rename to firmware/controllers/sensors/impl/software_knock.h diff --git a/firmware/controllers/sensors/sensors.mk b/firmware/controllers/sensors/sensors.mk index 05cd15bc95..2bcbfba238 100644 --- a/firmware/controllers/sensors/sensors.mk +++ b/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