.gitignore

@@ -206,3 +206,6 @@ DISTR/
 Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/
 Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vmod
 Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vsum
+Documentation/User Manual/img/
+
+.vs/
\ No newline at end of file

Build/Packaging.targets

@@ -66,10 +66,12 @@
 		<VectoXMLExamples Include="$(SolutionDir)VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\*-sample.xml"/>
 		<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\User Manual Source\JIRA Quick Start Guide.pdf"/>
 		<UserManual Include="$(SolutionDir)Documentation\Cdv_Generator_VECTO3.2.xlsx"/>
+		<XMLParamDoc Include="$(SolutionDir)Documentation\XML\*.png"/>
+		<XMLParamDoc Include="$(SolutionDir)Documentation\XML\VectoParameterDocumentation.html"/>
+		<XMLParamDoc Include="$(SolutionDir)Documentation\XML\data.js"/>
+		<XMLParamDocStyle Include="$(SolutionDir)Documentation\XML\CSS\styles.css"/>
 		<ReleaseNotes Include="$(SolutionDir)Documentation\User Manual Source\Release Notes Vecto3.x.pdf"/>
 		
 		<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\HashingTool.exe"/>
@@ -88,6 +90,8 @@
 	<Copy SourceFiles="@(VectoXMLExamples)" DestinationFolder="$(OutputPath)\XML\Examples" />
 	<Copy SourceFiles="@(VectoXSD)" DestinationFolder="$(OutputPath)\XML\XSD" />
 	<Copy SourceFiles="@(UserManual)" DestinationFolder="$(OutputPath)\User Manual" />
+	<Copy SourceFiles="@(XMLParamDoc)" DestinationFolder="$(OutputPath)\User Manual" />
+	<Copy SourceFiles="@(XMLParamDocStyle)" DestinationFolder="$(OutputPath)\User Manual\CSS" />
 	<Copy SourceFiles="@(ReleaseNotes)" DestinationFiles="$(OutputPath)\User Manual\Release Notes.pdf" />
 	<Copy SourceFiles="@(VectoConfigurationSample)" DestinationFolder="$(OutputPath)"/>
 	<Copy SourceFiles="$(SolutionDir)\Documentation\User Manual Source\README for Mission Profiles Directory.txt" DestinationFiles="$(OutputPath)\Mission Profiles\!! README !!.TXT"/>

Build/TextPreProcessing.targets

@@ -6,6 +6,6 @@
 		</ItemGroup>
 		<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\12.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
 		<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\14.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
-		<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
+		<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
 	</Target>
 </Project>
\ No newline at end of file

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.
+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, fuel consumption, engine speed, engine torque, engine fan speed or power, and pollutants flow 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.
 Next, VECTO re-computes the fuel consumption based for the given driving cycle. For a VTP-test the re-computed fuel consumption has to be within certain limits of the real fuel consumption.
 
-The [VTP job file (.vecto)](#vtp-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:
+The [VTP job file (.vecto)](#vtp-job-file) includes all the necessary information to run a VECTO calculation. It defines the vehicle and the driving cycle(s) to be used for the calculations. In summary, it defines:
 
 -   Filepath to the Vehicle File (.xml)](#vehicle-editor which defines all relevant parameters, including all components
 -   Driving Cycles
@@ -22,10 +22,10 @@ The [VTP job file (.vecto)](#vtp-job-file) includes all informations to run a VE
 <div class="declaration">
 In declaration mode only the first given driving cycle is simulated as the results are further compared with the re-simulated Long-Haul results.
 
-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.
+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(s) and the vehicle's mileage. In engineering mode the according input fields are not shown. The fields for the net calorific values are shown only after the vehicle XML has been loaded, because it defines the fuel types used.
 </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