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

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:bugfix/13-p1-hybrid-apt-s-drivecycle-heavyurban to develop

* commit '1fe5b23c':
  HybridStrategy: vehicleSpeedBelowThreshold only when we actually brake to a halt
  Minor changes in DebugData (Local Variable stores LocalData, but all will also be stored in Global Data)
  ATGearbox: removed NotImplemented comments
  ATGearbox: rewrite of functions for easier debugging
  HybridStrategy: renamed firstResponse to response
  HybridStrategy: replaced EngineSpeedTooLow Variable by direct function evaluation with current response
  HybridStrategy: renamed some response variables in lambda expressions
  debug info
  GearshiftPosition: Minor refactoring (expression bodies)
  DebugData
  better debugging
  More Additions to DebugData
  DebugData: Added global-parameter for easier debugging
  Improved DebugData and DebuggerDisplay Output
  GearboxData: refactored ternary if for easier debugging

Minor changes in DebugData (Local Variable stores LocalData, but all will also be stored in Global Data)

HybridStrategy: replaced EngineSpeedTooLow Variable by direct function evaluation with current response

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

* commit '5b5de25e':
  update testcase with thermal de-rating after changes in em model
  update testcase as the dummy-retarder has been removed
  correcting powertrain builder: building simple parallel powertrain, connect idle controller after powertrain is connected togehter
  update expected values in adas test after changes in clutch (not resetting idel controller on dry-runs)
  update expected values after change in clutch (not calling idle controller on dry-runs)
  fix testcases after refactoring of retarder (removing dummy retarder)

correcting powertrain builder: building simple parallel powertrain, connect idle controller after powertrain is connected togehter

update expected values in adas test after changes in clutch (not resetting idel controller on dry-runs)

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

* commit '42cb52d9':
  update expected values for pcc tests
  adding missing file
  bugfix engineering factory: handle the case no EM is present ;-)

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

* commit 'dd0dc8ce':
  2nd step of renaming files to lowercase
  change filenames to all lowercase

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

* commit '24064ded':
  use better name for variable
  bugfix: do not reset idle controller on dry-runs
  Revert "Driver ApplyLimit DriverAcceleration switched"
  fix testcases battery electric E2

This reverts commit 37001894.

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

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

* commit '9c0699e6': (22 commits)
  DefaultDriverStrategy.HandleRequestEngaged: Added case for ResponseOverload situation: try Coast (fixed the problem at 22km in P2 G5 NoEE UrbanDelivery)
  DefaultDriverStrategy: Added more info to debugData for easier debugging. Reformated code
  GearshiftPositions: Corrected bug for HasPredecessor/HasSuccessor when GearPosition is 0
  DefaultDriverStrategy: Removed unneeded code from previous solution attempts (hamstercode)
  Driver: Code formatting
  IDriverStrategy: Added BrakeTrigger (forgot to include in previous commit)
  GearshiftPosition: reformatting and simplifying check for HasPredecessor and HasSucessor
  Renamed NextBrakeTargetSpeed to NextBrakeTriggerSpeed
  IDriverInfo: Added NextBrakeTriggerSpeed to detect braking to halt
  HybridStrategy: FindBestGearForBraking: added check if targetSpeed is actually 0 when checking for DisengageWhenHaltingSpeed. Otherwise braking below 10 km/h caused problems, because gearbox disengaged.
  typo
  Code formatting
  Driver: removed empty comment
  Driver ApplyLimit DriverAcceleration switched
  formatting
  DefaultDriverStrategy.DoBrake: Added debug variable for response history
  DefaultDriverStrategy.DoCoast: Combined declaration and initialisation
  Refactored if-statements for easier debugging
  code formatting
  HybridStrategy Request Refactored if-statements of nextGear for easier debugging
  ...

DefaultDriverStrategy.HandleRequestEngaged: Added case for ResponseOverload situation: try Coast (fixed the problem at 22km in P2 G5 NoEE UrbanDelivery)