Skip to content

Fix for config loading in non supported vehicles. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ajurna wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix for config loading in non supported vehicles. #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6883ce8
Refactor `DriverAssistController` to use `TryGetValue` for safer `Loc…
ajurna Jun 9, 2025
2f3cbc3
Add type check for `LocoDM1U` in `OnFixedUpdate` to skip processing.
ajurna Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions DriverAssist/Implementation/DriverAssistController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ public void OnDestroy()
public void OnFixedUpdate()
{
if (!loaded) return;
if (locoEntity?.Type == "LocoDM1U") return;

Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
Expand Down Expand Up @@ -290,22 +291,21 @@ public void ChangeCar(TrainCar? trainCar)

locoEntity.UpdateLocomotive(train);
locoEntity.Components.LocoSettings = null;
LocoSettings settings = config.LocoSettings[locoEntity.Type];
log.Debug($"locoEntity.Type={locoEntity.Type}");
log.Debug(
$"MinTorque={settings.MinTorque}" +
$", MaxAmps={settings.MaxAmps}" +
$", OperatingTemp={settings.OperatingTemp}" +
$", HillClimbTemp={settings.HillClimbTemp}" +
$", BrakingTime={settings.BrakingTime}" +
$", BrakeReleaseFactor={settings.BrakeReleaseFactor}" +
$", MinBrake={settings.MinBrake}" +
$", HillClimbAccel={settings.HillClimbAccel}" +
$", CruiseAccel={settings.CruiseAccel}" +
$", MaxAccel={settings.MaxAccel}"
);
if (settings != null)

if (config.LocoSettings.TryGetValue(locoEntity.Type, out LocoSettings? settings))
{
log.Debug(
$"MinTorque={settings.MinTorque}" +
$", MaxAmps={settings.MaxAmps}" +
$", OperatingTemp={settings.OperatingTemp}" +
$", HillClimbTemp={settings.HillClimbTemp}" +
$", BrakingTime={settings.BrakingTime}" +
$", BrakeReleaseFactor={settings.BrakeReleaseFactor}" +
$", MinBrake={settings.MinBrake}" +
$", HillClimbAccel={settings.HillClimbAccel}" +
$", CruiseAccel={settings.CruiseAccel}" +
$", MaxAccel={settings.MaxAccel}"
);
log.Debug("Assigned settings to locoEntity");
locoEntity.Components.LocoSettings = settings;
}
Expand Down