diff --git a/firmware/init/init.h b/firmware/init/init.h index 79c70bb473..28632cafab 100644 --- a/firmware/init/init.h +++ b/firmware/init/init.h @@ -22,7 +22,7 @@ void initVbatt(); void initMaf(); void initMap(); void initTps(); -void initOilPressure(); +void initFluidPressure(); void initThermistors(); void initCanSensors(); void initLambda(); @@ -39,7 +39,7 @@ void initInputShaftSpeedSensor(); void deinitVbatt(); void deinitTps(); void deinitThermistors(); -void deinitOilPressure(); +void deinitFluidPressure(); void deInitFlexSensor(); void deInitVehicleSpeedSensor(); void deinitTurbochargerSpeedSensor(); diff --git a/firmware/init/sensor/init_fluid_pressure.cpp b/firmware/init/sensor/init_fluid_pressure.cpp index 7d846da448..fd219f8732 100644 --- a/firmware/init/sensor/init_fluid_pressure.cpp +++ b/firmware/init/sensor/init_fluid_pressure.cpp @@ -51,7 +51,7 @@ static void initFluidPressure(LinearFunc& func, FunctionalSensor& sensor, const sensor.Register(); } -void initOilPressure() { +void initFluidPressure() { initFluidPressure(oilpSensorFunc, oilpSensor, engineConfiguration->oilPressure, 10); initFluidPressure(fuelPressureFuncLow, fuelPressureSensorLow, engineConfiguration->lowPressureFuel, 10); initFluidPressure(fuelPressureFuncHigh, fuelPressureSensorHigh, engineConfiguration->highPressureFuel, 100); @@ -67,7 +67,7 @@ void initOilPressure() { injectorPressure.Register(); } -void deinitOilPressure() { +void deinitFluidPressure() { AdcSubscription::UnsubscribeSensor(oilpSensor); AdcSubscription::UnsubscribeSensor(fuelPressureSensorLow); AdcSubscription::UnsubscribeSensor(fuelPressureSensorHigh); diff --git a/firmware/init/sensor/init_sensors.cpp b/firmware/init/sensor/init_sensors.cpp index 42db66eeba..57e11d12d3 100644 --- a/firmware/init/sensor/init_sensors.cpp +++ b/firmware/init/sensor/init_sensors.cpp @@ -53,7 +53,7 @@ void initNewSensors() { initVbatt(); initMap(); initTps(); - initOilPressure(); + initFluidPressure(); initThermistors(); initLambda(); initFlexSensor(); @@ -88,7 +88,7 @@ void stopSensors() { deInitOldAnalogInputs(); deinitTps(); - deinitOilPressure(); + deinitFluidPressure(); deinitVbatt(); deinitThermistors(); deInitFlexSensor(); @@ -102,7 +102,7 @@ void stopSensors() { void reconfigureSensors() { initMap(); initTps(); - initOilPressure(); + initFluidPressure(); initVbatt(); initThermistors(); initFlexSensor(); diff --git a/unit_tests/tests/sensor/test_sensor_init.cpp b/unit_tests/tests/sensor/test_sensor_init.cpp index 90c8faef34..2be8a176c7 100644 --- a/unit_tests/tests/sensor/test_sensor_init.cpp +++ b/unit_tests/tests/sensor/test_sensor_init.cpp @@ -171,7 +171,7 @@ TEST(SensorInit, OilPressure) { engineConfiguration->oilPressure.value1 = 0; engineConfiguration->oilPressure.value2 = 1000; - initOilPressure(); + initFluidPressure(); // Ensure the sensors were registered auto s = const_cast(Sensor::getSensorOfType(SensorType::OilPressure));