Merged Eureka Branch !!!

1 files changed, 12 insertions, 2 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
index 45fd6c1b8..0d64da83e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -32,6 +32,7 @@ using Tango.SharedUI.Helpers;
 using Tango.SQLExaminer;
 using Tango.Transport.Web;
 using System.Data.Entity;
+using Tango.PPC.Common.Build;
 
 namespace Tango.PPC.Common.MachineSetup
 {
@@ -45,6 +46,7 @@ namespace Tango.PPC.Common.MachineSetup
         private IRemoteAssistanceProvider _remoteAssistance;
         private IUnifiedWriteFilterManager _uwf;
         private IOperationSystemManager _windows_manager;
+        private IBuildProvider _buildProvider;
         private PPCWebClient _client;
         private List<LogItemBase> _logs;
         private bool _isUpdating;
@@ -81,12 +83,13 @@ namespace Tango.PPC.Common.MachineSetup
         /// Initializes a new instance of the <see cref="MachineSetupManager"/> class.
         /// </summary>
         /// <param name="remoteAssistance">The remote assistance.</param>
-        public MachineSetupManager(PPCWebClient ppcWebClient, IRemoteAssistanceProvider remoteAssistance, IUnifiedWriteFilterManager unifiedWriterFilterManager, IOperationSystemManager operationSystemManager)
+        public MachineSetupManager(PPCWebClient ppcWebClient, IRemoteAssistanceProvider remoteAssistance, IUnifiedWriteFilterManager unifiedWriterFilterManager, IOperationSystemManager operationSystemManager, IBuildProvider buildProvider)
         {
             _client = ppcWebClient;
             _remoteAssistance = remoteAssistance;
             _uwf = unifiedWriterFilterManager;
             _windows_manager = operationSystemManager;
+            _buildProvider = buildProvider;
 
             _logs = new List<LogItemBase>();
             LogManager.NewLog += LogManager_NewLog;
@@ -235,7 +238,7 @@ namespace Tango.PPC.Common.MachineSetup
 
                 Login(serialNumber).Wait();
 
-                String deviceName = $"Tango-{serialNumber}-{settings.DeploymentSlot.ToString()}";
+                String deviceName = $"{(_buildProvider.BuildType == BuildType.TS1800 ? "PPC" : "TwineX4")}{serialNumber}{settings.DeploymentSlot.ToString()}";
                 LogManager.Log($"Settings device name: '{deviceName}'...");
                 try
                 {
@@ -254,6 +257,13 @@ namespace Tango.PPC.Common.MachineSetup
                 {
                     LogManager.Log($"Sending setup request...\n{request.ToJsonString()}");
                     setup_response = await _client.MachineSetup(request);
+
+                    if (_buildProvider.IsEureka)
+                    {
+                        setup_response.SetupActivation = false;
+                        setup_response.SetupUWF = false;
+                        setup_response.SetupRemoteAssistance = false;
+                    }
                 }
                 catch (Exception ex)
                 {