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

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:feature/VECTO-1493-use-enginestartstop-in-pcc-events-for-hybrid-p1 to develop

* commit 'cb3f7a14':
  HybridStrategy: Added special case for HybridP1 with EngineStopStart during PCC Events
  DefaultDriverStrategy: inlined dataBus variable
  code formatting
  formatting
  if EngineStopStart is active the ICE can be turned off also for HybridP1. For all others it can be turned of regardless of EngineStopStart Flag.
  reverted HybridStrategy to original state before changes of EngineStart (changes did not have any effect)
  Hybrid P1 when braking: changed condition from EngineInfo.EngineOn to iceOn variable
  changed check for start engine from Gearbox.Out to Gearbox.In

Merge remote-tracking branch 'origin/develop' into feature/VECTO-1493-use-enginestartstop-in-pcc-events-for-hybrid-p1

Pull request #135: Bugfix/VECTO-1514 modeldata uses wrong inertia in case multiple ems are used on a position

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1514-modeldata-uses-wrong-inertia-in-case-multiple-ems-are-used-on-a-position to develop

* commit 'e0b13127':
  fix: correctly set inertia in em model data
  adding testcase to check model parameters of electric machine

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1513-bus-aux-post-processing-correction to develop

* commit '34c8cc85':
  correcting typo in engine form, reset selected tyre dimension on re-opening, disable shift parameters in declaration mode
  electric motor: make warning on overload buffer more precise (warning is printed if buffer is 0 )
  update user manual on FC correction
  update post-processing correction
  adding testcase to skip correction of ES in case the vehicle is not equipped with an alternator

correcting typo in engine form, reset selected tyre dimension on re-opening, disable shift parameters in declaration mode

Pull request #133: additional rule in PEV shift strategy to avoid downshifts so that next operating point is beyond upshift line

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

* commit 'a71e83f3':
  additional rule in PEV shift strategy to avoid downshifts so that next operating point is beyond upshift line fix: set thermal overload in testpowertrain

additional rule in PEV shift strategy to avoid downshifts so that next operating point is beyond upshift line
fix: set thermal overload in testpowertrain

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1477-update-user-manual to develop

* commit 'e20def82':
  resizing picture, compiling help
  updating user manual, adding missing files

Pull request #131: remove dividing SP power demand for technology "electric" by alternator efficiency as the lookup-table already contains mechanical power demand

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1509-check-aux-power-demand-of-electric-steering-pump to develop

* commit 'b3ab3701':
  remove dividing SP power demand for technology "electric" by alternator efficiency as the lookup-table already contains mechanical power demand

remove dividing SP power demand for technology "electric" by alternator efficiency as the lookup-table already contains mechanical power demand

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1512-adapt-shift-lines-for-xev-vehicles to develop

* commit '37299484':
  adding missing change

Pull request #129: correcting typos, rename string id to stream id in GUI (and consisten in user manual)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1477-update-user-manual to develop

* commit '04fa286e':
  correcting typos, rename string id to stream id in GUI (and consisten in user manual)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1512-adapt-shift-lines-for-xev-vehicles to develop

* commit '8260df34':
  update testcase for PEV shift polygon drawing
  update calculation of PEV shift polygon for downshifts. introduce new parameter to adapt shift lines

update calculation of PEV shift polygon for downshifts. introduce new parameter to adapt shift lines

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1477-update-user-manual to develop

* commit '55036a35':
  mainly correcting wrong links and incorrectly converted markdown
  correcting more sections in user manual
  more work on updaing documentation
  updating documentation  - work on the first sections done.

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

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:feature/VECTO-1511-error-message-for-hevs-and-bevs-not-supported-in-declaration-mode to develop

* commit 'cded0132':
  Added HEV/BEV Check in AbstractDeclarationVectoRunDataFactory

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

* commit '0f08aed2':
  increase 0 tolerance for battery system
  adding new tyre dimensions

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:feature/VECTO-1510-remove-selection-of-shift-strategy-in-job-dialog to develop

* commit 'bcdd24bd':
  remove selection of shift strategy