marc/openbve-fcmb-train-plugin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ATC Dimetronic: ATO acceleration tweaks

Browse source
This commit is contained in:
Marc Riera 2024-12-29 17:51:46 +01:00
parent aa863a7464
commit 4f32ecf538
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/Devices/AtcDimetronic.cs
View file

@ -84,7 +84,7 @@ namespace OpenbveFcmbTrainPlugin
private readonly bool AtoAvailable; private readonly bool AtoAvailable;
/// <summary>The delay before ATO changes notches.</summary> /// <summary>The delay before ATO changes notches.</summary>
private readonly double AtoNotchDelay = 500; private readonly double AtoNotchDelay = 250;
/// <summary>The counter for the ATO notch delay.</summary> /// <summary>The counter for the ATO notch delay.</summary>
private double AtoNotchDelayCounter; private double AtoNotchDelayCounter;
@ -483,6 +483,8 @@ namespace OpenbveFcmbTrainPlugin
{ {
if (AtoState == AtoStates.AwaitingStartup) if (AtoState == AtoStates.AwaitingStartup)
{ {
// Release brakes to start ATO
AtoBrakeNotch = 0;
AtoState = AtoStates.IncreaseSpeed; AtoState = AtoStates.IncreaseSpeed;
} }
} }
@ -706,6 +708,9 @@ namespace OpenbveFcmbTrainPlugin
Speed target = CurrentSpeedCode.TargetLimit; Speed target = CurrentSpeedCode.TargetLimit;
double distance = CurrentSpeedCode.TargetPosition - TrainLocation; double distance = CurrentSpeedCode.TargetPosition - TrainLocation;
// Pitch multiplier, used to alter when state changes occur
double pitchMulti = train.State.Pitch / 20;
// Update notch delay counter // Update notch delay counter
AtoNotchDelayCounter += elapsedTime.Milliseconds; AtoNotchDelayCounter += elapsedTime.Milliseconds;
@ -732,30 +737,41 @@ namespace OpenbveFcmbTrainPlugin
AtoStartupPosition = TrainLocation; AtoStartupPosition = TrainLocation;
break; break;
case AtoStates.IncreaseSpeed: case AtoStates.IncreaseSpeed:
AtoBrakeNotch = 0; if (train.Acceleration < 0.5 && AtoNotchDelayCounter >= AtoNotchDelay)
if (train.Acceleration < 0.2 && AtoPowerNotch < train.Specs.PowerNotches && AtoNotchDelayCounter >= AtoNotchDelay)
{ {
AtoPowerNotch++; if (AtoBrakeNotch > 0)
{
AtoBrakeNotch--;
}
else if (AtoPowerNotch < train.Specs.PowerNotches)
{
AtoPowerNotch++;
}
AtoNotchDelayCounter = 0; AtoNotchDelayCounter = 0;
} }
if (train.State.Speed.KilometersPerHour >= target.KilometersPerHour - 5) if (train.State.Speed.KilometersPerHour >= target.KilometersPerHour - 5 + pitchMulti)
{ {
AtoState = AtoStates.MaintainSpeed; AtoState = AtoStates.MaintainSpeed;
} }
break; break;
case AtoStates.MaintainSpeed: case AtoStates.MaintainSpeed:
AtoBrakeNotch = 0; if ((train.Acceleration > 0 || (AtoPowerNotch > 0 && train.State.Pitch <= 0)) && AtoNotchDelayCounter >= AtoNotchDelay)
if (train.Acceleration > 0 && AtoNotchDelayCounter >= AtoNotchDelay)
{ {
// Train is accelerating, try to reduce speed
if (AtoPowerNotch > 0) if (AtoPowerNotch > 0)
{ {
AtoPowerNotch--; AtoPowerNotch--;
AtoNotchDelayCounter = 0;
} }
else if (AtoBrakeNotch < train.Specs.BrakeNotches) else if (AtoBrakeNotch < train.Specs.BrakeNotches && train.State.Pitch < 0 && train.State.Speed.KilometersPerHour >= target.KilometersPerHour - 3 + pitchMulti)
{ {
AtoBrakeNotch++; AtoBrakeNotch++;
AtoNotchDelayCounter = 0;
} }
AtoNotchDelayCounter = 0; }
if (train.State.Speed.KilometersPerHour <= target.KilometersPerHour - 7 + pitchMulti)
{
AtoState = AtoStates.IncreaseSpeed;
} }
break; break;
} }
@ -767,8 +783,8 @@ namespace OpenbveFcmbTrainPlugin
// ATO is driving but does not know the position of the train, unselect driving mode and set alarm state // ATO is driving but does not know the position of the train, unselect driving mode and set alarm state
if (TrainLocation - AtoStartupPosition > 400 && !AtoPositionKnown) if (TrainLocation - AtoStartupPosition > 400 && !AtoPositionKnown)
{ {
AtoState = AtoStates.Alarm; //AtoState = AtoStates.Alarm;
DeviceState = DeviceStates.NoMode; //DeviceState = DeviceStates.NoMode;
} }
} }
} }