From 8b8a59eebd318434364cf5fa40829a0c7833cf98 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Thu, 7 Apr 2016 08:46:23 +0200 Subject: [PATCH] adaptations bus-aux adapter, all aaux --- .../SimulationComponent/Impl/BusAuxiliariesAdapter.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs index e0ced1b91a..09a46b3711 100644 --- a/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs +++ b/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs @@ -190,8 +190,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl // set internal_engine_power to a large value (*10) so that there's excessive power for smart aux (alreadin during search operating point) //(float)DataBus.EngineDragPower(angularSpeed).Value() / 100; } else { - Auxiliaries.Signals.Internal_Engine_Power = - (float)((torqueEngine * angularSpeed - DataBus.BrakePower) / 1000).Value(); + if (DataBus.DrivingBehavior != DrivingBehavior.Braking) { + Auxiliaries.Signals.Internal_Engine_Power = 0; + //(float)((0.9 * torqueEngine * angularSpeed - DataBus.BrakePower) / 1000).Value(); + } else { + // smart aux should be on during braking + } } Auxiliaries.Signals.EngineMotoringPower = -(float)DataBus.EngineDragPower(angularSpeed).Value() / 1000; Auxiliaries.Signals.EngineSpeed = (int)(angularSpeed.Value() / Constants.RPMToRad); -- GitLab