Fix

eulynx-live · Jan 14, 2024 · c0a0f9e · c0a0f9e
1 parent f9fc471
commit c0a0f9e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/Point/Point.cs b/src/Point/Point.cs
@@ -107,7 +107,7 @@ public async Task SendSciMessage(SciMessage message)
         public void EnableInitializationTimeout(bool enableInitializationTimeout)
         {
             if (Connection == null) throw new InvalidOperationException("Connection is null. Did you call Connect()?");
-            _logger.LogInformation("Reset and Timeout on next initialization handshake enabled.");
+            _logger.LogInformation("Timeout on next initialization handshake enabled: {}.", enableInitializationTimeout ? "yes" : "no");
             _simulatedPointState = _simulatedPointState with
             {
                 SimulateInitializationTimeout = enableInitializationTimeout
@@ -347,9 +347,11 @@ private async Task HandleCommandedPointPosition(GenericPointPosition commandedPo
             if (Connection == null) throw new InvalidOperationException("Connection is null. Did you call Connect()?");
             _logger.LogDebug("Moving to {}.", commandedPointPosition);
 
-            if (PointState.PointPosition != GenericPointPosition.NoEndPosition)
+            var notDegradedPosition = AllPointMachinesCrucial ? GenericDegradedPointPosition.NotApplicable : GenericDegradedPointPosition.NotDegraded;
+
+            if (PointState.PointPosition != GenericPointPosition.NoEndPosition || PointState.DegradedPointPosition != notDegradedPosition)
             {
-                SetPointState(GenericPointPosition.NoEndPosition, RespectAllPointMachinesCrucial(PointState.DegradedPointPosition));
+                SetPointState(GenericPointPosition.NoEndPosition, notDegradedPosition);
                 await Connection.SendPointPosition(PointState);
             }
 
@@ -368,24 +370,29 @@ private async Task HandleCommandedPointPosition(GenericPointPosition commandedPo
                 await Connection.SendTimeoutMessage();
 
                 var (pointPosition, degradedPointPosition) = HandlePreventedPointPosition(commandedPointPosition, simulatedState);
+                var sendPointPosition = pointPosition != PointState.PointPosition || degradedPointPosition != PointState.DegradedPointPosition;
+
                 SetPointState(pointPosition, degradedPointPosition);
 
-                await Connection.SendPointPosition(PointState);
+                if (sendPointPosition)
+                    await Connection.SendPointPosition(PointState);
                 _logger.LogInformation("Prevented left end position: {} {}.", PointState.PointPosition, PointState.DegradedPointPosition);
             }
             else if (commandedPointPosition == GenericPointPosition.Right && simulatedState.PreventedPositionRight != PreventedPosition.DoNotPrevent)
             {
                 await Connection.SendTimeoutMessage();
 
                 var (pointPosition, degradedPointPosition) = HandlePreventedPointPosition(commandedPointPosition, simulatedState);
+                var sendPointPosition = pointPosition != PointState.PointPosition || degradedPointPosition != PointState.DegradedPointPosition;
+
                 SetPointState(pointPosition, degradedPointPosition);
 
-                await Connection.SendPointPosition(PointState);
+                if (sendPointPosition)
+                    await Connection.SendPointPosition(PointState);
                 _logger.LogInformation("Prevented right end position: {} {}.", PointState.PointPosition, PointState.DegradedPointPosition);
             }
             else
             {
-                var notDegradedPosition = AllPointMachinesCrucial ? GenericDegradedPointPosition.NotApplicable : GenericDegradedPointPosition.NotDegraded;
                 SetPointState(commandedPointPosition, notDegradedPosition);
 
                 _logger.LogInformation("End position reached.");

diff --git a/src/Point/Program.cs b/src/Point/Program.cs
@@ -29,8 +29,8 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                         { "--initial-point-position", "PointSettings:InitialPointPosition" },
                         { "--initial-degraded-point-position", "PointSettings:InitialDegradedPointPosition" },
                         { "--initial-ability-to-move", "PointSettings:InitialAbilityToMove" },
-                        { "--pdi-version", "PointSettings:PDIVersion"},
-                        { "--pdi-checksum", "PointSettings:PDIChecksum"}
+                        { "--pdi-version", "PointSettings:PDIVersion" },
+                        { "--pdi-checksum", "PointSettings:PDIChecksum" }
                     };
                     webBuilder
                         .ConfigureAppConfiguration((hostingContext, config) =>