# Conflicts:
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

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

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:merge/Cleanup-Project-Refs-VectoCoreTest to develop

* commit 'f45594a0':
  Corrected errors in copying MockVehicleInputData to VectoCoreTest-Project
  Removed VectoHashing Reference from VectoCoreTest project
  Removed reference to VECTO project from VectoCoreTest
  MSBuild Project-Files: Updated <DefineConstants> Tag and removed the TRACE constant for all projects.
  Added TargetFrameworks in the project files to be able to individually adjust them.

MSBuild Project-Files: Updated <DefineConstants> Tag and removed the TRACE constant for all projects.

extending databus to get information on charging power (necessary to correctly initialize test-powertrain drivetrain serial hybrid)

adding testcase S2 with 3-speed transmission

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-1533-multi-target-compilation to develop

* commit '2db08ade': (97 commits)
  General optimizations in project files
  Changed setting the chart size slightly to avoid an additional dependency on Windows.Control
  Redesigned the FileBrowserDialog
  Commented AxlegearInputRetarder for the moment. Will be fixed in later tickets.
  New Design FileBrowserDialog (added FileSize, Change Date), Corrected an error with Paths
  [VECTO] updated project file again (added multiple tfm's again)
  Removed ProjectGUID from every project file (isn't needed anymore in new SDK)
  Simplified VECTO-Projectfile again, and removed compiler warning in OutputView VECTO3GUI2020
  Removed Drawing Common and Windows.Forms dlls, added DataVisualization package
  Replaced Every Process.Start with a file by the ProcessStartInfo with UseShellExecute true. (The simple version didn't work under .net5.0)
  [HashingTool] Changed help directory
  Changed AppPath to parent directory
  Downgraded NInject to version 3.3.3 (from 3.3.4), because it caused version incompatibilities.
  Added Starter Applications and changed Deploy Target to create sub directories for each .NET Version
  Solution File: Removed satellite projects which do not compile
  [VECTO3GUI2020] Cleaned up project file
  [VECTO3GUI2020] Removed unnecessary libraries
  Compiler Warnings
  Suppressed Warning NU1701 (Compatibility mode for older libraries)
  Removed Castle.Core Library. It was not needed.
  ...

Replaced Every Process.Start with a file by the ProcessStartInfo with UseShellExecute true. (The simple version didn't work under .net5.0)

powertrain builder serial hybrid: connect genset to charger port of electric system
serial hybrid controller: handle responses where state in the powertrain does not match
update S2 testcase

Added Starter Applications and changed Deploy Target to create sub directories for each .NET Version

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

Pull request #156: ElectricMotorData.EfficiencyMapLookupTorque: Fixed bug when only one level is limited by battery, but the other is not.

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:bugfix/VECTO-1531-electricmotor-lookup-maximum-torque to develop

* commit 'd30de630':
  ElectricMotorData.EfficiencyMapLookupTorque: Fixed bug when only one level is limited by battery, but the other is not.

ElectricMotorData.EfficiencyMapLookupTorque: Fixed bug when only one level is limited by battery, but the other is not.