.gitignore

@@ -206,3 +206,4 @@ DISTR/
 Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/
 Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vmod
 Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vsum
+Documentation/User Manual/img/

Build/Packaging.targets

@@ -67,7 +67,7 @@
 		<UserManual Include="$(SolutionDir)Documentation\User Manual\help.html"/>
 		<UserManual Include="$(SolutionDir)Documentation\VectoHashingTool\HashingToolHelp.html"/>
 		<UserManual Include="$(SolutionDir)Documentation\XML\*.png"/>
-		<UserManual Include="$(SolutionDir)Documentation\XML\VectoParameters.html"/>
+		<UserManual Include="$(SolutionDir)Documentation\XML\VectoParameterDocumentation.html"/>
 		<UserManual Include="$(SolutionDir)Documentation\User Manual Source\JIRA Quick Start Guide.pdf"/>
 		<UserManual Include="$(SolutionDir)Documentation\Cdv_Generator_VECTO3.2.xlsx"/>
 		<ReleaseNotes Include="$(SolutionDir)Documentation\User Manual Source\Release Notes Vecto3.x.pdf"/>

Documentation/User Manual/1-user-interface/0_start.md

@@ -10,7 +10,7 @@ Software Requirements
 
    + Microsoft .NET Framework 4.5
 
-##Installation Options
+## Installation Options
 
 VECTO is distributed as a portable application. This means you can simply unzip the archive and directly execute it. This, however, requires write and execute permissions for the VECTO application directory.
 

Documentation/User Manual/1-user-interface/A_index.md

@@ -6,9 +6,9 @@ When VECTO starts the [Main Form](#main-form) is loaded. Closing this form will
 -	[Main Form](#main-form)
 -   [Settings](#settings)
 -	[Job Editor](#job-editor)
--   [Aux Dialog](#auxiliary-dialog)
--   [Advanced Auxiliary Dialog](#advanced-auxiliary-dialog)
 -	[Vehicle Editor](#vehicle-editor)
+-   [Aux Dialog](#auxiliary-dialog)
+-   [BusAux Dialog](#busauxiliary-dialog)
 -	[Engine Editor](#engine-editor)
 -	[Gearbox Editor](#gearbox-editor)
 -	[Graph Window](#graph-window)

Documentation/User Manual/1-user-interface/B_mainform.md

-##Main Form
+## Main Form
 
 
 
 ![](pics/mainform.svg)
 
 
-###Description
+### Description
 
 
 The Main Form is loaded when starting VECTO. Closing this form will close VECTO even if other dialogs are still open. In this form all global settings can be controlled and all other application dialogs can be opened.
@@ -18,10 +18,10 @@ The Main Form includes two tabs as described below:
 * Options Tab
 
 
-###Job Files Tab
+### Job Files Tab
 
 
-####Job Files List#
+#### Job Files List#
 
 Job files (.vecto) listed here will be used for calculation. Unchecked files will be ignored!
 Doubleclick entries to edit job files with the [VECTO Editor](#job-editor).
@@ -35,7 +35,7 @@ Doubleclick entries to edit job files with the [VECTO Editor](#job-editor).
 
 ![up](pics/Actions-arrow-up-icon.png)![down](pics/Actions-arrow-down-icon.png) ***Move selected files up or down in list***
 
-#####List Options#
+##### List Options#
 
 - **Save/Load List**
     - Save or load Job List to text file
@@ -50,13 +50,13 @@ Doubleclick entries to edit job files with the [VECTO Editor](#job-editor).
 
 
 
-####![START](pics/Play-icon.png) ***START Button***
+#### ![START](pics/Play-icon.png) ***START Button***
 
 Start VECTO in the selected mode (see [Options](#options-tab)).
 
 
 
-###Options Tab
+### Options Tab
 
 ![](pics/VECTO_OptionsTab.png)
 
@@ -89,7 +89,7 @@ Output values in vmod at beginning and end of simulation iterval
 ![](pics/VECTO_vmod_vgl.png)
 
 
-###Controls
+### Controls
 
 ![new](pics/blue-document-icon.png) New Job File
 : Create a new .vecto file using the [VECTO Editor](#job-editor)

Documentation/User Manual/1-user-interface/C_settings.md

-##Settings
+## Settings
 
 
 ![](pics/Settings.PNG)
 
 
-###Description
+### Description
 
 In the Settings dialog controls general application settings. The settings are saved in the [settings.json](#application-files) file.
 
-###Interface Settings
+### Interface Settings
 
 File Open Command
 :	This command will be used to open CSV Input Files like Driving Cycles (.vdri). See: [Run command![](pics/external-icon%2012x12.png)](http://en.wikipedia.org/wiki/Run_command)\
@@ -18,7 +18,7 @@ File Open Command
 :	***Example*** *: If the command is* ***excel*** *and the file is* ***C:\\VECTO\\cycle1.vdri*** *then VECTO will run:* ***excel "C:\\VECTO\\cycle1.vdri"***
 
 
-###Calculation Settings
+### Calculation Settings
 
 <div class="engineering">
 Air Density \[kg/m³\]
@@ -27,7 +27,7 @@ Air Density \[kg/m³\]
 This  setting is only used in Engineering mode. In Declaration mode the default value of 1.188 \[kg/m³\] is used.
 </div>
 
-###Controls
+### Controls
 
 
 Reset All Settings

Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md

-##Job Editor
+## Job Editor
 
 
 ![](pics/VECTO-Editor.png)
 
 
-###Description
+### Description
 
 The [job file (.vecto)](#job-file) includes all informations to run a VECTO calculation. It defines the vehicle and the driving cycle(s) to be used for calculation. In summary it defines:
 
@@ -16,14 +16,14 @@ The [job file (.vecto)](#job-file) includes all informations to run a VECTO calc
 -   Driving Cycles (only in Engineering Mode)
 
 
-###Relative File Paths
+### Relative File Paths
 
 It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths. Example: "Vehicles\\Vehicle1.vveh" points to the "Vehicles" subdirectory of the Job File's directoy.
 
 VECTO automatically uses relative paths if the input file (e.g. Vehicle File) is in the same directory as the Job File. (*Note:* The Job File must be saved before browsing for input files.)
 
 
-###General Settings
+### General Settings
 
 ![](pics/checkbox.png) Engine Only Mode
 
@@ -42,59 +42,86 @@ Filepath to the Engine File (.veng)
 Filepath ot the Gearbox File(.vgbx)
 :	Files can be created and edited using the [Gearbox Editor](#gearbox-editor).
 
+### Auxiliaries Tab
+
+![](pics/VECTO_JobEditor_Aux.png)
+
 <div class="declaration">
 Auxiliaries
-:	This group contains input elements to define the vehicle's load from the auxiliaries.
-In Declaration Mode only the pre-defined auxiliaries are available and their power-demand is also pre-defined, depending on the vehicle category and driving cycle. This means the Auxiliary Type is set to 'Classic: Vecto Auxiliary' and no 'Constant Aux Load' can be specified.
-The following list contains the pre-defined auxiliaries where the concrete technology for each auxiliary can be configured using the [Auxiliary Dialog](#auxiliary-dialog). 
-**Double-click** entries to edit with the [Auxiliary Dialog](#auxiliary-dialog).
+:   This group contains input elements to define the engine's load from the auxiliaries.
+In Declaration Mode only the pre-defined auxiliaries are available and their power-demand is also pre-defined, depending on the vehicle category and driving cycle. 
+The list contains the pre-defined auxiliaries where the concrete technology for each auxiliary can be configured using the [Auxiliary Dialog](#auxiliary-dialog). 
+**Double-click** entries to edit with the [Auxiliary Dialog](#auxiliary-dialog). No other types of auxiliaries can be used in declaration mode.
 </div>
 
 <div class="engineering">
 Auxiliaries
-:	In Engineering Mode the set of auxiliaries can be freely defined.
-First, the Auxiliary Type can be selected. If the Bus Auxiliaries are selected a configuration file for the Advanced Auxiliaries has to be specified. When using the Bus Auxiliaries, the standard auxiliaries can  be added as well in the list below to take into account the steering pump, etc.
-The 'Constant Aux Load' can be used to define a constant power demand from the auxiliaries (similar to P_add in the driving cycle, but constant over the whole cycle).
-The following list can be used to define the auxiliary load in more detail via a separate input file. The auxiliaries are configured using the [Auxiliary Dialog](#auxiliary-dialog). 
- For each auxiliary an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux) must be provided and the [driving cycle](#driving-cycles-.vdri) must include the corresponding supply power.
-**Double-click** entries to edit with the [Auxiliary Dialog](#auxiliary-dialog).
-: ![addaux](pics/plus-circle-icon.png) Add new Auxiliary
-: ![remaux](pics/minus-circle-icon.png) Remove the selected Auxiliary from the list
+:   In Engineering Mode the auxiliary power demand can be defined in three ways. 
+
+The first option is to define the power demand directly in the driving cycle in the column "Padd" (see [Driving Cycles](#driving-cycles-.vdri). This allows to vary the auxiliary load over distance (or time, for time-based driving cycles).
+
+The second option is to define a constant power demand over the whole cycle. The auxiliary power demand can be specified depending on whether the combustion engine is on or off and the vehicle is driving. The auxiliary power demand during engine-off phase is corrected in the [post-processing](#engine-fuel-consumption-correction).
+
+The third option is to use the bus-auxiliaries model. For details see the [Bus Auxiliaries model](#bus-auxiliaries).
 </div>
 
+
 See [Auxiliaries](#auxiliaries) for details.
 
+
+### Cycles Tab
+
+![](pics/VECTO_JobEditor_Cycles.png)
+
 Cycles
-:	List of cycles used for calculation. The .vdri format is described [here](#driving-cycles-.vdri).
+:   List of cycles used for calculation. The .vdri format is described [here](#driving-cycles-.vdri).
+
+<div class="declaration">
+In Declaration Mode, the cycles to be simulated depend on the vehicle group. The cycles are listed in this window for reference.
+</div>
+
+<div class="engineering">
+In Engineering Mode the cycles can be freely selected. All declaration cycles are provided in the Folder "Mission Profiles" and can be used or a custom cycle can be created and used.
+</div>
+
 **Double-click** an entry to open the file (see [File Open Command](#settings)).
-**Click** selected items to edit file paths.
 
+**Click** selected items to edit file paths.
 : ![addcycle](pics/plus-circle-icon.png) Add cycle (.vdri)
 : ![remcycle](pics/minus-circle-icon.png) Remove the selected cycle from the list
 
 
-###Driver Assist Tab
+### Driver Assist Tab
 
-![](pics/VECTO-Editor-DriverAssist.png)
+![](pics/JobForm_DriverModel.png)
 
 
-In this tab the driver assistance functions are enabled and parameterised.
+In this tab the driver assistance functions are enabled and parameterised. The parameters for overspeed, look-ahead coasting and driver acceleration can only be modified in Engineering Mode.
 
 Overspeed
-:	See [Overspeed](#overspeed) for details.
+:   See [Overspeed](#driver-overspeed) for details.
 
 Look-Ahead Coasting
-:	See [Look-Ahead Coasting](#driver-look-ahead-coasting) for details.
+:   See [Look-Ahead Coasting](#driver-look-ahead-coasting) for details.
 
 Acceleration Limiting
-:	See [Acceleration Limiting](#driver-acceleration-limiting) for details.
+:   See [Acceleration Limiting](#driver-acceleration-limiting) for details.
+
+
+### ADAS Parameters
+
+![](pics/JobForm_ADASParams.png)
+
+In this tab certain general parameters for the advanced driver assistant system model can be set. Which ADAS feature is available can be selected in the vehicle itself, in Engineering Mode parameters like minimum activation speed, activation delay, or allowed overspeed can be adjusted. In Declaration Mode all parameters are fixed.
+
+For details on the individual parameters see the corresponding section [Engine Stop/Start](#advanced-driver-assistant-systems-engine-stopstart), [Eco-Roll](#advanced-driver-assistant-systems-eco-roll), [Predictive Cruise Control](#advanced-driver-assistant-systems-predictive-cruise-control)
 
 
-###Chart Area
+### Chart Area
 
 If a valid [Vehicle File](#vehicle-editor), [Engine File](#engine-file-.veng) and [Gearbox File](#gearbox-file-.vgbx) is loaded into the Editor the main vehicle parameters like HDV group and axle configuration are shown here. The plot shows the full load curve(s) and sampling points of the fuel consumption map. 
 
-###Controls
+### Controls
 
 ![new](pics/blue-document-icon.png) New Job File
 :	Create a new empty .vecto file

Documentation/User Manual/1-user-interface/D2_VTP-Job-Editor.md

-##VTP-Job Editor
+## VTP-Job Editor
 
 
 ![](pics/VTP-Job.png)
 
 
-###Description
+### Description
 
 A VTP-Job is intended to verify the declared data of a vehicle through an on-road test. VTP-Jobs can be either simulated in engineering mode or declaration mode. For a VTP simulation the measured driving cycle along with the VECTO job-file is required. The driving cycle has to contain the vehicle's velocity, rotational speed of the driven wheels, torque of the driven wheels, and fuel consumption in a temporal resolution of 2Hz.
 VECTO computes the best matching gear based on the vehicle parameters, the actual vehicle speed and the engine speed.
@@ -25,7 +25,7 @@ In declaration mode only the first given driving cycle is simulated as the resul
 In declaration mode the manufacturer's record file needs to be provided. Furthermore, declaration mode simulations consider correction factors for the net calorific value of the used fuel and the vehicle's mileage. In engineering mode the according input fields are not shown.
 </div>
 
-###Relative File Paths
+### Relative File Paths
 
 It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths. Example: "Vehicles\\Vehicle1.xml" points to the "Vehicles" subdirectory of the Job File's directoy.
 
@@ -43,11 +43,11 @@ Cycles
 
 
 
-###Chart Area
+### Chart Area
 
 If a valid Vehicle File is loaded into the Editor the main vehicle parameters like HDV group and axle configuration are shown here. The plot shows the full load curve(s) and sampling points of the fuel consumption map. 
 
-###Controls
+### Controls
 
 ![new](pics/blue-document-icon.png) New Job File
 :	Create a new empty .vecto file

Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md

-##Auxiliary Dialog
+## Auxiliary Dialog
 
 
 
@@ -12,12 +12,12 @@
 ![Auxiliary Dialog (Engineering Mode)](pics/VECTO-Editor_Aux_ENG.jpg)
 </div>
 
-###Description
+### Description
 
 
 The Auxiliary Dialog is used to configure auxiliaries. In [Declaration Mode](#declaration-mode) the set of auxiliaries and their power demand is pre-defined. For every auxiliary the user has to select the technology from a given list. In [Engineering Mode](#engineering-mode) the set of auxiliaries can be specified by the user. Auxiliary efficieny is defined using an [Auxiliary Input File (.vaux)](#auxiliary-input-file-.vaux). See [Auxiliaries](#auxiliaries) for details on how the power demand for each auxiliary is calculated.
 
-###Settings
+### Settings
 
 <div class="declaration">
 Technology
@@ -40,9 +40,78 @@ Input File
 
 
 
-###Controls
+### Controls
 
 
 ![ok](pics/OK.png) ***Save and close***
 
 ![cancel](pics/Cancel.png) ***Close without saving***
+
+
+
+## BusAuxiliary Dialog
+
+<div class="engineering">
+
+![](pics/BusAux_Engineering.png)
+
+In Engineering Mode the electrical and mechanical power demand for the electric system, the pneumatic system and the HVAC can be provided.
+
+#### Electric System
+
+Current Demand Engine On
+:   Demand of the electric system when the ICE is on. The current is multiplied with the nominal voltage of 28.3V.
+
+Current Demand Engine Off Driving
+:   Demand of the electric system when the ICE is off and the vehicle is driving. The current is multiplied with the nominal voltage of 28.3V.
+
+Current Demand Engine Off Standstill
+:   Demand of the electric system when the ICE is off and the vehicle is at standstill. The current is multiplied with the nominal voltage of 28.3V.
+
+Alternator Efficiency
+:   The electric power demand is divided by the alternator efficiency to get the mechanical power demand at the crank shaft
+
+Alternator Technology
+:   The "conventional alternator" generated exactly the electric power as demanded by the auxiliaries. The "smart alternator" may generate more electric power than needed during braking phases. The exessive electric power is stored in a battery. In case "no alternator" is selected (only available for xEV vehicles) the electric system is supplied from the high voltage REESS via a DC/DC converter.
+
+Max Recuperation Power
+:   In case of a smart alternator, defines the maximum electric power the alternator can generate during braking phases.
+
+Useable Electric Storage Capacity
+:   In case of a smart alternator, defines the storage capacity of the battery. In case the battery is not empty, the electric auxiliaries are supplied from the battery. Excessive electric energy from the smart alternator during braking phases is stored in the battery.
+
+Electric Storage Efficiency
+:   This efficiency is applied when storing electric energy from the alternator in the battery.
+
+ESS supply from HEV REESS
+:   If selected, the low-voltage electric auxiliaries can be supplied from the high voltage REESS via the DC/DC converter. Needs to be selected in case "no alternator" is chosen as alternator technology. In case of a smart alternator, the low-voltage battery is used first and if empty the energy is drawn from the high voltage system.
+
+#### Pneumatic System
+
+Compressor Map
+:   [Compressor map file](#advanced-compressor-map-.acmp) defining the mechanical power demand and the air flow depending on the compressor speed.
+
+Average Air Demand
+:    Defines the average demand of copressed air througout the cycle.
+
+Compressor Ratio
+:    Defines the ratio between the air compressor and combustio engine
+
+Smart Air Compressor
+:    If enabled, the air compressor may generate excessive air during braking events. The air consumed and generated are [corrected in post processing](#engine-fuel-consumption-correction).
+
+#### HVAC System
+
+Mechanical Power Demand
+:   Power demand of the HVAC system directly applied at the crank shaft
+
+Electric Power Demand
+:   Electric power demand of the HVAC system. This is added to the current demand of the electric system
+
+Aux Heater Power
+:   Maximum power of the auxiliary heater
+
+Average Heating Demand
+:   Heating demand for the passenger compartment. This demand is primary satisfied from the combustion engines waste heat. In case the heating demand is higher, the auxiliary heater may provide additional heating power. The fuel consumption of the aux heater is [corrected in post processing](#engine-fuel-consumption-correction).
+
+</div>	

Documentation/User Manual/1-user-interface/F_VEH-Editor.md

-##Vehicle Editor
+## Vehicle Editor
 
 ![](pics/VEH-Editor.PNG)
 
-###Description
+### Description
 
 The [Vehicle File (.vveh)](#vehicle-file-.vveh) defines the main vehicle/chassis parameters like axles including [RRC](#vehicle-rolling-resistance-coefficient)s, air resistance and masses.
 
 The Vehicle Editor contains 3 tabs to edit all vehicle-related parameters. The 'General' tab allows to input mass, loading, air resistance, vehicle axles, etc. The 'Powertrain' allows to define the retarder, an optional angle drive, or PTO consumer. In the third tab the engine torque can be limited to a maximum for individual gears.
 
-###Relative File Paths
+### Relative File Paths
 
 It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
 Example: "Demo\\RT1.vrlm" points to the "Demo" subdirectory of the Vehicle File's directoy.
 
 VECTO automatically uses relative paths if the input file (e.g. Retarder Losses File) is in the same directory as the Vehicle File. (*Note:* The Vehicle File must be saved before browsing for input files.)
 
-###General vehicle parameters
+### General vehicle parameters
 
 Vehicle Category
 : Needed for [Declaration Mode](#declaration-mode) to identify the HDV Group.
@@ -29,7 +29,7 @@ Technically Permissible Maximum Laden Mass [t]
 HDV Group
 : Displays the automatically selected HDV Group depending on the settings above.
 
-###Masses/Loading
+### Masses/Loading
 
 Corrected Actual Curb Mass Vehicle
 : Specifies the vehicle's mass without loading
@@ -50,7 +50,7 @@ Loading
 In Declaration Mode only the vehicle itself needs to be specified. Depending on the vehicle category and mission the simulation adds a standard trailer for certain missions.
 </div>
 
-###Air Resistance and Corss Wind Correction Options
+### Air Resistance and Corss Wind Correction Options
 
 The product of Drag Coefficient [-] and Cross Sectional Area [m²] (**c~d~ x A**) and **Air Density** [kg/m³] (see [Settings](#settings)) together with the vehicle speed defines the Air Resistance. Vecto uses the combined value **c~d x A** as input. 
 **Note that the Air Drag depends on the chosen [**Cross Wind Correction**](#vehicle-cross-wind-correction).**
@@ -71,12 +71,15 @@ In delcaration mode the 'Speed dependent (Declaration Mode)' cross-wind correcti
 
 Depending on the chosen mode either a [Speed Dependent Cross Wind Correction Input File (.vcdv)](#speed-dependent-cross-wind-correction-input-file-.vcdv) or a [Vair & Beta Cross Wind Correction Input File (.vcdb)](#speed-dependent-cross-wind-correction-input-file-.vcdv) must be defined. For details see [Cross Wind Correction](#vehicle-cross-wind-correction).
 
-###Dynamic Tyre Radius
+### Dynamic Tyre Radius
 
 In [Engineering Mode](#engineering-mode) this defines the effective (dynamic) wheel radius (in [mm]) used to calculate engine speed. In [Declaration Mode](#declaration-mode) the radius calculated automatically using tyres of the powered axle.
 
+### Vehicle Idling Speed
 
-###Axles/Wheels
+The idling speed of the combustion engine can be increased in the vehicle settings. This may be necessary due to certain auxiliaries or for other technical reasons. This value is only considered if it is higher than the idling speed defined in the combustion engine.
+
+### Axles/Wheels
 
 For each axle the parameters **Relative axle load, RRC~ISO~** and **F~zISO~** have to be given in order to calculate the total [Rolling Resistance Coefficient](#vehicle-rolling-resistance-coefficient).
 
@@ -97,21 +100,50 @@ For missions with a trailer predefined wheels and load-shares are added by Vecto
 Doubleclick entries to edit existing axle configurations.
 
 
-###Retarder Losses
+### Controls
+
+
+![](pics/blue-document-icon.png) New file
+: Create a new empty .vveh file
+
+![](pics/Open-icon.png) Open existing file
+: Open an existing .vveh file
+
+![](pics/Actions-document-save-icon.png) ***Save current file***
+
+![](pics/Actions-document-save-as-icon.png) ***Save file as...***
+
+![](pics/export-icon.png) Send current file to the [VECTO Editor](#job-editor)
+: **Note:** If the current file was opened via the [VECTO Editor](#job-editor) the file will be sent automatically when saved.
+
+![](pics/OK.png) Save and close file
+: If necessary the file path in the [VECTO Editor](#job-editor) will be updated.
+
+![](pics/Cancel.png) ***Cancel without saving***
+
+
+
+## Vehicle Editor -- Powertrain Tab
+
+![](pics/VehicleForm_Powertrain.png)
+
+
+### Retarder Losses
 
 If a separate retarder is used in the vehicle a **Retarder Torque Loss Map** can be defined here to consider idling losses caused by the retarder.
 
-Four options are available:
+The following options are available:
 : -   No retarder
 -	Included in Transmission Loss Maps: Use this if the [Transmission Loss Maps](#transmission-loss-map-.vtlm) already include retarder losses.
--   Primary Retarder (before gearbox): The rpm ratio is relative to the engine speed
--   Secondary Retarder (after gearbox): The rpm ratio is relative to the cardan shaft speed
-
-Both, primary and secondary retarders, require an [Retarder Torque Loss Input File (.vrlm)](#retarder-loss-torque-input-file-.vrlm).
+-   Primary Retarder (before gearbox, transmission input retarder): The rpm ratio is relative to the engine speed.
+-   Secondary Retarder (after gearbox, transmission output retarder): The rpm ratio is relative to the cardan shaft speed.
+-   Engine Retarder: Used this if the engine already includes the retarder losses.
+-   Axlegear Input Retarder (after axlegear): The rpm ratio is relative to the axlegear input shaft speed. Only available for battery electric vehicles with E3 motor, serial hybrid with S3 motor, S-IEPC, and E-IEPC.
 
-The Retarder Ratio defines the ratio between the engine speed/cardan shaft speed and the retarder.
+Primary, secondary and axlegear input retarder require an [Retarder Torque Loss Input File (.vrlm)](#retarder-loss-torque-input-file-.vrlm).
+The retarder ratio defines the ratio between the engine speed/cardan shaft speed and the retarder.
 
-###Angledrive
+### Angledrive
 
 If an angledrive is used in the vehicle, it can be defined here.
 Three options are available:
@@ -121,41 +153,63 @@ Three options are available:
 - Included in transmission: Use this if the gearbox already includes the transmission losses for the angledrive in the respective transmission loss maps.
 
 
-###PTO Transmission
+## Vehicle Editor -- Torque Limits Tab
 
-If the vehicle has an PTO consumer, a pto transmission and consumer can be defined here. (Only in [Engineering Mode](#engineering-mode))
+![](pics/VehicleForm_TorqueLimits.png)
 
-Three settings can be set:
+On this tab different torque limits can be applied at the vehicle level. For details which limits are applicable and who the limits are applied in the simulation [see here](#torque-and-speed-limitations).
 
-- PTO Transmission: Here a transmission type can be chosen (adds constant load at all times).
-- PTO Consumer Loss Map (.vptol): Here the [PTO Idle Loss Map](#pto-idle-consumption-map-.vptoi) of the pto consumer can be defined (adds power demand when the pto cycle is not active).
-- PTO Cycle (.vptoc): Defines the [PTO Cycle](#pto-cycle-.vptoc) which is used when the pto-cycle is activated (when the PTO-Flag in the driving cycle is set).
+First, the maximum torque of the ICE may be limited for certain gears (see [Engine Torque Limitations](#torque-and-speed-limitations)).
+In case that the gearbox' maximum torque is lower than the engine's maximum torque or to model certain features like Top-Torque (where in the highest gear more torque is available) it is possible to limit the engine's maximum torque depending on the engaged gear. 
 
-<div class="declaration">
 
-###ADAS
+## Vehicle Editor -- ADAS Tab
 
-On the ADAS tab, the options for advanced driver assistant systems can be selected. This is only supported in declaration mode. Depending on the mission cycle, vehicle group, and payload a certain benefit is applied to the calcualated fuel consumption. See [ADAS: Overspeed](#driver-overspeed) and [ADAS Technologies](#vehicle-adas-technologies)
+![](pics/VehicleForm_ADAS.png)
 
-</div>
+On the ADAS tab, the advanced driver assistant systems present in the vehicle can be selected.  See [ADAS - Engine Stop/Start](#advanced-driver-assistant-systems-engine-stopstart), [ADAS - EcoRoll](#advanced-driver-assistant-systems-eco-roll), and [ADAS - Predictive Cruise Control](#advanced-driver-assistant-systems-predictive-cruise-control)
 
-###Controls
+The following table describes which ADAS technology can be used and is supported for different powertrain architectures (X: supported, O: optional, -: not supported):
 
+| ADAS Technology \ Powertrain Architecture  | Conventional   | HEV   | PEV   |
+| ------------------------------------------ | -------------- | ----- | ----- |
+| Engine Stop/Start                          | X              | X     | -     |
+| EcoRoll Without Engine Stop                | X              | -     | -     |
+| EcoRoll with Engine Stop                   | X              | -     | -     |
+| Predictive Cruise Control                  | X              | X     | X     |
+| APT Gearbox EcoRoll Release Lockup Clutch  | O              | -     | -     |
 
-![](pics/blue-document-icon.png) New file
-: Create a new empty .vveh file
+* Engine Stop/Start not allowed for PEV
+* EcoRoll for HEV always with ICE off
+* For PEV no clutch for disconnecting the EM present, thus no EcoRoll foreseen (very low drag of EM in any case)
+* Inputs for EcoRoll possible in GUI, but no effect in simulation
 
-![](pics/Open-icon.png) Open existing file
-: Open an existing .vveh file
 
-![](pics/Actions-document-save-icon.png) ***Save current file***
+## Vehicle Editor -- PTO Tab
 
-![](pics/Actions-document-save-as-icon.png) ***Save file as...***
+![](pics/Vehicleform_PTO.png)
 
-![](pics/export-icon.png) Send current file to the [VECTO Editor](#job-editor)
-: **Note:** If the current file was opened via the [VECTO Editor](#job-editor) the file will be sent automatically when saved.
+### PTO Transmission
 
-![](pics/OK.png) Save and close file
-: If necessary the file path in the [VECTO Editor](#job-editor) will be updated.
+If the vehicle has an PTO consumer, a pto transmission and consumer can be defined here. (Only in [Engineering Mode](#engineering-mode))
 
-![](pics/Cancel.png) ***Cancel without saving***
+Three settings can be set:
+
+- PTO Transmission: Here a transmission type can be chosen (adds constant load at all times).
+- PTO Consumer Loss Map (.vptol): Here the [PTO Idle Loss Map](#pto-idle-consumption-map-.vptoi) of the pto consumer can be defined (adds power demand when the pto cycle is not active).
+- PTO Cycle (.vptoc): Defines the [PTO Cycle](#pto-cycle-.vptoc) which is used when the pto-cycle is activated (when the PTO-Flag in the driving cycle is set).
+
+<div class="engineering">
+In engineering mode additional PTO activations are available to simulate different types of municipal vehicles. It is possible to add a certain PTO load during driving while the engine speed and gear is fixed (to simulate for example roadsweepers), or to add PTO activation while driving (to simulate side loader refuse trucks for example). In both cases the PTO activation is indicated in the [driving cycle](#driving-cycles-.vdri) (column "PTO").
+
+
+### Roadsweeper operation
+
+PTO activation mode 2 simulates PTO activation while driving at a fixed engine speed and gear. The minimum engine speed and working gear is entered in the PTO tab. For details see [PTO](#pto).
+
+
+### Sideloader operation
+
+PTO activation mode 3 simulates a time-based PTO activation while driving. Therefore, a separate PTO cycle ([.vptor]()) containing the PTO power over time has to be provided. The start of PTO activation is indicated with a '3' in the 'PTO' column of the [driving cycle](#driving-cycles-.vdri). For details see [PTO](#pto).
+
+</div>
\ No newline at end of file

Documentation/User Manual/1-user-interface/G_ENG-Editor.md

-##Engine Editor
+## Engine Editor
 
 ![](pics/ENG-Editor.PNG)
 
-###Description
+### Description
 
 The [Engine File (.veng)](#engine-file-.veng) defines all engine-related parameters and input files like Fuel Consumption Map and Full Load Curve.
 
-###Relative File Paths
+### Relative File Paths
 
 It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
 Example: "Demo\\FLD1.vfld" points to the "Demo" subdirectory of the Engine File's directory.
 
 VECTO automatically uses relative paths if the input file (e.g. FC Map) is in the same directory as the Engine File. *Note:* The Engine File must be saved before browsing for input files.)
 
-###Main Engine Parameters
+### Main Engine Parameters
 
 Make and Model \[text]\
 :   Free text defining the engine model, type, etc.
@@ -30,19 +30,19 @@ Fuel Type
 Inertia including Flywheel \[kgm²\]
 :   Inertia for rotating parts including engine flywheel. In [Declaration Mode](#declaration-mode) the inertia is calculated  depending on the engine's displacement and also accounts for the clutch's inertia.
 
-###Full Load and Drag Curves
+### Full Load and Drag Curves
 
 
 The [Engine's Full Load and Drag Curves (.vfld)](#full-load-and-drag-curves-.vfld) limits the engine's maximum torque and drag torque respectively The full-load curve must at least cover the engine-speed range from idling speed up to the speed where the power goes down to 70% of the maximum power. The input file (.vfld) file format is described [here](#full-load-and-drag-curves-.vfld).
 
-###Fuel Consumption Map
+### Fuel Consumption Map
 
 
 The [Fuel Consumption Map](#fuel-consumption-map-.vmap) is used to calculate the base FC value. See [Fuel Consumption Calculation](#engine-fuel-consumption-calculation) for details.
 
 The input file (.vmap) file format is described [here](#fuel-consumption-map-.vmap).
 
-###WHTC Correction Factors
+### WHTC Correction Factors
 
 <div class="declaration">
 The WHTC Correction Factors are required in [Declaration Mode](#declaration-mode) for the [WHTC FC Correction](#engine-fuel-consumption-calculation).
@@ -55,12 +55,12 @@ In engineering a single correction factor for correcting WHTC, Cold/Hot Balancin
 </div>
 
 
-###Chart Area
+### Chart Area
 
 
 The Chart Area shows the fuel consumption map and the selected full load curve.
 
-###Controls
+### Controls
 
 
 ![new](pics/blue-document-icon.png)New file

Documentation/User Manual/1-user-interface/H_GBX-Editor.md

-##Gearbox Editor
+## Gearbox Editor
 
 
 
 ![](pics/GBX-Editor.PNG)
 
 
-###Description
+### Description
 
 
 
 The [Gearbox File (.vgbx)](#gearbox-file-.vgbx) defines alls gearbox-related input parameters like gear ratios and transmission loss maps. See [Gear Shift Model](#gearbox-gear-shift-model) for details.
 
 
-###Relative File Paths
+### Relative File Paths
 
 It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths. \
 Example: "Gears\\Gear1.vtlm" points to the "Gears" subdirectory of the Gearbox File's directoy.
@@ -20,7 +20,7 @@ Example: "Gears\\Gear1.vtlm" points to the "Gears" subdirectory of the Gearbox F
 VECTO automatically uses relative paths if the input file (e.g. Shift Polygons File) is in the same directory as the Gearbox File. (The Gearbox File must be saved before browsing for input files.)
 
 
-###Main Gearbox Parameters
+### Main Gearbox Parameters
 
 Make and Model
 :   Free text defining the gearbox model, type, etc.
@@ -45,7 +45,7 @@ Traction Interruption \[s\]
 :   Interruption during gear shift event. (Engineering mode only)
 
 
-###Gears
+### Gears
 
 Use the ![add](pics/plus-circle-icon.png) and ![remove](pics/minus-circle-icon.png) buttons to add or remove gears from the vehicle. Doubleclick entries to edit existing gears.
 
@@ -56,7 +56,7 @@ Use the ![add](pics/plus-circle-icon.png) and ![remove](pics/minus-circle-icon.p
 -	 **"Max Torque"** defines the maximum allowed torque (if applicable) for ah gear. It is used for limiting the engine's torque in certain gear. Note: in Declaration mode the [generic shift polygons](#gearbox-gear-shift-model) are computed from the engine's full-load curve. If the maximum torque is limited by the gearbox, the minimum of the gearbox and engine maximum torque will be used to compute the [generic shift polygons](#gearbox-gear-shift-model)!
 
 
-###Gear shift strategy parameters
+### Gear shift strategy parameters
 
 Since version Vecto 3.0.3 the gearshift polygon calculation according to the ACEA White Book 2016 is implemented and since Vecto 3.0.4 the ACEA White Book 2016 shift strategy for AMT and MT is implemented. The AT-S and AT-P strategies are implemented since Version 3.1.0. For details on this topic please see the ACEA White Book 2016.
 
@@ -76,7 +76,7 @@ Minimum shift time \[s\]
 :   Limits the time between two gear shifts. This rule will be ignored if rpms are too high or too low.
 
 
-###Shift Strategy Parameters
+### Shift Strategy Parameters
 
 Downshift after upshift delay \[s\]
 :   Minimal duration between an upshift and a consecutive downshift.
@@ -87,7 +87,7 @@ Upshift after downshift delay \[s\]
 Min. acceleration after upshift \[m/s²\]
 :   Limit for the minimal achievable acceleration to test if an upshift is reasonable.
 
-###Start Gear
+### Start Gear
 
 In order to calculate an appropriate gear for vehicle start (first gear after vehicle standstill) a fictional load case is calculated using a specified **reference vehicle speed** and **reference acceleration** together with the actual road gradient, transmission losses and auxiliary power demand. This way the start gear is independent from the target speed. VECTO uses the highest possible gear which provides the defined **torque reserve**.
 
@@ -102,7 +102,7 @@ Reference acceleration at clutch-in
 
 </div>
 
-###Torque Converter
+### Torque Converter
 
 Torque converter characteristics file
 :   Defines the [Torque converter characteristics file](#torque-converter-characteristics-.vtcc) containing the torque ratio and reference torque over the speed ratio.
@@ -121,7 +121,7 @@ Torque converter shift polygon
 :   Defines the [Shift Polygons InputFile (.vgbs)](#shift-polygons-input-file-.vgbs) separately for the torque converter. For details on shifting from/to the torque converter gear please see [AT Gear Shift Strategy](#gearbox-at-gearshift-rules).
 
 
-###Torque Converter: Minimal acceleration after upshift
+### Torque Converter: Minimal acceleration after upshift
 
 Here the minimal achievable accelerations before upshifts can be defined.
 
@@ -132,7 +132,7 @@ Acc. for C->C \[m/s²\]
 :   The minimal achievable acceleration for shifts from first torque converter gear to second torque converter gear (1C->2C)
 
 
-###Power shift losses
+### Power shift losses
 
 Shift time \[s\]
 :   The shift time for powershift losses.
@@ -141,12 +141,12 @@ Inertia factor \[-\]
 :   The inertia factor for powershift losses.
 
 
-###Chart Area
+### Chart Area
 
 The Chart Area displays the [Shift Polygons Input File(.vgbs)](#shift-polygons-input-file-.vgbs) as well as the declaration mode shift polygons (dashed lines) for the selected gear.
 
 
-###Controls
+### Controls
 
 
 

Documentation/User Manual/1-user-interface/I_Graph.md

-##Graph Window
+## Graph Window
 
 
 ![](pics/Graph.svg)
 
 
-###Description
+### Description
 
 
 The Graph Window allows to visualise [modal results files (.vmod)](#modal-results-.vmod). Multiple windows can be open at the same time to display different files.
@@ -12,7 +12,7 @@ The Graph Window allows to visualise [modal results files (.vmod)](#modal-result
 Note that the graph does **not** update automatically if the results file has changed.
 
 
-###Channels
+### Channels
 
 
 Use the ![add](pics/plus-circle-icon.png) and ![remove](pics/minus-circle-icon.png) buttons to add or remove channels. Doubleclick entries to edit existing channels.
@@ -20,7 +20,7 @@ Use the ![add](pics/plus-circle-icon.png) and ![remove](pics/minus-circle-icon.p
 Each channel can be plotted either on the left or on the right Y Axis. Use the checkbox to disable channels in the graph.
 
 
-###X Axis Controls
+### X Axis Controls
 
 
 The X Axis can either show distance or time.
@@ -38,7 +38,7 @@ Reset button
 :   Move the x axis range left/right.
 
 
-###Controls
+### Controls
 
 ![open](pics/Open-icon.png) ***Open a .vmod file***
 

Documentation/User Manual/1-user-interface/K0_VECTO-AdvancedAux.md

-##Advanced Auxiliary Dialog
+## Advanced Auxiliary Dialog
 
 <div class="engineering">
 
 
 ![](pics/VECTO-Editor_AAUX.png)
 
-###Description
+### Description
 
 In the VECTO Job Editor dialog you need to select "BusAuxiliaries" in the drop down list on the left to configure the advanced auxiliaries.
 
@@ -26,7 +26,7 @@ The Advance Auxiliaries Editor contains four tabs/sub-modules where the differen
     : The "HVAC" tab defines the steady state output values, which can also be loaded via the Steady State Model File (.AHSM)
 
 
-###Important notes
+### Important notes
 
 Note that the cycle file name used should ideally respect the following syntax to be correctly associated with the pneumatic actuations map (.apac), otherwise the number of actuations will be set to 0 by default:
 
@@ -35,7 +35,7 @@ Note that the cycle file name used should ideally respect the following syntax t
  
 Some flexibility in syntax is allowable (the model looks for 'Bus', 'Coach', 'Urban', etc. in the file name), meaning that the standard default cycles are fully/correctly supported. However, for newly created cycles (i.e. for use in Engineering Mode) it is recommended to follow the above convention to guarantee correct functionality.
 
-###File Format
+### File Format
 
 The file uses the VECTO JSON format.
 

Documentation/User Manual/1-user-interface/K1_VECTO-AdvancedAux_EL.md

-##Electrical Auxiliaries Editor
+## Electrical Auxiliaries Editor
  
 ![](pics/AA_Electrics.jpg)
  
-###Description
+### Description
 
 The "Electrics" tab defines various parameters for electric auxiliaries used on the vehicle:
 
@@ -19,7 +19,7 @@ The "Electrics" tab defines various parameters for electric auxiliaries used on
 
 * Note: for certain fields the allowable values are also controlled/prescribed according to the requirements of the project steering group.
 
-###Results Cards
+### Results Cards
 
 Upon activation of Smart Electrics using the check box, the user may enter Result Card values according to the methodology proposed by the steering group.  Until the certification procedure to determine the correct values is agreed, it is recommended to use the following default values:
 
@@ -57,7 +57,7 @@ Example Default Results Card values
 
   : Result Card: Overrun
 
-###Default Values
+### Default Values
 
 The following table provides a summary of the default values that are populated whenever a new advanced auxiliaries (.AAUX) file is created from scratch (nominal consumption and % active are always fixed defaults, so are not shown).  The table also indicates the editable/default status of the relevant parameters in the VECTO UI in Engineering mode, and the recommended status in Declaration mode (not currently implemented).  The default values / parameter status has been agreed with the project steering group.