# Conflicts:
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	HashingTool/Properties/Version.cs
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs

bugfix electric motor: consider transmission ratio when checking if operating point provided by strategy did change

bugfix in electric motor: max power caluclated for discharge may be greater than 0 because assumed current is higher than current for max power

allow 'searchoperatingpoint' to shorten simulation distance (e.g. if roll action at low speeds) - allow vehicle stop, drive off again

- allow gearshifts during brake already when below downshift (even if min shift time did not pass)
- if ICE operating point is already on drag curve (e.g. because auf a previous search) use this solution
- different handlich of dryrunsolution
- requestdryrun: correctly set state of AT gearbox etc. in test-powertrain
- requestdryrun: handle brakes in testpowertrain

use in brakes as for AT powertrains no dry-run requests are used and the brake power may get negative

extend response by delta-torque values (not only power) (re-calculation of delta-torque from power not always accurate - depends und used angular velocity)

introducing torque converter interface (split into info and control part), set state for at gearbox and tc in case of AT gearbox and hybrids,
hybrid strategy: no recuperation when in converter gear

driving constant speed P1 hybrid works
AT gearbox trigger gearshift from hybrid strateyg,
hybrid strategy for AT - do not issue dryrun requests to bypass torque converter search
electric motor: do not throw execptions if used on test-powertrain

* commit '0f30d052':
  building new VECTO version
  compiling help file, disable automatic help generation for deploy
  bugfix em-off signal, em-off time share, ice-off time share, max startgear selection

* commit 'ba0782e4':
  update version number
  update release notes
  bugfix e2 shift strategy
  update documentation

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

* commit '9f822be7':
  adapt testcase after modifications in supercap model
  bugfix in supercap: calculation of max discharge power, ensure initial soc is higher than min soc, fix in powertrain builder calculating aux buffer in case of supercap

bugfix in supercap: calculation of max discharge power, ensure initial soc is higher than min soc, fix in powertrain builder calculating aux buffer in case of supercap

Merge pull request #35 in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1394-refactor-em-model to develop

* commit 'e7b64e90':
  adding em-off time share in sum file