From 73dde4439662fc9692d3a8a2189a576460045309 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 14 Jun 2022 09:23:33 +0200
Subject: [PATCH] move setting driving behavior in current state a little up so
that it is also set in case the gearbox is disengaged
---
.../VectoCore/Models/SimulationComponent/Impl/Gearbox.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
index ed4a81f1f7..aa931e68de 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
@@ -272,6 +272,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
(DataBus.Brakes.BrakePower.IsGreater(0) || inTorque.IsSmaller(0));
var vehicleSpeedBelowThreshold =
DataBus.VehicleInfo.VehicleSpeed.IsSmaller(ModelData.DisengageWhenHaltingSpeed);
+ if (!dryRun) {
+ CurrentState.DrivingBehavior = DataBus.DriverInfo.DriverBehavior;
+ }
+
if (halted || (driverDeceleratingNegTorque && vehicleSpeedBelowThreshold)) {
EngageTime = VectoMath.Max(EngageTime, absTime + dt);
_strategy?.Disengage(absTime, dt, outTorque, outAngularVelocity);
@@ -284,10 +288,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return RequestGearDisengaged(absTime, dt, outTorque, outAngularVelocity, inTorque, dryRun);
}
- if (!dryRun) {
- CurrentState.DrivingBehavior = DataBus.DriverInfo.DriverBehavior;
- }
-
if (GearEngaged(absTime)) {
return RequestGearEngaged(absTime, dt, outTorque, outAngularVelocity, inTorque, inTorqueLossResult, inertiaTorqueLossOut, dryRun);
} else {
--
GitLab