Working on diagnostics synchronization..

1 files changed, 16 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 7537e4676..8ac03b23f 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -52,6 +52,7 @@ namespace Tango.Emulations.Emulators
         }
 
         private const int MAX_CHUNK_LENGTH = 4000;
+        private const int DIAGNOSTICS_INTERVAL = 300;
         private static Random _rnd = new Random();
         private StartDiagnosticsRequest _diagnosticsRequest;
         private bool _cancelJob;
@@ -80,6 +81,7 @@ namespace Tango.Emulations.Emulators
         private bool _abortPowerDown;
         private bool _isThreadLoadingStarted;
         private String _threadLoadingToken;
+        private DateTime _connectionTime;
 
         #region Properties
 
@@ -460,8 +462,12 @@ namespace Tango.Emulations.Emulators
 
             var cancelToken = CreateCancelToken();
 
+            Stopwatch watch = new Stopwatch();
+
             Task.Factory.StartNew(() =>
             {
+                watch.Start();
+
                 while (_diagnostics_enabled && Transporter.State == TransportComponentState.Connected && !cancelToken.Canceled)
                 {
                     StartDiagnosticsResponse res = new StartDiagnosticsResponse();
@@ -535,13 +541,16 @@ namespace Tango.Emulations.Emulators
                     res.ComponentsStates.AddRange(_componentsStates);
                     res.HeatersStates.AddRange(_heater_states);
                     res.ValvesStates.AddRange(_valveStates);
+                    res.ElapsedMilli = (uint)watch.ElapsedMilliseconds;
+
+                    watch.Restart();
 
                     if (!EmulateCorruption)
                     {
                         Transporter.SendResponse<StartDiagnosticsResponse>(res, request.Container.Token);
                     }
 
-                    Thread.Sleep(300);
+                    Thread.Sleep(DIAGNOSTICS_INTERVAL);
                 }
             });
 
@@ -1040,11 +1049,15 @@ namespace Tango.Emulations.Emulators
                         Name = "Machine Emulator",
                         FPGA1Version = "1.1",
                         FPGA2Version = "2.2",
-                        FPGA3Version = "3.3"
+                        FPGA3Version = "3.3",
+                        DiagnosticsInterval = (uint)DIAGNOSTICS_INTERVAL,
                     },
                     IsAfterReset = _isAfterReset,
                 }, request.Container.Token, null, request.Message.Password == "1234" ? ErrorCode.None : ErrorCode.UnauthorizedConnection);
 
+
+                _connectionTime = DateTime.Now;
+
                 _isAfterReset = false;
             }
         }
@@ -1456,7 +1469,7 @@ namespace Tango.Emulations.Emulators
         {
             await Transporter.SendResponse<StartThreadLoadingResponse>(new StartThreadLoadingResponse() { State = ThreadLoadingState.ReadyForLoading }, _threadLoadingToken);
         }
-        
+
         public async void FinalizeThreadLoading()
         {
             await Transporter.SendResponse<StartThreadLoadingResponse>(new StartThreadLoadingResponse() { State = ThreadLoadingState.Finalizing }, _threadLoadingToken);