From ee7abe0500470e5dc8489fc65c2f7e085d8802a2 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 20 Jul 2021 08:10:14 +0200
Subject: [PATCH] update battery state in test powertrain
---
.../Strategies/HybridStrategy.cs | 22 ++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index 8e80bc6cca..ac34ce3e78 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -57,6 +57,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
TestPowertrain.HybridController.Initialize(Controller.PreviousState.OutTorque, Controller.PreviousState.OutAngularVelocity);
TestPowertrain.Clutch.Initialize(DataBus.ClutchInfo.ClutchLosses);
TestPowertrain.Battery?.Initialize(DataBus.BatteryInfo.StateOfCharge);
+ if (TestPowertrain.Battery != null) {
+ TestPowertrain.Battery.PreviousState.PulseDuration =
+ (DataBus.BatteryInfo as Battery).PreviousState.PulseDuration;
+ }
if (TestPowertrain.BatterySystem != null) {
var batSystem = DataBus.BatteryInfo as BatterySystem;
foreach (var bsKey in batSystem.Batteries.Keys) {
@@ -65,6 +69,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
.Initialize(batSystem.Batteries[bsKey].Batteries[i].StateOfCharge);
}
}
+ TestPowertrain.BatterySystem.PreviousState.PulseDuration =
+ (DataBus.BatteryInfo as BatterySystem).PreviousState.PulseDuration;
}
TestPowertrain.SuperCap?.Initialize(DataBus.BatteryInfo.StateOfCharge);
@@ -214,8 +220,22 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
TestPowertrain.HybridController.ApplyStrategySettings(cfg);
TestPowertrain.HybridController.Initialize(Controller.PreviousState.OutTorque, Controller.PreviousState.OutAngularVelocity);
// TestPowertrain.Clutch.Initialize(DataBus.ClutchInfo.ClutchLosses);
-
TestPowertrain.Battery?.Initialize(DataBus.BatteryInfo.StateOfCharge);
+ if (TestPowertrain.Battery != null) {
+ TestPowertrain.Battery.PreviousState.PulseDuration =
+ (DataBus.BatteryInfo as Battery).PreviousState.PulseDuration;
+ }
+ if (TestPowertrain.BatterySystem != null) {
+ var batSystem = DataBus.BatteryInfo as BatterySystem;
+ foreach (var bsKey in batSystem.Batteries.Keys) {
+ for (var i = 0; i < batSystem.Batteries[bsKey].Batteries.Count; i++) {
+ TestPowertrain.BatterySystem.Batteries[bsKey].Batteries[i]
+ .Initialize(batSystem.Batteries[bsKey].Batteries[i].StateOfCharge);
+ }
+ }
+ TestPowertrain.BatterySystem.PreviousState.PulseDuration =
+ (DataBus.BatteryInfo as BatterySystem).PreviousState.PulseDuration;
+ }
TestPowertrain.SuperCap?.Initialize(DataBus.BatteryInfo.StateOfCharge);
TestPowertrain.Brakes.BrakePower = DataBus.Brakes.BrakePower;
--
GitLab