# Conflicts:
#	VECTO/GUI/VehicleForm.vb

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '73f6c155':
  started working on the release notes

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1573-new-longhaul-cycle to develop

* commit 'ce13bec2':
  update expected values in testcases after changing LH cycle
  updating longhaul cycle to new

VehicleForm: updated visibility of Engine Stop/Start, EcoRoll and ATLockupClutch components based on VehicleType (Conventional, HEV, BEV)

HybridStrategy HandleCoastAction: Update CombustionEngineOn flag accordingly to the ICEoff flag (after setting it).

(cherry picked from commit 5fb416dd)

(cherry picked from commit 20a365e2)

HashingTool and VectoConsole: Removed binding redirects due to an incompatible version of Ninject for all projects (3.3.4 vs. 3.3.3)

(cherry picked from commit 72e5e23c)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '77864db0':
  correct testdata for S2 APT

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '80b41239':
  set previous state of gearbox in case of S2
  bugfix: handle the case where REESS voltage is above high voltage level of EM (results in NaN during interpolation)

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

Michael KRISPER authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:develop to develop

* commit '34e5afea':
  VectoRunData: reformulated error message for P0
  PowertrainBuilder and PowertrainPosition: reformulated error message
  JSONFileWriter: Added check for APT-N Gearbox to not access TorqueConverter Data
  TorqueConverter: Initialize: When no operating point was found only write a Log.Warn if outTorque and speed are not zero. Otherwise write a Log.Info.
  PowertrainBuilder and GUI: Removed P0 in Dropdown and throw exception if P0 is defined in file.

TorqueConverter: Initialize: When no operating point was found only write a Log.Warn if outTorque and speed are not zero. Otherwise write a Log.Info.

bugfix: handle the case where REESS voltage is above high voltage level of EM (results in NaN during interpolation)

Michael KRISPER authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:bugfix/20220426-several-bugfixes to develop

* commit '33c7f648':
  VehicleForm: Corrected Selection of Retarder based on EnginePosition again (E2 also has all retarders available)
  VelocitySpeedGearshiftPreprocessor: Removed try-catch again because error was solved in TransmissionInputRetarder.
  Retarder: Corrected error for TransmissionInputRetarder when Gearbox is diseanged but clutch is closed.
  REESSFileBrowser: Added vbat as extension (in addition to vreess)
  FileBrowser: Updated Screensize
  VehicleForm: Solved Problem of Binding for Tabs of EM and GENSet by setting the BindingContext again
  VehicleForm: Updateing Retarder component in GUI
  VehicleForm.vb: Corrected hiding of GEN-Set Tab in Vehicle Editor (only visible for Serial Hybrids)
  VelocityGearshiftPreprocessor: Throw more useful error message in Preprocessing

VehicleForm: Corrected Selection of Retarder based on EnginePosition again (E2 also has all retarders available)

VelocitySpeedGearshiftPreprocessor: Removed try-catch again because error was solved in TransmissionInputRetarder.