update proto & UI

eulynx-live · Jan 4, 2024 · 29fe204 · 29fe204
1 parent 49c803d
commit 29fe204
Show file tree

Hide file tree

Showing 11 changed files with 283 additions and 46 deletions.
diff --git a/src/FieldElementSubsystems.Test/Point/PointTest.cs b/src/FieldElementSubsystems.Test/Point/PointTest.cs
@@ -183,14 +183,14 @@ public async Task Test_AbilityToMove(AbilityToMove simulatedAbilityToMove, Gener
 
         connection
             .SetupSequence(m => m.ReceiveMovePointCommand(It.IsAny<CancellationToken>()))
-            .Returns(() =>
+            .Returns(async () =>
             {
                 var message = new AbilityToMoveMessage
                 {
                     Ability = simulatedAbilityToMove
                 };
-                point.SetAbilityToMove(message);
-                return Task.FromResult(GenericPointPosition.Left);
+                await point.SetAbilityToMove(message);
+                return GenericPointPosition.Left;
             })
             .Returns(() =>
             {

diff --git a/src/Point/IPoint.cs b/src/Point/IPoint.cs
@@ -11,6 +11,7 @@ public interface IPoint {
 
         void EnableTimeoutLeft(bool enableMovementFailed);
         void EnableTimeoutRight(bool enableMovementFailed);
+        void EnableInitializationTimeout(bool enableInitializationFailed);
         void PreventLeftEndPosition(PreventedPositionMessage request);
         void PreventRightEndPosition(PreventedPositionMessage request);
         Task PutIntoUnintendedPosition(DegradedPositionMessage request);

diff --git a/src/Point/Point.cs b/src/Point/Point.cs
@@ -84,7 +84,7 @@ public Point(ILogger<Point> logger, IConfiguration configuration, IPointToInterl
                 DegradedPositionRight: false,
                 SimulateTimeoutLeft: false,
                 SimulateTimeoutRight: false,
-                SimulateInitialisationTimeout: false
+                SimulateInitializationTimeout: false
             );
 
             Observable.FromEventPattern<PropertyChangedEventHandler, PropertyChangedEventArgs>(h => PropertyChanged += h, h => PropertyChanged -= h)
@@ -100,16 +100,15 @@ public async Task SendSciMessage(SciMessage message)
         }
 
         /// <summary>
-        /// Sets the timeout flag for the next move left command.
+        /// Sets the sets the initialization timeout flag for the next initialization.
         /// </summary>
         public void EnableInitializationTimeout(bool enableInitialisationTimeout)
         {
             _logger.LogInformation("Reset and Timeout on next initialisation handshake enabled.");
             _simulatedPointState = _simulatedPointState with
             {
-                SimulateInitialisationTimeout = enableInitialisationTimeout
+                SimulateInitializationTimeout = enableInitialisationTimeout
             };
-            Reset();
         }
 
         /// <summary>
@@ -268,7 +267,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                     try
                     {
-                        var success = await Connection.InitializeConnection(PointState, _config.ObserveAbilityToMove, _simulatedPointState.SimulateInitialisationTimeout, _resetTokenSource.Token);
+                        var success = await Connection.InitializeConnection(PointState, _config.ObserveAbilityToMove, _simulatedPointState.SimulateInitializationTimeout, _resetTokenSource.Token);
                         if (!success)
                         {
                             throw new Exception("Unable to initialize connection");

diff --git a/src/Point/Services/PointService.cs b/src/Point/Services/PointService.cs
@@ -53,6 +53,12 @@ public override async Task<Empty> OverrideSciMessage(SciMessage request, ServerC
             return new Empty();
         }
 
+        public override Task<Empty> ScheduleInitializationTimeout(EnableInitializationFailedMessage request, ServerCallContext context)
+        {
+            _point.EnableInitializationTimeout(request.EnableInitializationFailed);
+            return Task.FromResult(new Empty());
+        }
+
         public override Task<Empty> SchedulePreventLeftEndPosition(PreventedPositionMessage request, ServerCallContext context)
         {
             _point.PreventLeftEndPosition(request);

diff --git a/src/Point/SimulatedPointState.cs b/src/Point/SimulatedPointState.cs
@@ -10,6 +10,6 @@ public record SimulatedPointState(
         bool DegradedPositionRight,
         bool SimulateTimeoutLeft,
         bool SimulateTimeoutRight,
-        bool SimulateInitialisationTimeout
+        bool SimulateInitializationTimeout
     );
 }
diff --git a/src/Point/rasta-point-web/src/App.tsx b/src/Point/rasta-point-web/src/App.tsx
@@ -18,7 +18,8 @@ export type SimulatedPointState = {
   'degradedPositionLeft': boolean,
   'degradedPositionRight': boolean,
   'simulateTimeoutLeft': boolean,
-  'simulateTimeoutRight': boolean
+  'simulateTimeoutRight': boolean,
+  'simulateInitializationTimeout': boolean
 };
 
 export type SimulatorConfiguration = {

diff --git a/src/Point/rasta-point-web/src/Point.tsx b/src/Point/rasta-point-web/src/Point.tsx
@@ -6,6 +6,7 @@ import { PointClient } from './proto/PointServiceClientPb';
 
 import {
   PreventedPosition, AbilityToMoveMessage, AbilityToMove, PreventedPositionMessage, DegradedPositionMessage, EnableMovementFailedMessage,
+  EnableInitializationFailedMessage,
 } from './proto/point_pb';
 import { PointState, SimulatedPointState, SimulatorConfiguration } from './App';
 
@@ -345,14 +346,25 @@ function Point({
             <SemiBoldPropertyLabel>
               Connectivity
             </SemiBoldPropertyLabel>
-            <button
-              type="button"
-              onClick={() => sendCommand((client) => client.reset(new google_protobuf_empty_pb.Empty(), null))}
-              className="m-3 btn dark:bg-slate-800 border-slate-200 dark:border-slate-700 hover:border-slate-300 dark:hover:border-slate-600 text-rose-500"
-            >
-              Reset RaSTA Connection
+            <div className="grid grid-flow-col">
+              <button
+                type="button"
+                onClick={() => sendCommand((client) => client.reset(new google_protobuf_empty_pb.Empty(), null))}
+                className="m-3 btn dark:bg-slate-800 border-slate-200 dark:border-slate-700 hover:border-slate-300 dark:hover:border-slate-600 text-rose-500"
+              >
+                Reset RaSTA Connection
 
-            </button>
+              </button>
+              <div>
+                <Toggle
+                  label="Enable Initialization Timeout"
+                  active={simulatedPointState?.simulateInitializationTimeout || false}
+                  onChange={
+                    (enable) => sendCommand((client) => client.scheduleInitializationTimeout(new EnableInitializationFailedMessage().setEnableinitializationfailed(enable), null))
+                  }
+                />
+              </div>
+            </div>
           </div>
         </div>