External Bridge Delay for PPC.

4 files changed, 23 insertions, 4 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/ExternalBridge/PPCExternalBridgeService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/ExternalBridge/PPCExternalBridgeService.cs
index 99951d812..1bf180dc5 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/ExternalBridge/PPCExternalBridgeService.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/ExternalBridge/PPCExternalBridgeService.cs
@@ -7,11 +7,13 @@ using System.Threading.Tasks;
 using Tango.BL.Entities;
 using Tango.Core.DI;
 using Tango.Core.Helpers;
+using Tango.Core.Threading;
 using Tango.CSV;
 using Tango.Integration.ExternalBridge;
 using Tango.Integration.Operation;
 using Tango.PMR.Common;
 using Tango.PPC.Common.Application;
+using Tango.PPC.Common.Build;
 using Tango.PPC.Common.Connection;
 using Tango.PPC.Common.Messages;
 using Tango.Settings;
@@ -30,13 +32,17 @@ namespace Tango.PPC.Common.ExternalBridge
     /// <seealso cref="Tango.PPC.Common.ExternalBridge.IPPCExternalBridgeService" />
     public class PPCExternalBridgeService : ExternalBridgeService, IPPCExternalBridgeService
     {
+        private IBuildProvider _buildProvider;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PPCExternalBridgeService"/> class.
         /// </summary>
         /// <param name="applicationManager">The application manager.</param>
         /// <param name="machineProvider">The machine provider.</param>
-        public PPCExternalBridgeService(IPPCApplicationManager applicationManager, IMachineProvider machineProvider)
+        public PPCExternalBridgeService(IPPCApplicationManager applicationManager, IMachineProvider machineProvider, IBuildProvider buildProvider)
         {
+            _buildProvider = buildProvider;
+
             var csvStream = EmbeddedResourceHelper.GetEmbeddedResourceStream("Tango.PPC.Common.SafetyLevelOperations.csv");
 
             List<CsvEntry> entries = CsvFile.Read<CsvEntry>(new CsvSource(csvStream)).ToList();
@@ -67,7 +73,18 @@ namespace Tango.PPC.Common.ExternalBridge
                     SignalRConfiguration.Address = settings.DeploymentSlot.ToAddress();
                 }
                 SignalRConfiguration.Hub = settings.ExternalBridgeSignalRHub;
-                Enabled = settings.EnableExternalBridge;
+
+                if (_buildProvider.BuildType == BuildType.TS1800)
+                {
+                    TimeoutTask.StartNew(() =>
+                    {
+                        Enabled = settings.EnableExternalBridge;
+                    }, TimeSpan.FromMinutes(2));
+                }
+                else
+                {
+                    Enabled = settings.EnableExternalBridge;
+                }
             };
         }
     }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index ca20fe608..f980d9c22 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -272,6 +272,8 @@ namespace Tango.PPC.UI.PPCApplication
                     {
                         try
                         {
+                            settings.EnableProxifier = false;
+                            Thread.Sleep(TimeSpan.FromMinutes(1));
                             LogManager.Log("Disabling Proxy...");
                             CmdCommand cmd = null;
                             CmdCommandResult result = null;
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 3ba68c9d5..249a4ceb2 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")] 
-[assembly: AssemblyVersion("2.3.4.0")]
+[assembly: AssemblyVersion("2.3.7.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>