From f4e6fc911db3fdefda9508158fc16b6a5218d520 Mon Sep 17 00:00:00 2001 From: Raphael Luz <luz@ivt.tugraz.at> Date: Wed, 30 Jul 2014 14:47:46 +0200 Subject: [PATCH] * Updated generic vehicles with "Saved in Declaration Mode" flag --- .../12t Delivery Truck/12t Delivery Truck.vecto | 14 ++++++++++---- .../12t Delivery Truck/12t Delivery Truck.veng | 9 +++++---- .../12t Delivery Truck/12t Delivery Truck.vgbx | 12 +++++++----- .../12t Delivery Truck/12t Delivery Truck.vveh | 11 +++++------ .../40t_Long_Haul_Truck.vecto | 7 ++++--- .../40t Long Haul Truck/40t_Long_Haul_Truck.veng | 9 +++++---- .../40t Long Haul Truck/40t_Long_Haul_Truck.vgbx | 16 +++++++++------- .../40t Long Haul Truck/40t_Long_Haul_Truck.vveh | 7 ++++--- .../Engineering Mode/24t Coach/24t Coach.vecto | 9 +++++---- .../Engineering Mode/24t Coach/24t Coach.veng | 9 +++++---- .../Engineering Mode/24t Coach/24t Coach.vgbx | 12 +++++++----- .../Engineering Mode/24t Coach/24t Coach.vveh | 9 +++++---- 12 files changed, 71 insertions(+), 53 deletions(-) diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto index c7920c4599..6b93f38a31 100644 --- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto +++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto @@ -1,14 +1,20 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (50e1b2d7-43a7-42d0-97c3-d8d48709e28c)", - "Date": "23.04.2014 16:59:20", - "AppVersion": "1.5.0-pre0", - "FileVersion": 1 + "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", + "Date": "29.07.2014 16:58:58", + "AppVersion": "2.0.4-beta", + "FileVersion": 2 }, "Body": { + "SavedInDeclMode": true, "VehicleFile": "12t Delivery Truck.vveh", "EngineFile": "12t Delivery Truck.veng", "GearboxFile": "12t Delivery Truck.vgbx", + "Cycles": [ + "Long Haul", + "Regional Delivery", + "Urban Delivery" + ], "Aux": [ { "ID": "FAN", diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng index 0ffa78d016..c1e59fbeae 100644 --- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng +++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng @@ -1,11 +1,12 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (50e1b2d7-43a7-42d0-97c3-d8d48709e28c)", - "Date": "23.04.2014 17:02:49", - "AppVersion": "1.5.0-pre0", - "FileVersion": 1 + "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", + "Date": "29.07.2014 16:58:53", + "AppVersion": "2.0.4-beta", + "FileVersion": 2 }, "Body": { + "SavedInDeclMode": true, "ModelName": "Generic 12t Delivery Truck", "Displacement": 7700.0, "IdlingSpeed": 600.0, diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx index 78027c9a9c..71a6413e1f 100644 --- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx +++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx @@ -1,11 +1,12 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (50e1b2d7-43a7-42d0-97c3-d8d48709e28c)", - "Date": "23.04.2014 16:19:18", - "AppVersion": "1.5.0-pre0", - "FileVersion": 2 + "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", + "Date": "29.07.2014 16:58:58", + "AppVersion": "2.0.4-beta", + "FileVersion": 4 }, "Body": { + "SavedInDeclMode": true, "ModelName": "Generic 12t Delivery Truck", "Inertia": 0.0, "TracInt": 2.0, @@ -62,7 +63,8 @@ "TorqueConverter": { "Enabled": false, "File": "<NOFILE>", - "RefRPM": 0.0 + "RefRPM": 0.0, + "Inertia": 0.0 } } } \ No newline at end of file diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh index 86d704739b..7e48eda364 100644 --- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh +++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh @@ -1,11 +1,12 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (50e1b2d7-43a7-42d0-97c3-d8d48709e28c)", - "Date": "24.04.2014 09:11:31", - "AppVersion": "1.5.0-pre0", - "FileVersion": 3 + "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", + "Date": "29.07.2014 16:58:52", + "AppVersion": "2.0.4-beta", + "FileVersion": 5 }, "Body": { + "SavedInDeclMode": true, "VehCat": "RigidTruck", "CurbWeight": 5850.0, "CurbWeightExtra": 0.0, @@ -13,8 +14,6 @@ "MassMax": 11.9, "Cd": 0.6, "CrossSecArea": 8.8, - "CdRigid": 0.6, - "CrossSecAreaRigid": 8.8, "rdyn": 406.9297, "Rim": "15° DC Rims", "CdCorrMode": "CdOfV", diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto index 980dec24b6..0316339b1e 100644 --- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto +++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto @@ -1,11 +1,12 @@ { "Header": { "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", - "Date": "25.04.2014 16:10:17", - "AppVersion": "2.0.0-pre0", - "FileVersion": 1 + "Date": "29.07.2014 16:59:08", + "AppVersion": "2.0.4-beta", + "FileVersion": 2 }, "Body": { + "SavedInDeclMode": true, "VehicleFile": "40t_Long_Haul_Truck.vveh", "EngineFile": "40t_Long_Haul_Truck.veng", "GearboxFile": "40t_Long_Haul_Truck.vgbx", diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng index 0a43da6aa1..29f208aeee 100644 --- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng +++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng @@ -1,11 +1,12 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (50e1b2d7-43a7-42d0-97c3-d8d48709e28c)", - "Date": "24.04.2014 12:58:51", - "AppVersion": "1.5.0-pre1", - "FileVersion": 1 + "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", + "Date": "29.07.2014 16:59:04", + "AppVersion": "2.0.4-beta", + "FileVersion": 2 }, "Body": { + "SavedInDeclMode": true, "ModelName": "Generic 40t Long Haul Truck", "Displacement": 12730.0, "IdlingSpeed": 560.0, diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx index 1449b46de4..3ac2c59374 100644 --- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx +++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx @@ -1,14 +1,15 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (50e1b2d7-43a7-42d0-97c3-d8d48709e28c)", - "Date": "24.04.2014 12:59:10", - "AppVersion": "1.5.0-pre1", - "FileVersion": 2 + "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", + "Date": "29.07.2014 16:59:06", + "AppVersion": "2.0.4-beta", + "FileVersion": 4 }, "Body": { + "SavedInDeclMode": true, "ModelName": "Generic 40t Long Haul Truck", "Inertia": 0.0, - "TracInt": 2.0, + "TracInt": 1.0, "Gears": [ { "Ratio": 2.59, @@ -89,7 +90,7 @@ ], "TqReserve": 20.0, "SkipGears": true, - "ShiftTime": 3, + "ShiftTime": 2, "EaryShiftUp": true, "StartTqReserve": 20.0, "StartSpeed": 2.0, @@ -98,7 +99,8 @@ "TorqueConverter": { "Enabled": false, "File": "<NOFILE>", - "RefRPM": 0.0 + "RefRPM": 0.0, + "Inertia": 0.0 } } } \ No newline at end of file diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh index 8052c713ab..41d41402bb 100644 --- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh +++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh @@ -1,11 +1,12 @@ { "Header": { "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", - "Date": "25.04.2014 16:11:12", - "AppVersion": "2.0.0-pre0", - "FileVersion": 4 + "Date": "29.07.2014 16:59:03", + "AppVersion": "2.0.4-beta", + "FileVersion": 5 }, "Body": { + "SavedInDeclMode": true, "VehCat": "Tractor", "CurbWeight": 7100.0, "CurbWeightExtra": 0.0, diff --git a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto index ecde8a84e8..b91cde410f 100644 --- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto +++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto @@ -1,11 +1,12 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (50e1b2d7-43a7-42d0-97c3-d8d48709e28c)", - "Date": "24.04.2014 11:32:29", - "AppVersion": "1.5.0-pre1", - "FileVersion": 1 + "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", + "Date": "29.07.2014 16:59:17", + "AppVersion": "2.0.4-beta", + "FileVersion": 2 }, "Body": { + "SavedInDeclMode": false, "VehicleFile": "24t Coach.vveh", "EngineFile": "24t Coach.veng", "GearboxFile": "24t Coach.vgbx", diff --git a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng index 4028b6cb5d..45a0b3979f 100644 --- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng +++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng @@ -1,11 +1,12 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (50e1b2d7-43a7-42d0-97c3-d8d48709e28c)", - "Date": "24.04.2014 11:35:13", - "AppVersion": "1.5.0-pre1", - "FileVersion": 1 + "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", + "Date": "29.07.2014 16:59:15", + "AppVersion": "2.0.4-beta", + "FileVersion": 2 }, "Body": { + "SavedInDeclMode": false, "ModelName": "Generic 24t Coach", "Displacement": 12730.0, "IdlingSpeed": 560.0, diff --git a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx index 9b9d2dacfd..4fdb98db9e 100644 --- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx +++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx @@ -1,11 +1,12 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (50e1b2d7-43a7-42d0-97c3-d8d48709e28c)", - "Date": "24.04.2014 13:04:04", - "AppVersion": "1.5.0-pre1", - "FileVersion": 2 + "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", + "Date": "29.07.2014 16:59:17", + "AppVersion": "2.0.4-beta", + "FileVersion": 4 }, "Body": { + "SavedInDeclMode": false, "ModelName": "Generic 24t Coach", "Inertia": 0.0, "TracInt": 1.0, @@ -74,7 +75,8 @@ "TorqueConverter": { "Enabled": false, "File": "<NOFILE>", - "RefRPM": 0.0 + "RefRPM": 0.0, + "Inertia": 0.0 } } } \ No newline at end of file diff --git a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh index c364ae87be..cf5749149d 100644 --- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh +++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh @@ -1,11 +1,12 @@ { "Header": { - "CreatedBy": "Raphael Luz IVT TU-Graz (50e1b2d7-43a7-42d0-97c3-d8d48709e28c)", - "Date": "24.04.2014 11:35:05", - "AppVersion": "1.5.0-pre1", - "FileVersion": 4 + "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)", + "Date": "29.07.2014 16:59:13", + "AppVersion": "2.0.4-beta", + "FileVersion": 5 }, "Body": { + "SavedInDeclMode": false, "VehCat": "Coach", "CurbWeight": 15700.0, "CurbWeightExtra": 0.0, -- GitLab