# Conflicts:
#	VECTO/GUI/GearboxForm.vb
#	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1541-implement-e2-s2-with-apt-s-p_mq to develop

* commit '97815424':
  adapting gearbox form to draw shiftlines and fld for battery electric vehicles, handling of APT-S/P in case of PEV
  map serial hybrid apt-s/p to apt-n transmission type add model parameters for apt-p serial hybrid testdata
  adding model parameters for apt-p testfile
  return aptn shift strategy in case of battery electric with apt-s or apt-p
  map apt-s and apt-p to apt-n in case of battery electric vehicle
  adding missing testdata for S3
  adding testdata and testcase for E2/S2 with APT-S/P transmission

adapting gearbox form to draw shiftlines and fld for battery electric vehicles, handling of APT-S/P in case of PEV

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1561-simulation-abort-with-at-transmission to develop

* commit 'e7b5f65a':
  porting bugfix from official vecto version into develop tree

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1479-maximum-gearbox-torque-not-respected to develop

* commit 'e8fdd4a9':
  consistent formatting
  adding testcases for torque limits P2 hybrid on declaration cycles
  change condition to ignore gearbox limits from P1 and P2 to P3 and P4, so gearbox limits are applied for P2.5 as well
  adding testcases for different combinations of torque limitations (vehicle ICE limits, boosting limits, gearbox limits)
  adding testcase limiting gearbox torque
  serial hybrid: fix testcases - check if gearbox data exists (only for S2)

add model parameters for apt-p serial hybrid testdata

change condition to ignore gearbox limits from P1 and P2 to P3 and P4, so gearbox limits are applied for P2.5 as well

adding testcases for different combinations of torque limitations (vehicle ICE limits, boosting limits, gearbox limits)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1521-updating-tyre-dimensions to develop

* commit 'c3573689':
  adding changelog for schema version 2.4
  updating xml schema 2.3: tyredimensiontype - remove space before rim diameter

(cherry picked from commit 45d76683)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1560-update-toolchain-for-generating-usermanual to develop

* commit '099a8d06':
  upload compiled help
  update readme
  update javascript for HTML5 elements
  update convert script for new pandoc version
  update markdown files to have space after headings-marker

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1550-error-in-hashing-tool_dev to develop

* commit '7b287949':
  bugfix in hashing tool: sort components before reading (tyres, batteries) handling of REESS components

handling of REESS components

JSONFileWriter: Corrected error on writing VehicleFile when no gearbox is present (e.g. battery electric E4, E3).

Added Function "ToDataView" to convert from KeyValuePairs to DataView which allows filtering (usable for ComboBoxes in the GUI)

Corrected typo and added a special label for PowertrainPosition.HybridPositionNotSet: "Position not set"

Renamed the Labels for Retarder Type Primary and Secondary to Transmission Output and Input Retarder