From 8f684a3d85445186a9a750582d7fbacf3ce19dd2 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 5 Dec 2019 16:12:09 +0100
Subject: [PATCH] update vecto jobs to reference shift strategy parameters
---
.../ADAS/Group5EcoRollEng/Class5_Tractor_ENG.vecto | 5 +++--
.../Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto | 7 ++++---
.../ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto | 7 ++++---
.../ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto | 7 ++++---
.../ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto | 7 ++++---
.../Class_9_RigidTruck_AT_Eng_Neutral.vecto | 5 +++--
.../Class_9_RigidTruck_AT_Eng_TC.vecto | 5 +++--
7 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5EcoRollEng/Class5_Tractor_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5EcoRollEng/Class5_Tractor_ENG.vecto
index 8530549bed..a025dc169a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5EcoRollEng/Class5_Tractor_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5EcoRollEng/Class5_Tractor_ENG.vecto
@@ -11,6 +11,7 @@
"VehicleFile": "Class5_Tractor.vveh",
"EngineFile": "Engine_325kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
+ "TCU": "AMT_12.vgbx",
"AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
@@ -38,7 +39,7 @@
"OverSpeedEcoRoll": {
"Mode": "Overspeed",
"MinSpeed": 50.0,
- "OverSpeed": 2.5,
+ "OverSpeed": 2.5
},
"Cycles": [
"DriveDHSl1.1.vdri",
@@ -50,7 +51,7 @@
"DriveDHSl1.1_TS--.vdri",
"DriveDHSl1.1_TS-.vdri",
"DriveDHSl1.1_TS+.vdri",
- "DriveDHSl1.1_TS++.vdri",
+ "DriveDHSl1.1_TS++.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto
index 975346c4ba..765d3235ce 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto
@@ -11,7 +11,8 @@
"VehicleFile": "Class5_Tractor.vveh",
"EngineFile": "Engine_325kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
- "AuxiliaryAssembly": "Classic",
+ "TCU": "AMT_12.vgbx",
+ "AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [
@@ -32,7 +33,7 @@
"OverSpeedEcoRoll": {
"Mode": "Overspeed",
"MinSpeed": 50.0,
- "OverSpeed": 2.5,
+ "OverSpeed": 2.5
},
"Cycles": [
"CrestCoast1.vdri",
@@ -46,7 +47,7 @@
"Group5Eng_CaseG.vdri",
"Group5Eng_CaseH.vdri",
"Group5Eng_CaseI.vdri",
- "Group5Eng_CaseJ.vdri",
+ "Group5Eng_CaseJ.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto
index 5f031e6c15..1275ec928c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto
@@ -11,7 +11,8 @@
"VehicleFile": "Class5_Tractor_PCC12.vveh",
"EngineFile": "Engine_325kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
- "AuxiliaryAssembly": "Classic",
+ "TCU": "AMT_12.vgbx",
+ "AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [
@@ -32,7 +33,7 @@
"OverSpeedEcoRoll": {
"Mode": "Overspeed",
"MinSpeed": 50.0,
- "OverSpeed": 2.5,
+ "OverSpeed": 2.5
},
"Cycles": [
"CrestCoast1.vdri",
@@ -46,7 +47,7 @@
"Group5Eng_CaseG.vdri",
"Group5Eng_CaseH.vdri",
"Group5Eng_CaseI.vdri",
- "Group5Eng_CaseJ.vdri",
+ "Group5Eng_CaseJ.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto
index b6062724d9..27ab54830c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto
@@ -11,7 +11,8 @@
"VehicleFile": "Class5_Tractor_PCC123.vveh",
"EngineFile": "Engine_325kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
- "AuxiliaryAssembly": "Classic",
+ "TCU": "AMT_12.vgbx",
+ "AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [
@@ -32,7 +33,7 @@
"OverSpeedEcoRoll": {
"Mode": "Overspeed",
"MinSpeed": 50.0,
- "OverSpeed": 2.5,
+ "OverSpeed": 2.5
},
"Cycles": [
"CrestCoast1.vdri",
@@ -46,7 +47,7 @@
"Group5Eng_CaseG.vdri",
"Group5Eng_CaseH.vdri",
"Group5Eng_CaseI.vdri",
- "Group5Eng_CaseJ.vdri",
+ "Group5Eng_CaseJ.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto
index 0df3a73e66..7e435acf9b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoSS.vecto
@@ -11,7 +11,8 @@
"VehicleFile": "Class5_Tractor_PCC123EcoSS.vveh",
"EngineFile": "Engine_325kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
- "AuxiliaryAssembly": "Classic",
+ "TCU": "AMT_12.vgbx",
+ "AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [
@@ -32,7 +33,7 @@
"OverSpeedEcoRoll": {
"Mode": "Overspeed",
"MinSpeed": 50.0,
- "OverSpeed": 2.5,
+ "OverSpeed": 2.5
},
"Cycles": [
"CrestCoast1.vdri",
@@ -46,7 +47,7 @@
"Group5Eng_CaseG.vdri",
"Group5Eng_CaseH.vdri",
"Group5Eng_CaseI.vdri",
- "Group5Eng_CaseJ.vdri",
+ "Group5Eng_CaseJ.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto
index ad33dc2274..95df3eed85 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_Neutral.vecto
@@ -11,7 +11,8 @@
"VehicleFile": "RigidTruck_6x2_Neutral.vveh",
"EngineFile": "Engine_220kW.veng",
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
- "AuxiliaryAssembly": "Classic",
+ "TCU": "APT-S Generic TqMax1200.vgbx",
+ "AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [ ],
@@ -48,7 +49,7 @@
"DriveDHSl1.9_TS-.vdri",
"DriveDHSl1.9_TS+.vdri",
"DriveDHSl1.9_TS++.vdri",
- "DriveDHSl1.2.vdri",
+ "DriveDHSl1.2.vdri"
]
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto
index 77d1f4c23b..1964d3e393 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_RigidTruck_AT/Class_9_RigidTruck_AT_Eng_TC.vecto
@@ -11,7 +11,8 @@
"VehicleFile": "RigidTruck_6x2_TC.vveh",
"EngineFile": "Engine_220kW.veng",
"GearboxFile": "APT-S Generic TqMax1200.vgbx",
- "AuxiliaryAssembly": "Classic",
+ "TCU": "APT-S Generic TqMax1200.vgbx",
+ "AuxiliaryAssembly": "Classic",
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [ ],
@@ -47,7 +48,7 @@
"DriveDHSl1.9_TS--.vdri",
"DriveDHSl1.9_TS-.vdri",
"DriveDHSl1.9_TS+.vdri",
- "DriveDHSl1.9_TS++.vdri",
+ "DriveDHSl1.9_TS++.vdri"
]
}
}
\ No newline at end of file
--
GitLab