Merge remote-tracking branch 'CMS/develop' into develop

Thermo.Active.Core/ThreadsFunctions.cs

@@ -1206,6 +1206,8 @@ public static class ThreadsFunctions
             }
 
             // Send status to UI
+            MessageServices.Current.Publish(SEND_NC_STATUS_UI, null, ncAdapter.numericalControl.NC_IsConnected());
+            // Send status to signalr
             MessageServices.Current.Publish(SEND_NC_STATUS, null, ncAdapter.numericalControl.NC_IsConnected());
 
             Thread.Sleep(1000);

Thermo.Active.Model/Constants.cs

@@ -285,6 +285,7 @@ namespace Thermo.Active.Model
         public const string SEND_MESSAGE = "SEND_MESSAGE";
         public const string SEND_STOP_THREADS = "SEND_STOP_THREADS";
         public const string SEND_NC_STATUS = "NC_STATUS";
+        public const string SEND_NC_STATUS_UI = "NC_STATUS_UI";
         public const string SEND_THREADS_STATUS = "THREAD_STATUS";
         public const string SEND_CMSCONNECT_GW_REBOOT_STATUS = "SEND_CMSCONNECT_GW_REBOOT_STATUS";
         public const string SHOW_MSG_UI = "SHOW_MSG_UI";

Thermo.Active.UI/ServerControlWindow.cs

@@ -195,7 +195,7 @@ namespace Thermo.Active.UI
                     }
                 }),
                 // NC status handler
-                MessageServices.Current.Subscribe(SEND_NC_STATUS, (a, b) =>
+                MessageServices.Current.Subscribe(SEND_NC_STATUS_UI, (a, b) =>
                 {
                     bool newNcStatus = (bool)a;