Merge branch 'master' into develop

Conflicts: Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng

Merge branch 'master' into develop
f1de7281 · Michael KRISPER · b952a5eb · 82dc0217 · f1de7281 · f1de7281
Commit f1de7281 authored 9 years ago by Michael KRISPER
--- a/CHANGES.md
+++ b/CHANGES.md

 ### VECTO x.x (current source)

+TODO
+* Traction interruption: No engine rev down - hold rpm until new gear engaged (Allison)

+### VECTO 2.2
+* Bugfix: Error in Declaration Mode Pneumatic System aux power calculation ([kW] were interpreted as [W])
+* Bugfix: Error in Declaration Mode Electric System aux power calculation
+* Moved gear-specific Full Load Curves to Gearbox File
+* Combined Drag Coefficient * Cross Sectional Area in one input parameter
+* Updated .vgbx file format (Added gear-specific Full Load Curves)
+* Updated .veng file format (Removed gear-specific Full Load Curves)
+* Updated .vveh file format (Combined Drag Coefficient * Cross Sectional Area in one parameter)
+* Updated Generic Vehicles (new file formats)
+* Removed WHTC Correction Factor Calculation. Now in external tool, VECTO-Engine.
+* Test Options are now only available in Engineering Mode
+* Gearbox Editor now shows generic and user-defined shift polygons (if available)
+* Various small updates in GUI
+
+### VECTO 2.1.4
+* Bugfixes in start gear and (A)MT shift model
+* Updated Coach .vcdv file for higher speeds to avoid extrapolation
+* Renamed output "FC" to "FC-Map" for better clarification
+* Same header for g/h and g/km output
+* Reduced minimum turbine speed for 1C-to-2C AT up-shift condition from 900 to 700rpm.
+* Updated cross wind correction parameters to current White Book values
+
+### VECTO 2.1.3
+* PwheelPos output in VSUM file.
+* Implemented new Cd*A(v) method
+* Bugfix in TC model
+* Bugfix: Unit error in Cd(v) methods caused incorrect Delta-Cd value being used
+
+### VECTO 2.1.2
+* Improved TC iteration for higher precision
+* Extended possible TC speed ratio 
+
+### VECTO 2.1.1
+* Bugfix: Incorrect torque calculation in AT/TC model caused early up-shifts
+* Updated C-to-C shift strategy with acc_min rule (see V2.1)
+
+### VECTO 2.1
+* Limit engine rpm in torque converter operation acc. > acc_min
+* Shift up (C-to-L, L-to-L) if acc. > acc_min and next-gear-rpm > threshold
+* C-to-C up-shift condition based on N80h engine speed (instead of N95h)
+* Pwheel-Input (SiCo Mode)
+* FC [g/h] is always saved in output (in addition to [g/km]), not only in Engine Only mode
+* Updated DEV options for AT update
+* "DEV" tab is now "Test"
+* GUI: Corrected air density unit in GUI
+* Bugfix: Format error in .vmod header
+
+### VECTO 2.0.4-beta4_Test (Test Release)
+* Transmission loss extrapolation Errors are now Warnings in Engineering Mode.
+* Bugfix: Error in TC Iteration caused crash
+* Bugfix: Minimizing Graph window caused crash
+* Fixed error in cycle conversion
+* Errors if full load curve is too "short"
+
+### VECTO 2.0.4-beta3
+* Bugfix: VECTO didn't check if the full load curve covers the speed range up to nhi. Now it will abort if the full load curve is "too short"
+* Update in Torque Convert model: Allowed engine speed range up to n95h (before: Pmax-speed)
+* Bugfix: Rare crashes caused by gear shift model
+* Bugfix: Error in engine inertia power calculation
+* Torque Converter losses in modal results
+* Implemented speed profile cleaning for very small values. (Caused shifting back to first gear when decelerating.)
+* DEV Option for advanced CSV format output (units line, additional info)

 ### VECTO 2.0.4-beta2
 * Bugfix: VECTO freezed if torque converter creeping was not possible due to low full load torque. Now it will abort with error message.
 * Bugfix: Small fixes in torque converter model

-
 ### VECTO 2.0.4-beta1
 * Updated CSV format of some declaration config files
 * Various bugfixes in AT model

--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto
 {
  "Header": {
-    "CreatedBy": " ()",
-    "Date": "3/4/2015 12:31:06 PM",
-    "AppVersion": "2.0.4-beta3",
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "24.06.2015 12:03:58",
+    "AppVersion": "2.2 beta",
    "FileVersion": 2
  },
  "Body": {
-    "SavedInDeclMode": false,
+    "SavedInDeclMode": true,
    "VehicleFile": "12t Delivery Truck.vveh",
    "EngineFile": "12t Delivery Truck.veng",
    "GearboxFile": "12t Delivery Truck.vgbx",
@@ -20,36 +20,36 @@
        "ID": "FAN",
        "Type": "Fan",
        "Path": "<NOFILE>",
-        "Technology": ""
+        "Technology": "Belt driven or driven via transm. - Discrete step clutch"
      },
      {
        "ID": "STP",
        "Type": "Steering pump",
        "Path": "<NOFILE>",
-        "Technology": ""
+        "Technology": "Variable displacement"
      },
      {
        "ID": "AC",
        "Type": "HVAC",
        "Path": "<NOFILE>",
-        "Technology": ""
+        "Technology": "Default"
      },
      {
        "ID": "ES",
        "Type": "Electric System",
        "Path": "<NOFILE>",
-        "Technology": "",
+        "Technology": "Custom Technology List",
        "TechList": []
      },
      {
        "ID": "PS",
        "Type": "Pneumatic System",
        "Path": "<NOFILE>",
-        "Technology": ""
+        "Technology": "Default"
      }
    ],
    "VACC": "<NOFILE>",
-    "EngineOnlyMode": true,
+    "EngineOnlyMode": false,
    "StartStop": {
      "Enabled": false,
      "MaxSpeed": 5.0,

--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng
 {
  "Header": {
-    "CreatedBy": " ()",
-    "Date": "3/4/2015 12:31:04 PM",
-    "AppVersion": "2.0.4-beta3",
-    "FileVersion": 2
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "25.06.2015 08:59:55",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 3
  },
  "Body": {
-    "SavedInDeclMode": false,
+    "SavedInDeclMode": true,
    "ModelName": "Generic 12t Delivery Truck",
    "Displacement": 7700.0,
    "IdlingSpeed": 600.0,
    "Inertia": 3.789,
-    "FullLoadCurves": [
-      {
-        "Path": "12t Delivery Truck.vfld",
-        "Gears": "0 - 99"
-      }
-    ],
+    "FullLoadCurve": "12t Delivery Truck.vfld",
    "FuelMap": "12t Delivery Truck.vmap",
-    "WHTC-Urban": 215.0,
-    "WHTC-Rural": 202.0,
-    "WHTC-Motorway": 204.0
+    "WHTC-Urban": 0.99,
+    "WHTC-Rural": 0.99,
+    "WHTC-Motorway": 1.01
  }
 }
\ No newline at end of file
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx
 {
  "Header": {
-    "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
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "24.06.2015 09:33:31",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 5
  },
  "Body": {
    "SavedInDeclMode": true,
@@ -19,37 +19,43 @@
        "Ratio": 6.75,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 3.6,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 2.13,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 1.39,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 1.0,
        "LossMap": "Direct Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 0.78,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      }
    ],
    "TqReserve": 20.0,

--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh
 {
  "Header": {
-    "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
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "02.07.2015 13:55:36",
+    "AppVersion": "2.2 beta-2",
+    "FileVersion": 7
  },
  "Body": {
    "SavedInDeclMode": true,
@@ -12,12 +12,11 @@
    "CurbWeightExtra": 0.0,
    "Loading": 0.0,
    "MassMax": 11.9,
-    "Cd": 0.6,
-    "CrossSecArea": 8.8,
+    "CdA": 5.28,
    "rdyn": 406.9297,
    "Rim": "15° DC Rims",
-    "CdCorrMode": "CdOfV",
-    "CdCorrFile": "12t Delivery Truck.vcdv",
+    "CdCorrMode": "CdOfVdecl",
+    "CdCorrFile": "<NOFILE>",
    "Retarder": {
      "Type": "None",
      "Ratio": 1.0,
@@ -28,7 +27,7 @@
      "Axles": [
        {
          "Inertia": 6.0,
-          "Wheels": "245/70 R 19.5",
+          "Wheels": "245/70 R19.5",
          "AxleWeightShare": 0.0,
          "TwinTyres": false,
          "RRCISO": 0.008343465,
@@ -36,7 +35,7 @@
        },
        {
          "Inertia": 6.0,
-          "Wheels": "245/70 R 19.5",
+          "Wheels": "245/70 R19.5",
          "AxleWeightShare": 0.0,
          "TwinTyres": true,
          "RRCISO": 0.00943769,

--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm
@@ -6,7 +6,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 0,450,4.23,
 0,650,5.23,
 0,850,6.23,
-0,1050,7.23,
+0,1200,7.23,
 200,-350,4.126,
 200,-150,3.126,
 200,50,2.626,
@@ -14,7 +14,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 200,450,4.626,
 200,650,5.626,
 200,850,6.626,
-200,1050,7.626,
+200,1200,7.626,
 400,-350,4.522,
 400,-150,3.522,
 400,50,3.022,
@@ -22,7 +22,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 400,450,5.022,
 400,650,6.022,
 400,850,7.022,
-400,1050,8.022,
+400,1200,8.022,
 600,-350,4.918,
 600,-150,3.918,
 600,50,3.418,
@@ -30,7 +30,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 600,450,5.418,
 600,650,6.418,
 600,850,7.418,
-600,1050,8.418,
+600,1200,8.418,
 800,-350,5.314,
 800,-150,4.314,
 800,50,3.814,
@@ -38,7 +38,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 800,450,5.814,
 800,650,6.814,
 800,850,7.814,
-800,1050,8.814,
+800,1200,8.814,
 1000,-350,5.71,
 1000,-150,4.71,
 1000,50,4.21,
@@ -46,7 +46,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1000,450,6.21,
 1000,650,7.21,
 1000,850,8.21,
-1000,1050,9.21,
+1000,1200,9.21,
 1200,-350,6.106,
 1200,-150,5.106,
 1200,50,4.606,
@@ -54,7 +54,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1200,450,6.606,
 1200,650,7.606,
 1200,850,8.606,
-1200,1050,9.606,
+1200,1200,9.606,
 1400,-350,6.502,
 1400,-150,5.502,
 1400,50,5.002,
@@ -62,7 +62,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1400,450,7.002,
 1400,650,8.002,
 1400,850,9.002,
-1400,1050,10.002,
+1400,1200,10.002,
 1600,-350,6.898,
 1600,-150,5.898,
 1600,50,5.398,
@@ -70,7 +70,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1600,450,7.398,
 1600,650,8.398,
 1600,850,9.398,
-1600,1050,10.398,
+1600,1200,10.398,
 1800,-350,7.294,
 1800,-150,6.294,
 1800,50,5.794,
@@ -78,7 +78,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1800,450,7.794,
 1800,650,8.794,
 1800,850,9.794,
-1800,1050,10.794,
+1800,1200,10.794,
 2000,-350,7.69,
 2000,-150,6.69,
 2000,50,6.19,
@@ -86,7 +86,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2000,450,8.19,
 2000,650,9.19,
 2000,850,10.19,
-2000,1050,11.19,
+2000,1200,11.19,
 2200,-350,8.086,
 2200,-150,7.086,
 2200,50,6.586,
@@ -94,7 +94,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2200,450,8.586,
 2200,650,9.586,
 2200,850,10.586,
-2200,1050,11.586,
+2200,1200,11.586,
 2400,-350,8.482,
 2400,-150,7.482,
 2400,50,6.982,
@@ -102,7 +102,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2400,450,8.982,
 2400,650,9.982,
 2400,850,10.982,
-2400,1050,11.982,
+2400,1200,11.982,
 0,-1000,6.98,
 200,-1000,7.376,
 400,-1000,7.772,

--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm
@@ -7,6 +7,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 0,650,14.98,
 0,850,18.98,
 0,1050,22.98,
+0,1600,27
 200,-350,9.376,
 200,-150,5.376,
 200,50,3.376,
@@ -15,6 +16,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 200,650,15.376,
 200,850,19.376,
 200,1050,23.376,
+200,1600,28
 400,-350,9.772,
 400,-150,5.772,
 400,50,3.772,
@@ -23,6 +25,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 400,650,15.772,
 400,850,19.772,
 400,1050,23.772,
+400,1600,28
 600,-350,10.168,
 600,-150,6.168,
 600,50,4.168,
@@ -31,6 +34,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 600,650,16.168,
 600,850,20.168,
 600,1050,24.168,
+600,1600,28.8
 800,-350,10.564,
 800,-150,6.564,
 800,50,4.564,
@@ -39,6 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 800,650,16.564,
 800,850,20.564,
 800,1050,24.564,
+800,1600,29
 1000,-350,10.96,
 1000,-150,6.96,
 1000,50,4.96,
@@ -47,6 +52,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1000,650,16.96,
 1000,850,20.96,
 1000,1050,24.96,
+1000,1600,30
 1200,-350,11.356,
 1200,-150,7.356,
 1200,50,5.356,
@@ -55,6 +61,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1200,650,17.356,
 1200,850,21.356,
 1200,1050,25.356,
+1200,1600,30
 1400,-350,11.752,
 1400,-150,7.752,
 1400,50,5.752,
@@ -63,6 +70,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1400,650,17.752,
 1400,850,21.752,
 1400,1050,25.752,
+1400,1600,31
 1600,-350,12.148,
 1600,-150,8.148,
 1600,50,6.148,
@@ -71,6 +79,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1600,650,18.148,
 1600,850,22.148,
 1600,1050,26.148,
+1600,1600,31
 1800,-350,12.544,
 1800,-150,8.544,
 1800,50,6.544,
@@ -79,6 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1800,650,18.544,
 1800,850,22.544,
 1800,1050,26.544,
+1800,1600,32
 2000,-350,12.94,
 2000,-150,8.94,
 2000,50,6.94,
@@ -87,6 +97,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2000,650,18.94,
 2000,850,22.94,
 2000,1050,26.94,
+2000,1600,32
 2200,-350,13.336,
 2200,-150,9.336,
 2200,50,7.336,
@@ -95,6 +106,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2200,650,19.336,
 2200,850,23.336,
 2200,1050,27.336,
+2200,1600,33
 2400,-350,13.732,
 2400,-150,9.732,
 2400,50,7.732,
@@ -103,13 +115,14 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2400,650,19.732,
 2400,850,23.732,
 2400,1050,27.732,
+2400,1600,33
 0,-1000,21.98,
 200,-1000,22.376,
 400,-1000,22.772,
 600,-1000,23.168,
 800,-1000,23.564,
 1000,-1000,23.96,
-1200,-1000,24.356,
+1250,-1000,24.356,
 1400,-1000,24.752,
 1600,-1000,25.148,
 1800,-1000,25.544,

--- 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
 {
  "Header": {
-    "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
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "25.06.2015 09:02:39",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 3
  },
  "Body": {
    "SavedInDeclMode": true,
@@ -11,15 +11,10 @@
    "Displacement": 12730.0,
    "IdlingSpeed": 560.0,
    "Inertia": 5.1471,
-    "FullLoadCurves": [
-      {
-        "Path": "40t_Long_Haul_Truck.vfld",
-        "Gears": "0 - 99"
-      }
-    ],
+    "FullLoadCurve": "40t_Long_Haul_Truck.vfld",
    "FuelMap": "40t_Long_Haul_Truck.vmap",
-    "WHTC-Urban": 199.84,
-    "WHTC-Rural": 192.89,
-    "WHTC-Motorway": 193.155
+    "WHTC-Urban": 0.97,
+    "WHTC-Rural": 0.99,
+    "WHTC-Motorway": 1.02
  }
 }
\ No newline at end of file
--- 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
 {
  "Header": {
-    "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
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "24.06.2015 09:43:54",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 5
  },
  "Body": {
    "SavedInDeclMode": true,
@@ -19,73 +19,85 @@
        "Ratio": 14.93,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 11.64,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 9.02,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 7.04,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 5.64,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 4.4,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 3.39,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 2.65,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 2.05,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 1.6,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 1.28,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 1.0,
        "LossMap": "Direct Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "-"
+        "ShiftPolygon": "-",
+        "FullLoadCurve": "<NOFILE>"
      }
    ],
    "TqReserve": 20.0,

--- 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
 {
  "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
-    "Date": "29.07.2014 16:59:03",
-    "AppVersion": "2.0.4-beta",
-    "FileVersion": 5
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "02.07.2015 13:55:39",
+    "AppVersion": "2.2 beta-2",
+    "FileVersion": 7
  },
  "Body": {
    "SavedInDeclMode": true,
@@ -12,12 +12,11 @@
    "CurbWeightExtra": 0.0,
    "Loading": 0.0,
    "MassMax": 40.0,
-    "Cd": 0.663,
-    "CrossSecArea": 9.5,
+    "CdA": 6.2985,
    "rdyn": 488.2675,
    "Rim": "5° DC Rims",
-    "CdCorrMode": "CdOfV",
-    "CdCorrFile": "40t_Long_Haul_Truck.vcdv",
+    "CdCorrMode": "CdOfVdecl",
+    "CdCorrFile": "<NOFILE>",
    "Retarder": {
      "Type": "Secondary",
      "Ratio": 1.0,
@@ -28,7 +27,7 @@
      "Axles": [
        {
          "Inertia": 14.9,
-          "Wheels": "315/70 R 22.5",
+          "Wheels": "315/70 R22.5",
          "AxleWeightShare": 0.0,
          "TwinTyres": false,
          "RRCISO": 0.00555,
@@ -36,7 +35,7 @@
        },
        {
          "Inertia": 14.9,
-          "Wheels": "315/70 R 22.5",
+          "Wheels": "315/70 R22.5",
          "AxleWeightShare": 0.0,
          "TwinTyres": true,
          "RRCISO": 0.00628,

--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 0,1850,14.31
 0,2050,15.31
 0,2250,16.31
-0,2450,17.31
+0,2800,17.31
 100,-350,7.316
 100,-150,6.316
 100,50,5.816
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 100,1850,14.816
 100,2050,15.816
 100,2250,16.816
-100,2450,17.816
+100,2800,17.816
 300,-350,8.328
 300,-150,7.328
 300,50,6.828
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 300,1850,15.828
 300,2050,16.828
 300,2250,17.828
-300,2450,18.828
+300,2800,18.828
 500,-350,9.34
 500,-150,8.34
 500,50,7.84
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 500,1850,16.84
 500,2050,17.84
 500,2250,18.84
-500,2450,19.84
+500,2800,19.84
 700,-350,10.352
 700,-150,9.352
 700,50,8.852
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 700,1850,17.852
 700,2050,18.852
 700,2250,19.852
-700,2450,20.852
+700,2800,20.852
 900,-350,11.364
 900,-150,10.364
 900,50,9.864
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 900,1850,18.864
 900,2050,19.864
 900,2250,20.864
-900,2450,21.864
+900,2800,21.864
 1100,-350,12.376
 1100,-150,11.376
 1100,50,10.876
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1100,1850,19.876
 1100,2050,20.876
 1100,2250,21.876
-1100,2450,22.876
+1100,2800,22.876
 1300,-350,13.388
 1300,-150,12.388
 1300,50,11.888
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1300,1850,20.888
 1300,2050,21.888
 1300,2250,22.888
-1300,2450,23.888
+1300,2800,23.888
 1500,-350,14.4
 1500,-150,13.4
 1500,50,12.9
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1500,1850,21.9
 1500,2050,22.9
 1500,2250,23.9
-1500,2450,24.9
+1500,2800,24.9
 1700,-350,15.412
 1700,-150,14.412
 1700,50,13.912
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1700,1850,22.912
 1700,2050,23.912
 1700,2250,24.912
-1700,2450,25.912
+1700,2800,25.912
 1900,-350,16.424
 1900,-150,15.424
 1900,50,14.924
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1900,1850,23.924
 1900,2050,24.924
 1900,2250,25.924
-1900,2450,26.924
+1900,2800,26.924
 2100,-350,17.436
 2100,-150,16.436
 2100,50,15.936
@@ -178,7 +178,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 2100,1850,24.936
 2100,2050,25.936
 2100,2250,26.936
-2100,2450,27.936
+2100,2800,27.936
 0,-1000,10.06
 100,-1000,10.566
 300,-1000,11.578

--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 0,1850,42.06
 0,2050,46.06
 0,2250,50.06
-0,2450,54.06
+0,3000,54.06
 100,-350,12.566
 100,-150,8.566
 100,50,6.566
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 100,1850,42.566
 100,2050,46.566
 100,2250,50.566
-100,2450,54.566
+100,3000,54.566
 300,-350,13.578
 300,-150,9.578
 300,50,7.578
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 300,1850,43.578
 300,2050,47.578
 300,2250,51.578
-300,2450,55.578
+300,3000,55.578
 500,-350,14.59
 500,-150,10.59
 500,50,8.59
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 500,1850,44.59
 500,2050,48.59
 500,2250,52.59
-500,2450,56.59
+500,3000,56.59
 700,-350,15.602
 700,-150,11.602
 700,50,9.602
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 700,1850,45.602
 700,2050,49.602
 700,2250,53.602
-700,2450,57.602
+700,3000,57.602
 900,-350,16.614
 900,-150,12.614
 900,50,10.614
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 900,1850,46.614
 900,2050,50.614
 900,2250,54.614
-900,2450,58.614
+900,3000,58.614
 1100,-350,17.626
 1100,-150,13.626
 1100,50,11.626
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1100,1850,47.626
 1100,2050,51.626
 1100,2250,55.626
-1100,2450,59.626
+1100,3000,59.626
 1300,-350,18.638
 1300,-150,14.638
 1300,50,12.638
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1300,1850,48.638
 1300,2050,52.638
 1300,2250,56.638
-1300,2450,60.638
+1300,3000,60.638
 1500,-350,19.65
 1500,-150,15.65
 1500,50,13.65
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1500,1850,49.65
 1500,2050,53.65
 1500,2250,57.65
-1500,2450,61.65
+1500,3000,61.65
 1700,-350,20.662
 1700,-150,16.662
 1700,50,14.662
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1700,1850,50.662
 1700,2050,54.662
 1700,2250,58.662
-1700,2450,62.662
+1700,3000,62.662
 1900,-350,21.674
 1900,-150,17.674
 1900,50,15.674
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1900,1850,51.674
 1900,2050,55.674
 1900,2250,59.674
-1900,2450,63.674
+1900,3000,63.674
 2100,-350,22.686
 2100,-150,18.686
 2100,50,16.686
@@ -178,7 +178,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 2100,1850,52.686
 2100,2050,56.686
 2100,2250,60.686
-2100,2450,64.686
+2100,3000,64.686
 0,-1000,25.06
 100,-1000,25.566
 300,-1000,26.578

--- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vcdv
+++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vcdv
@@ -20,3 +20,5 @@
 90,1.06160070824245
 95,1.05601203497592
 100,1.05120696831716
+105,1.0477
+110,1.045
--- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng
+++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng
 {
  "Header": {
-    "CreatedBy": " ()",
-    "Date": "3/4/2015 12:26:24 PM",
-    "AppVersion": "2.0.4-beta3",
-    "FileVersion": 2
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "25.06.2015 11:23:22",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 3
  },
  "Body": {
    "SavedInDeclMode": false,
@@ -11,12 +11,7 @@
    "Displacement": 12730.0,
    "IdlingSpeed": 560.0,
    "Inertia": 3.8,
-    "FullLoadCurves": [
-      {
-        "Path": "24t Coach.vfld",
-        "Gears": "0 - 99"
-      }
-    ],
+    "FullLoadCurve": "24t Coach.vfld",
    "FuelMap": "24t Coach.vmap",
    "WHTC-Urban": 0.0,
    "WHTC-Rural": 0.0,

--- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx
+++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx
 {
  "Header": {
-    "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
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "25.06.2015 11:23:31",
+    "AppVersion": "2.2 beta",
+    "FileVersion": 5
  },
  "Body": {
    "SavedInDeclMode": false,
@@ -19,49 +19,57 @@
        "Ratio": 6.38,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 4.63,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 3.44,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 2.59,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 1.86,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 1.35,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 1.0,
        "LossMap": "Direct Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
      },
      {
        "Ratio": 0.76,
        "LossMap": "Indirect Gear.vtlm",
        "TCactive": false,
-        "ShiftPolygon": "ShiftPolygons.vgbs"
+        "ShiftPolygon": "ShiftPolygons.vgbs",
+        "FullLoadCurve": "<NOFILE>"
      }
    ],
    "TqReserve": 20.0,

--- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh
+++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh
 {
  "Header": {
-    "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
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "02.07.2015 13:55:46",
+    "AppVersion": "2.2 beta-2",
+    "FileVersion": 7
  },
  "Body": {
    "SavedInDeclMode": false,
@@ -12,11 +12,10 @@
    "CurbWeightExtra": 0.0,
    "Loading": 3300.0,
    "MassMax": 24.0,
-    "Cd": 0.441,
-    "CrossSecArea": 7.4,
+    "CdA": 3.2634,
    "rdyn": 520.0,
    "Rim": "-",
-    "CdCorrMode": "CdOfV",
+    "CdCorrMode": "CdOfVeng",
    "CdCorrFile": "24t Coach.vcdv",
    "Retarder": {
      "Type": "Secondary",

--- a/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm
+++ b/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 0,1850,14.31,
 0,2050,15.31,
 0,2250,16.31,
-0,2450,17.31,
+0,2700,17.31,
 200,-350,7.822,
 200,-150,6.822,
 200,50,6.322,
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 200,1850,15.322,
 200,2050,16.322,
 200,2250,17.322,
-200,2450,18.322,
+200,2700,18.322,
 400,-350,8.834,
 400,-150,7.834,
 400,50,7.334,
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 400,1850,16.334,
 400,2050,17.334,
 400,2250,18.334,
-400,2450,19.334,
+400,2700,19.334,
 600,-350,9.846,
 600,-150,8.846,
 600,50,8.346,
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 600,1850,17.346,
 600,2050,18.346,
 600,2250,19.346,
-600,2450,20.346,
+600,2700,20.346,
 800,-350,10.858,
 800,-150,9.858,
 800,50,9.358,
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 800,1850,18.358,
 800,2050,19.358,
 800,2250,20.358,
-800,2450,21.358,
+800,2700,21.358,
 1000,-350,11.87,
 1000,-150,10.87,
 1000,50,10.37,
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1000,1850,19.37,
 1000,2050,20.37,
 1000,2250,21.37,
-1000,2450,22.37,
+1000,2700,22.37,
 1200,-350,12.882,
 1200,-150,11.882,
 1200,50,11.382,
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1200,1850,20.382,
 1200,2050,21.382,
 1200,2250,22.382,
-1200,2450,23.382,
+1200,2700,23.382,
 1400,-350,13.894,
 1400,-150,12.894,
 1400,50,12.394,
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1400,1850,21.394,
 1400,2050,22.394,
 1400,2250,23.394,
-1400,2450,24.394,
+1400,2700,24.394,
 1600,-350,14.906,
 1600,-150,13.906,
 1600,50,13.406,
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1600,1850,22.406,
 1600,2050,23.406,
 1600,2250,24.406,
-1600,2450,25.406,
+1600,2700,25.406,
 1800,-350,15.918,
 1800,-150,14.918,
 1800,50,14.418,
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1800,1850,23.418,
 1800,2050,24.418,
 1800,2250,25.418,
-1800,2450,26.418,
+1800,2700,26.418,
 2000,-350,16.93,
 2000,-150,15.93,
 2000,50,15.43,
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2000,1850,24.43,
 2000,2050,25.43,
 2000,2250,26.43,
-2000,2450,27.43,
+2000,2700,27.43,
 0,-1000,10.06,
 200,-1000,11.072,
 400,-1000,12.084,

--- a/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm
+++ b/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 0,1850,42.06,
 0,2050,46.06,
 0,2250,50.06,
-0,2450,54.06,
+0,2700,54.06,
 200,-350,13.072,
 200,-150,9.072,
 200,50,7.072,
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 200,1850,43.072,
 200,2050,47.072,
 200,2250,51.072,
-200,2450,55.072,
+200,2700,55.072,
 400,-350,14.084,
 400,-150,10.084,
 400,50,8.084,
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 400,1850,44.084,
 400,2050,48.084,
 400,2250,52.084,
-400,2450,56.084,
+400,2700,56.084,
 600,-350,15.096,
 600,-150,11.096,
 600,50,9.096,
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 600,1850,45.096,
 600,2050,49.096,
 600,2250,53.096,
-600,2450,57.096,
+600,2700,57.096,
 800,-350,16.108,
 800,-150,12.108,
 800,50,10.108,
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 800,1850,46.108,
 800,2050,50.108,
 800,2250,54.108,
-800,2450,58.108,
+800,2700,58.108,
 1000,-350,17.12,
 1000,-150,13.12,
 1000,50,11.12,
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1000,1850,47.12,
 1000,2050,51.12,
 1000,2250,55.12,
-1000,2450,59.12,
+1000,2700,59.12,
 1200,-350,18.132,
 1200,-150,14.132,
 1200,50,12.132,
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1200,1850,48.132,
 1200,2050,52.132,
 1200,2250,56.132,
-1200,2450,60.132,
+1200,2700,60.132,
 1400,-350,19.144,
 1400,-150,15.144,
 1400,50,13.144,
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1400,1850,49.144,
 1400,2050,53.144,
 1400,2250,57.144,
-1400,2450,61.144,
+1400,2700,61.144,
 1600,-350,20.156,
 1600,-150,16.156,
 1600,50,14.156,
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1600,1850,50.156,
 1600,2050,54.156,
 1600,2250,58.156,
-1600,2450,62.156,
+1600,2700,62.156,
 1800,-350,21.168,
 1800,-150,17.168,
 1800,50,15.168,
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 1800,1850,51.168,
 1800,2050,55.168,
 1800,2250,59.168,
-1800,2450,63.168,
+1800,2700,63.168,
 2000,-350,22.18,
 2000,-150,18.18,
 2000,50,16.18,
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
 2000,1850,52.18,
 2000,2050,56.18,
 2000,2250,60.18,
-2000,2450,64.18,
+2000,2700,64.18,
 0,-1000,25.06,
 200,-1000,26.072,
 400,-1000,27.084,

--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/AT Bus Demo.vecto
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/AT Bus Demo.vecto
+{
+  "Header": {
+    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+    "Date": "22.04.2015 15:19:30",
+    "AppVersion": "2.1",
+    "FileVersion": 2
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "VehicleFile": "Vehicle.vveh",
+    "EngineFile": "Engine.veng",
+    "GearboxFile": "Gearbox.vgbx",
+    "Cycles": [
+      "zykl_Citybus_1_Heavy_Urban.vdri",
+      "zykl_Citybus_2_Urban.vdri",
+      "zykl_Citybus_3_Suburban.vdri"
+    ],
+    "Aux": [
+      {
+        "ID": "ALT",
+        "Type": "Alternator",
+        "Path": "Alt.vaux",
+        "Technology": ""
+      }
+    ],
+    "VACC": "test.vacc",
+    "EngineOnlyMode": false,
+    "StartStop": {
+      "Enabled": false,
+      "MaxSpeed": 5.0,
+      "MinTime": 5.0,
+      "Delay": 0
+    },
+    "LAC": {
+      "Enabled": false,
+      "Dec": -0.5,
+      "MinSpeed": 50.0
+    },
+    "OverSpeedEcoRoll": {
+      "Mode": "Off",
+      "MinSpeed": 0.0,
+      "OverSpeed": 0.0,
+      "UnderSpeed": 0.0
+    }
+  }
+}
\ No newline at end of file
--- a/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/AT-Shift.vgbs
+++ b/Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/AT-Shift.vgbs
+M_shift in Nm,n_down in rpm,n_up in rpm
+-200,600,800
+0,600,800
+3000,600,800