This reverts commit 36ec93ee.

implement vehicletype in mockvehicle inputdata

# Conflicts:
#	VectoCommon/VectoCommon/Models/PowertrainPosition.cs
#	VectoCommon/VectoCommon/VectoCommon.csproj
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/packages.config
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

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

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:bugfix/20220426-several-bugfixes to develop

* commit '33c7f648':
  VehicleForm: Corrected Selection of Retarder based on EnginePosition again (E2 also has all retarders available)
  VelocitySpeedGearshiftPreprocessor: Removed try-catch again because error was solved in TransmissionInputRetarder.
  Retarder: Corrected error for TransmissionInputRetarder when Gearbox is diseanged but clutch is closed.
  REESSFileBrowser: Added vbat as extension (in addition to vreess)
  FileBrowser: Updated Screensize
  VehicleForm: Solved Problem of Binding for Tabs of EM and GENSet by setting the BindingContext again
  VehicleForm: Updateing Retarder component in GUI
  VehicleForm.vb: Corrected hiding of GEN-Set Tab in Vehicle Editor (only visible for Serial Hybrids)
  VelocityGearshiftPreprocessor: Throw more useful error message in Preprocessing

VehicleForm: Corrected Selection of Retarder based on EnginePosition again (E2 also has all retarders available)

VelocitySpeedGearshiftPreprocessor: Removed try-catch again because error was solved in TransmissionInputRetarder.

Retarder: Corrected error for TransmissionInputRetarder when Gearbox is diseanged but clutch is closed.

VehicleForm: Solved Problem of Binding for Tabs of EM and GENSet by setting the BindingContext again

Pull request #198: handle an edge-case when operating EM at maxSpeed still provide efficiency map lookup

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

* commit 'efcf3643':
  handle an edge-case when operating EM at maxSpeed still provide efficiency map lookup

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

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

Pull request #197: VectoRun: Throw exception when Cycle could not be finished even when the reason was "Battery Empty" (but using a useful error message).

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

* commit '721135c1':
  VectoRun: Throw exception when Cycle could not be finished even when the reason was "Battery Empty" (but using a useful error message).

VectoRun: Throw exception when Cycle could not be finished even when the reason was "Battery Empty" (but using a useful error message).

(cherry picked from commit 3616be920ab45fab3067cda39a69f2c0cf120643)

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

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

* commit '82c8ac6d':
  EngineeringModeVectoRunDataFactory: Added check for Serial Hybrids that ElectricMachines must be defined.
  VectoJob.vb: Added Validation that Vehicle File has to be in same JobType than jobFile, that cycles must be defined in engineering mode, and that ElectricMachines must be defined for HEVs and BEVs.
  VehicleForm: Removed HybridPositionNotSet from Dropdown for Hybrids and BatteryElectric Vehicles
  MainForm.vb: Menu: Disable "Create Serial Hybrid Job" in Declaration Mode
  Directory.build.targets: Added subdirectory in zip-file
  JSONFileWriter: Added conditional writing of fields for SerialHybrids: IdlingSpeed, AngleDrive, PTO, TorqueLimits, Tanksystem
  JSONFileWriter: Added SaveSerialHybridJob
  JSONFileWriter: Renamed SaveHybridJob to SaveParallelHybridJob
  Directory.props: Removed Trimmable

EngineeringModeVectoRunDataFactory: Added check for Serial Hybrids that ElectricMachines must be defined.

VectoJob.vb: Added Validation that Vehicle File has to be in same JobType than jobFile, that cycles must be defined in engineering mode, and that ElectricMachines must be defined for HEVs and BEVs.

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1569-extrapolation-warning-in-pev-shift-strategy to develop

* commit '79c44aea':
  update expected values in ADAS tests after changes in PEV shiftstrategy
  calculating energy demand in certain gear mixed up torque and motor speed from drivetrain and EM. estimate torque at EM by applying ADC ratio

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

Merge in VECTO/mk_vecto-dev from merge/GUISerialHybrid to develop

* commit 'f0cdfc52':
  Directory.build.targets: Added subdirectory in zip-file
  JSONFileWriter: Added conditional writing of fields for SerialHybrids: IdlingSpeed, AngleDrive, PTO, TorqueLimits, Tanksystem
  JSONFileWriter: Added SaveSerialHybridJob
  JSONFileWriter: Renamed SaveHybridJob to SaveParallelHybridJob
  Directory.props: Removed Trimmable

(cherry picked from commit d47cc724)

JSONFileWriter: Added conditional writing of fields for SerialHybrids: IdlingSpeed, AngleDrive, PTO, TorqueLimits, Tanksystem

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

* commit '1b96b712':
  adding generic serial hybrid vehicles
  bake testcase P4 Hybrid Urban green: disengage ICE during roll action if AllowEmergencyShift is set (i.e. ICE speed is too low), retry roll action in driver model in this case
  correct testcase multistep - airdrag modified multistep expected value

calculating energy demand in certain gear mixed up torque and motor speed from drivetrain and EM. estimate torque at EM by applying ADC ratio

(cherry picked from commit 619be8e954ab058f46fddcacf1e26818784ec6ce)

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

 bake testcase P4 Hybrid Urban green: disengage ICE during roll action if AllowEmergencyShift is set (i.e. ICE speed is too low), retry roll action in driver model in this case

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

* commit 'e06bcf5a':
  handle the case that there is no next braketrigger speed