Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1491-electric-energy-storage-editor-does-not-show-values to develop

* commit '7f1c6f18':
  correctly open battery dialog

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

* commit 'ff800b70':
  adding testcase for mod-data integrity test of a P1 vehicle correct average EM-speed calculation in case EM is at position P1. EM is immediately on when ICE is turned on.
  E_EM_Drive and E_EM_Recuperate only account timesteps where EM is ON, if EM is off this is accounted as E_EM_Drag
  bugfix for mod-data integrity: use correct 'previous input speed' in clutch in case the ICE was turned on in this simulation step
  adding testcase for mod-data integrity of vehicle with ess

correct average EM-speed calculation in case EM is at position P1. EM is immediately on when ICE is turned on.

E_EM_Drive and E_EM_Recuperate only account timesteps where EM is ON, if EM is off this is accounted as E_EM_Drag

bugfix for mod-data integrity: use correct 'previous input speed' in clutch in case the ICE was turned on in this simulation step

Pull request #111: engineering mode: if airdrag correction is set to use declaration mode, use polar curve for medium lorries in case of rigid trucks with a TPMLM below 7.4t

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1498-crosswind-correction-in-engineering-mode to develop

* commit '4955f4a0':
  engineering mode: if airdrag correction is set to use declaration mode, use polar curve for medium lorries in case of rigid trucks with a TPMLM below 7.4t

engineering mode: if airdrag correction is set to use declaration mode, use polar curve for medium lorries in case of rigid trucks with a TPMLM below 7.4t

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

* commit '730bf17a':
  fill in additional response fields in torque converter
  fix testcase where max engine speed is required (mock-container)
  correct adas tests for PEV after adaptations in PEV shift strategy. ignore drive-off behavior, different gearshift behavior when accelerating correct test-names for conventional ADAS tests
  adapt expected vsum and vmod files after adding a new column
  driver: remove condition for adapting operating point when setting tc operating point
  drivermodel: additional conditions to set override action for braking (after underload with AT gearbox in TC gear)
  hybrid strategy: avoid large values for U when iterating the configurations if the requested EM torque is small, disabled skipping different gear configurations in case max torque is exceeded
  hybrid strategy: if emergency shift is requested/allowed: consider solutions exceeding the max torque
  hybrid strategy: if no solution is found (i.e., use fallback EM-Off) and emergency shift is allowed, check if next gear is suitable
  fill in additional required fields in response
  at gearbox: fallback to get next gear in testpowertrain
  busaux adapter: if in TC gear and drivetrain torque is positive (although braking) then do not allow smart aux
  add column in user manual for vsum, avoid SI-NaN/infinity value in shift strategy

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

correct adas tests for PEV after adaptations in PEV shift strategy. ignore drive-off behavior, different gearshift behavior when accelerating
correct test-names for conventional ADAS tests

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

* commit 'c9f95605':
  adding new tyre dimensions

(cherry picked from commit a5c6e743)

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:bugfix/VECTO-1487-xx to develop

* commit '0d4cf8f1':
  only consider entries where the EM is on for calculating efficiency values

(cherry picked from commit bbb1e3d5)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1470-076.2463-em-drag-torque-questions-findings to develop

* commit '0c63afb8':
  fix calculation of E_<x>_off_loss

drivermodel: additional conditions to set override action for braking (after underload with AT gearbox in TC gear)

hybrid strategy: avoid large values for U when iterating the configurations if the requested EM torque is small,
disabled skipping different gear configurations in case max torque is exceeded

hybrid strategy: if emergency shift is requested/allowed: consider solutions exceeding the max torque

hybrid strategy: if no solution is found (i.e., use fallback EM-Off) and emergency shift is allowed, check if next gear is suitable

busaux adapter: if in TC gear and drivetrain torque is positive (although braking) then do not allow smart aux

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

* commit '12320866':
  set busaux battery soc for dryrun in case of AT transmission
  add databus property to driver strategy for easier debugging (access databus in the same way)

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/mk_vecto-dev:develop to develop

* commit 'ebcd67ae':
  use engineOn status as before, only override in case of P1 and braking
  corrected two missing errors (due to sync)
  Hybrid P1: added check in search for BrakeAction if Combustion Engine was off
  Set CombustionEngineOn to True on Braking in HybridStrategy and used this in StartStopCombustionEngine
  Changed Search Algorithm, that it automatically reverses search direction (without throwing exception)
  added TankSystem in DummyVehicle for validation when a engine file is saved.
  Changed all string.Join by the new Extension Method Join()
  refactored and checked many Log-Messages with "Header Line is not valid"
  refactored Extension Method JoinString to Join
  corrected parameters for Log Message (Transmission Loss Map is not valid, VECTO-1481)
  Added new extension method for joining an Enumerable<T> with string.Join

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

Merge in VECTO/mk_vecto-dev from bugfix/VECTO-1490-exceeded-max-iterations-operating-point-could-not-be-found to develop

* commit 'ae8564b8':
  use engineOn status as before, only override in case of P1 and braking
  corrected two missing errors (due to sync)
  Hybrid P1: added check in search for BrakeAction if Combustion Engine was off
  Set CombustionEngineOn to True on Braking in HybridStrategy and used this in StartStopCombustionEngine
  Changed Search Algorithm, that it automatically reverses search direction (without throwing exception)
  added TankSystem in DummyVehicle for validation when a engine file is saved.
  Changed all string.Join by the new Extension Method Join()
  refactored and checked many Log-Messages with "Header Line is not valid"
  refactored Extension Method JoinString to Join
  corrected parameters for Log Message (Transmission Loss Map is not valid, VECTO-1481)
  Added new extension method for joining an Enumerable<T> with string.Join

Merge remote-tracking branch 'origin/develop' into bugfix/VECTO-1490-exceeded-max-iterations-operating-point-could-not-be-found

# Conflicts:
#	VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
#	VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
#	VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs

Set CombustionEngineOn to True on Braking in HybridStrategy and used this in StartStopCombustionEngine