From ebf485bf2c5653e3ca8e69077d63acce1a9e2abd Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Wed, 28 Sep 2022 12:51:32 +0200
Subject: [PATCH] renamed Engineering Aux mod fields
---
VectoCore/VectoCore/Configuration/Constants.cs | 9 ++++++---
.../Reader/DataObjectAdapter/EngineeringDataAdapter.cs | 6 +++---
.../Models/EngineeringMode/EngineeringModeBusAuxTest.cs | 6 +++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/VectoCore/VectoCore/Configuration/Constants.cs b/VectoCore/VectoCore/Configuration/Constants.cs
index 041f88d044..d75c23de44 100644
--- a/VectoCore/VectoCore/Configuration/Constants.cs
+++ b/VectoCore/VectoCore/Configuration/Constants.cs
@@ -63,9 +63,12 @@ namespace TUGraz.VectoCore.Configuration
public const string Cond = "COND";
public const string PTOConsumer = "PTO_CONSUM";
- public const string ENG_AUX_MECH_BASE = "ENG_AUX_BASE";
- public const string ENG_AUX_MECH_FAN = "ENG_AUX_FAN";
- public const string ENG_AUX_MECH_STP = "ENG_AUX_STP";
+ /// <summary>
+ /// Engineering Mode
+ /// </summary>
+ public const string ENGMode_AUX_MECH_BASE = "ENG_AUX_BASE";
+ public const string ENGMode_AUX_MECH_FAN = "ENG_AUX_FAN";
+ public const string ENGMode_AUX_MECH_STP = "ENG_AUX_STP";
}
public static class Names
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index c710e6e897..23c5eac228 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -461,9 +461,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var fanDemand = pwrICEOn - pwrICEOffDriving;
var auxList = new List<VectoRunData.AuxData>() {
- new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENG_AUX_MECH_BASE, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = baseDemand},
- new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENG_AUX_MECH_STP, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = stpDemand},
- new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENG_AUX_MECH_FAN, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = fanDemand},
+ new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENGMode_AUX_MECH_BASE, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = baseDemand},
+ new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENGMode_AUX_MECH_STP, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = stpDemand},
+ new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENGMode_AUX_MECH_FAN, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = fanDemand},
};
return auxList;
diff --git a/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs b/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
index a6b7151618..48a6850a73 100644
--- a/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
@@ -955,9 +955,9 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
var fanDemand = pwrICEOn - pwrICEOffDriving;
var auxList = new List<VectoRunData.AuxData>() {
- new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENG_AUX_MECH_BASE, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = baseDemand},
- new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENG_AUX_MECH_STP, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = stpDemand},
- new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENG_AUX_MECH_FAN, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = fanDemand},
+ new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENGMode_AUX_MECH_BASE, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = baseDemand},
+ new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENGMode_AUX_MECH_STP, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = stpDemand},
+ new VectoRunData.AuxData { ID = Constants.Auxiliaries.IDs.ENGMode_AUX_MECH_FAN, DemandType = AuxiliaryDemandType.Constant, PowerDemandMech = fanDemand},
};
return auxList;
--
GitLab