Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 0f40fa15 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge pull request #756 in VECTO/vecto-sim from...

Merge pull request #756 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-979-vecto-simulation-abort-with-8-speed-mt-transmission to develop

* commit '3434449d':
  adapt testcase: add brakes to clutch test
  additional condition for slipping clutch when braking (brake power must not be set)
parents 4f24a0ed 3434449d
No related branches found
No related tags found
No related merge requests found
......@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
PerSecond angularVelocityIn;
var slippingClutchWhenDriving = (DataBus.Gear <= 2 && DataBus.DriverBehavior != DrivingBehavior.Braking);
var slippingClutchDuringBraking = DataBus.Gear == 1 && DataBus.DriverBehavior == DrivingBehavior.Braking && outTorque > 0;
var slippingClutchDuringBraking = DataBus.Gear == 1 && DataBus.DriverBehavior == DrivingBehavior.Braking && outTorque > 0 && DataBus.BrakePower.IsEqual(0);
//var slippingClutchWhenDriving = (DataBus.Gear == 1 && outTorque > 0);
AddClutchLoss(outTorque, outAngularVelocity,
slippingClutchWhenDriving || slippingClutchDuringBraking || startClutch || outAngularVelocity.IsEqual(0),
......
......@@ -78,8 +78,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var gearbox = new MockGearbox(container);
gearbox.Gear = (uint)gear;
var clutch = new Clutch(container, engineData) { IdleController = new MockIdleController() };
var vehicle = new MockVehicle(container);
vehicle.MyVehicleSpeed = 50.KMPHtoMeterPerSecond();
var brakes = new Brakes(container) { BrakePower = 0.SI<Watt>() };
var vehicle = new MockVehicle(container) { MyVehicleSpeed = 50.KMPHtoMeterPerSecond() };
var inPort = clutch.InPort();
var outPort = new MockTnOutPort();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment