Harald Martini authored 1 year ago and Markus Quaritsch committed 1 year ago

Merge in VECTO/vecto-dev from VECTO/hm_vecto-dev:bugfix/VECTO-1740-e_em-loss-data-is-missing to develop

* commit 'e62e448e':
  added electric motor fields to ordered columns
  added checks for em columns in declaration mode integration tests

Pull request #293: Bugfix/VECTO-1750 retarderdataviftype contains v1.0 angledrivecertificationoptiontype

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1750-retarderdataviftype-contains-v1.0-angledrivecertificationoptiontype to develop

* commit 'da8f654f':
  bugfix in VIF xml schema, use correct certificationtype for retarder component
  adding testcase for primary bus with retarder wit hcertification method measured

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1741-xml-schema-for-batterysystem-with-standard-values to develop

* commit '1f5a6216':
  support for battery system with standard values

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

* commit 'bd8ecce6':
  Transmisson Types set for correct jobs type
  gearbox transmisson types
  battery form header alignment fix.
  IHPC alignment fix
  IEPC, EM gui fixes, small alignments
  Electric Motor Form gui
  IEPC fix, NrDesignWheelMotor field is now corretcly greyed out

Pull request #290: bugfix XML schema: IEPC standard values - allow only one drag curve, remove gear attribute for drag curve

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1741-xml-schema-for-batterysystem-with-standard-values to develop

* commit '96adb5cb':
  bugfix XML schema: IEPC standard values - allow only one drag curve, remove gear attribute for drag curve

bugfix XML schema: IEPC standard values - allow only one drag curve, remove gear attribute for drag curve

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1741-xml-schema-for-batterysystem-with-standard-values to develop

* commit '97d15d73':
  implement reading XML battery standard values, writing battery with standard values to VIF
  additional mockup tests for vehicles with standard values for battery system
  adding sample XML file for battery with standard values
  Bugfix in Schema 2.3: introduce xml type for battery system with standard values (Vehicle and VIF)

Resolve "22-GUI-Fixes-Decl",

Closes #22

See merge request em/vecto-dev!9

Harald Martini authored 2 years ago and Markus Quaritsch committed 2 years ago

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

* commit 'bf8802c0':
  updated build targets, added mockup suffix

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

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1671-declaration-mode-for-xev-buses to develop

* commit 'de5f7ef8':
  fix testcase: wait on all threads only if execution is done multithreaded

# Conflicts:
#	VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs

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

* commit '2410fa86':
  updating expected file in testproject

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1728-typo-in-vectodeclarationdefinitions.2.4.xsd to develop

* commit '34cc9c4b':
  correctiing typo

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

* commit 'd102ae30':
  removing no longer needed project
  shortening path for mockup testcases (liked from vectoCoreTest
  flattening directory structure in JSON xEV testdata
  allow hybrid testruns also for xml jobs in declaration mode