From be1fa7057d4d5e9db3bde254ec843895cee13b65 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 5 Oct 2021 16:06:17 -0700 Subject: [PATCH] break up sensors even more (#3318) --- firmware/console/status_loop.cpp | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index a8e3f02ee6..d57260eaab 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -548,21 +548,15 @@ static void updateRawSensors() { tsOutputChannels.rawIdlePositionSensor = Sensor::getRaw(SensorType::IdlePosition); } -static void updateSensors(int rpm) { - updateTempSensors(); - updateThrottles(); - updateRawSensors(); - updateLambda(); - updateFuelSensors(); - updateVvtSensors(); - updateVehicleSpeed(rpm); - - tsOutputChannels.vBatt = Sensor::get(SensorType::BatteryVoltage).value_or(0); +static void updatePressures() { tsOutputChannels.baroPressure = Sensor::get(SensorType::BarometricPressure).value_or(0); tsOutputChannels.manifoldAirPressure = Sensor::get(SensorType::Map).value_or(0); - tsOutputChannels.oilPressure = Sensor::get(SensorType::OilPressure).Value; +} +static void updateMiscSensors() { + tsOutputChannels.vBatt = Sensor::get(SensorType::BatteryVoltage).value_or(0); + tsOutputChannels.idlePositionSensor = Sensor::get(SensorType::IdlePosition).value_or(0); tsOutputChannels.wastegatePosition = Sensor::get(SensorType::WastegatePosition).value_or(0); @@ -575,6 +569,18 @@ static void updateSensors(int rpm) { tsOutputChannels.tCharge = ENGINE(engineState.sd.tCharge); } +static void updateSensors(int rpm) { + updateTempSensors(); + updateThrottles(); + updateRawSensors(); + updateLambda(); + updateFuelSensors(); + updateVvtSensors(); + updateVehicleSpeed(rpm); + updatePressures(); + updateMiscSensors(); +} + static void updateFuelCorrections() { tsOutputChannels.baroCorrection = engine->engineState.baroCorrection; tsOutputChannels.iatCorrection = ENGINE(engineState.running.intakeTemperatureCoefficient);