From c250d321dc313c067961bc0a239c4e39ee26b40f Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 2 Feb 2024 09:48:51 -0500 Subject: [PATCH] only:Slip ratio using #5897 --- firmware/controllers/algo/defaults/default_base_engine.cpp | 2 ++ firmware/init/sensor/init_aux_speed_sensor.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp index f1ea95e15f..cd2fda575b 100644 --- a/firmware/controllers/algo/defaults/default_base_engine.cpp +++ b/firmware/controllers/algo/defaults/default_base_engine.cpp @@ -73,6 +73,8 @@ void setDefaultBaseEngine() { engineConfiguration->fan1ExtraIdle = 2; engineConfiguration->fan2ExtraIdle = 2; + engineConfiguration->auxSpeed1Multiplier = 1; + engineConfiguration->acrRevolutions = 5; engineConfiguration->watchOutForLinearTime = true; diff --git a/firmware/init/sensor/init_aux_speed_sensor.cpp b/firmware/init/sensor/init_aux_speed_sensor.cpp index 4586507dda..d9e9bfab55 100644 --- a/firmware/init/sensor/init_aux_speed_sensor.cpp +++ b/firmware/init/sensor/init_aux_speed_sensor.cpp @@ -23,11 +23,13 @@ public: SensorResult get() const final override { auto value1 = auxSpeed1.get(); - auto value2 = auxSpeed2.get(); + auto value2 = engineConfiguration->useVssAsSecondWheelSpeed ? Sensor::get(SensorType::VehicleSpeed) : auxSpeed2.get(); if (!value1.Valid || !value2.Valid) { return UnexpectedCode::Unknown; } - float result = value1.Value / value2.Value; + // todo: remove handling of zero in July of 2024 + float correctedAuxSpeed1Multiplier = engineConfiguration->auxSpeed1Multiplier == 0 ? 1 : engineConfiguration->auxSpeed1Multiplier; + float result = value1.Value * correctedAuxSpeed1Multiplier / value2.Value; return result; }