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

Compare commits

base: marc:be091a57841a46fe5f0e0d519fb368cb1cb17730
Branches Tags
marc:main
...
compare: marc:4f32ecf538ed43c80eaec89094ac448db09017c2
Branches Tags
marc:main

2 commits
be091a5784 ... 4f32ecf538

Author SHA1 Message Date
Marc Riera
4f32ecf538 ATC Dimetronic: ATO acceleration tweaks 2024-12-29 17:51:46 +01:00
Marc Riera
aa863a7464 Train: improve acceleration formula 2024-12-29 17:51:21 +01:00
2 changed files with 38 additions and 21 deletions
Show stats 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;
} }
} }
} }

21
src/Train/Train.cs
View file

@ -54,8 +54,11 @@ namespace OpenbveFcmbTrainPlugin
/// <summary>The current acceleration of the train.</summary> /// <summary>The current acceleration of the train.</summary>
internal double Acceleration { get; private set; } internal double Acceleration { get; private set; }
/// <summary>The time when acceleration was calculated.</summary> /// <summary>The time elapsed since acceleration was last calculated.</summary>
private Time AccelerationTime = new Time(0); private double AccelerationTimer;
/// <summary>The maximum time elapsed between acceleration calculations.</summary>
private const double AccelerationMaximumTimer = 100;
/// <summary>The speed when acceleration was calculated.</summary> /// <summary>The speed when acceleration was calculated.</summary>
private Speed AccelerationSpeed = new Speed(0); private Speed AccelerationSpeed = new Speed(0);
@ -133,16 +136,14 @@ namespace OpenbveFcmbTrainPlugin
data.Handles.BrakeNotch = data.Handles.BrakeNotch; data.Handles.BrakeNotch = data.Handles.BrakeNotch;
// Calculate acceleration // Calculate acceleration
if (OpenbveFcmbTrainPlugin.Initializing) AccelerationTimer += data.ElapsedTime.Milliseconds;
if (AccelerationTimer >= AccelerationMaximumTimer)
{ {
AccelerationTime = data.TotalTime; Acceleration = Math.Round((data.Vehicle.Speed.MetersPerSecond - AccelerationSpeed.MetersPerSecond) / AccelerationTimer * 1000, 4);
} AccelerationTimer = 0;
if (data.TotalTime.Milliseconds - AccelerationTime.Milliseconds > 200) AccelerationSpeed = data.Vehicle.Speed;
{
Acceleration = Math.Round((State.Speed.MetersPerSecond - AccelerationSpeed.MetersPerSecond) / (data.TotalTime.Seconds - AccelerationTime.Seconds), 4);
AccelerationTime = data.TotalTime;
AccelerationSpeed = State.Speed;
} }
data.DebugMessage = Acceleration.ToString();
// Retrieve data from all devices // Retrieve data from all devices
foreach (Device dev in Devices) foreach (Device dev in Devices)