Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1515-output-in-vsum-file to develop

* commit '5c17fd09':
  remove internal testcase
  remove splitting string for alternator type in .vsum file

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

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

* commit 'f35b5742':
  renamed testcase
  VECTO-1493 Testcase for P1+PCC+ESS (comparison on and off) TestP1ESS_ICEOnICEOff

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

* commit '5f5dc154':
  bugfix writing fuel type in sum container
  sum-data contains wrong output for fuel type (class name of iterator) instead of fuel string. add to testcase

sum-data contains wrong output for fuel type (class name of iterator) instead of fuel string. add to testcase

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

Pull request #140: Added missing files for tests again (TestFullCycleModDataIntegrityDecl_P1ESS, and TestFullCycleModDataIntegrityDeclESS)

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

* commit '3214e0fd':
  Added missing files for tests again (TestFullCycleModDataIntegrityDecl_P1ESS, and TestFullCycleModDataIntegrityDeclESS)

Added missing files for tests again (TestFullCycleModDataIntegrityDecl_P1ESS, and TestFullCycleModDataIntegrityDeclESS)

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

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

* commit '78db2cb7':
  PowertrainBuilder DummyEngineInfo CombustionEngineOn: Set default again to false (was wrongly reverted in 6529a9e5)
  ADAS HEV PCC Tests updated
  New Test VECTO-1493 for testing P1 Citybus (didn't run through before)
  HybridStrategy: corrected AllowICEoff bug (added special case for P1+PCC+ESS)

PowertrainBuilder DummyEngineInfo CombustionEngineOn: Set default again to false (was wrongly reverted in 6529a9e5)

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

* commit '553d37a2':
  adapt PCC tests due to different gearshift behavior (the HEV jobs still used the 'old' AMT shift logic to compute the shift polygons)
  working on release notes
  correcting error in user manual
  started working on release notes

adapt PCC tests due to different gearshift behavior (the HEV jobs still used the 'old' AMT shift logic to compute the shift polygons)

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

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-1460-apt-n-gearbox to develop

* commit '7d74524a': (25 commits)
  APTNGearbox: removed unnecessary code.
  Added Case for APTN for ResponseUnderload in DrivingActionBrake to try again searching a suitable braking power.
  implemented overrides in APTN for easier debugging
  Interpolate2D: removed stopwatch
  Added that HybridStrategy does not use VelocityDropData if its not valid (like in APT-N gearboxes: they have no traction interruption)
  Improved check for APT-N Gearbox when used in SimplePowertrain
  code formatting
  PowertrainBuilder.GetShiftStrategy: Check for JobType for APTN Shift Strategy
  refactored return of Gearbox.Request for easier debugging
  reformated code for easier debugging
  added APTN in PowertrainBuilder.GetGearBox
  minor refactoring for readability
  GearboxType formatted Names of GearboxType Enum
  GearboxForm: APT-N only visible in Engineering Mode
  Added APTN in Powertrainbuilder.GetShiftStrategy again (was missing after merge)
  updated Gearbox GUI Editor (gearboxtype width)
  removed debug output
  updated APTNGearbox
  bugfix: ICE-EngineInfo for PEVs was null
  APTN Gearbox now directly derived from Gearbox
  ...

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

Added Case for APTN for ResponseUnderload in DrivingActionBrake to try again searching a suitable braking power.

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