From d7e9c906815aed23772689fb4815673702ccf544 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 15 Jun 2022 10:48:52 +0200
Subject: [PATCH] correct IEPC losses output in case EM is off disable ADAS
features not relevant for IEPCs
---
.../GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx | 2 +-
VECTO/GUI/VehicleForm.vb | 12 ++++++++++++
.../Models/SimulationComponent/Impl/IEPC.cs | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx
index 8c4b5d9467..96a5496c2e 100644
--- a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx
@@ -21,7 +21,7 @@
"StartTqReserve": 20.0,
"StartSpeed": 2.22222222222222,
"StartAcc": 0.8,
- "GearboxType": "AMT",
+ "GearboxType": "IEPC",
"TorqueConverter": {
"Enabled": false
},
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index f0eeab8f8b..1783d6aaaa 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -698,6 +698,12 @@ Public Class VehicleForm
gbEMTorqueLimits.Enabled = False
tcVehicleComponents.TabPages.Remove(tpTorqueLimits)
+ 'ADAS ---------------------------------------------------------------------
+ cbEngineStopStart.Visible = False
+ cbAtEcoRollReleaseLockupClutch.Visible = False
+ pnEcoRoll.Visible = False
+ cbEcoRoll.SelectedIndex = 0
+
'PTO
gbPTO.Enabled = False
pnPTO.Enabled = false
@@ -710,6 +716,12 @@ Public Class VehicleForm
gbEMTorqueLimits.Enabled = False
tcVehicleComponents.TabPages.Remove(tpTorqueLimits)
+ 'ADAS ---------------------------------------------------------------------
+ cbEngineStopStart.Visible = False
+ cbAtEcoRollReleaseLockupClutch.Visible = False
+ pnEcoRoll.Visible = False
+ cbEcoRoll.SelectedIndex = 0
+
'PTO
gbPTO.Enabled = False
pnPTO.Enabled = false
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs
index 9fabd94583..64ab097e1a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs
@@ -41,7 +41,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl{
container[ModalResultField.P_IEPC_el_, Position] = CurrentState.ElectricPowerToBattery;
- container[ModalResultField.P_IEPC_electricMotorLoss_, Position] = (CurrentState.EmTorqueMap ?? 0.SI<NewtonMeter>()) * avgEMSpeed - CurrentState.ElectricPowerToBattery;
+ container[ModalResultField.P_IEPC_electricMotorLoss_, Position] = (CurrentState.DrivetrainInTorque - CurrentState.DrivetrainOutTorque) * avgDTSpeed - CurrentState.ElectricPowerToBattery;
//container[ModalResultField.P_EM_TransmissionLoss_, Position] = CurrentState.TransmissionTorqueLoss * avgDTSpeed;
--
GitLab