diff --git a/Eu07.BlackBox/Recording.cs b/Eu07.BlackBox/Recording.cs index 50f2fdd..62263ce 100644 --- a/Eu07.BlackBox/Recording.cs +++ b/Eu07.BlackBox/Recording.cs @@ -519,8 +519,13 @@ public sealed class Recording return false; } - /// When the train protection braked the user's train: the alerter or the cab signalling not acknowledged. - public IReadOnlyList SecurityBrakings() => CabSpans(s => s.Has(SecurityFlags.Braking)); + /// + /// When the train protection braked the user's train: the alerter or the cab signalling not acknowledged, its lamp + /// blinking. Braking with neither is the protection with no power (TSecuritySystem::is_braking), a cab not yet + /// started or a power cut: no driver's fault, not counted. + /// + public IReadOnlyList SecurityBrakings() => + CabSpans(s => s.Has(SecurityFlags.Braking) && (s.Has(SecurityFlags.Vigilance) || s.Has(SecurityFlags.CabSignal))); /// The commands the user gave in a vehicle, presses only. public IEnumerable UserCommands() => _commands.Where(c => c.Pressed && c.Vehicle != 0); diff --git a/StarterNG.Tests/BlackBox/SecurityBrakingTests.cs b/StarterNG.Tests/BlackBox/SecurityBrakingTests.cs new file mode 100644 index 0000000..8666db7 --- /dev/null +++ b/StarterNG.Tests/BlackBox/SecurityBrakingTests.cs @@ -0,0 +1,19 @@ +using Eu07.BlackBox; + +namespace StarterNG.Tests.BlackBox; + +public class SecurityBrakingTests +{ + [Fact] + public void The_protection_braking_with_no_power_is_not_the_drivers_fault() + { + var file = new BlackBoxFile().Info().Vehicle(1, "EP07-424").User(0, 1, true); + // no power for the first seconds, then the cab signalling not acknowledged + for (double t = 0; t <= 20; t += 0.5) + file.Cab(t, 1, 100, 0, security: (byte)(t < 5 ? 0x10 : t is >= 10 and < 12 ? 0x1a : 0)); + var recording = BlackBoxReader.Read(file.Stream()); + + var braking = Assert.Single(recording.SecurityBrakings()); + Assert.Equal(10, braking.Start, 6); + } +}