Eureka adjustments.

4 files changed, 36 insertions, 6 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..a897c806c 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,15 @@ 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.SetupFirmware = false;
+                        setup_response.SetupFPGA = false;
+                        setup_response.SetupUWF = false;
+                        setup_response.SetupRemoteAssistance = false;
+                    }
                 }
                 catch (Exception ex)
                 {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index c5412e591..64ca496f7 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -37,6 +37,7 @@ using Tango.BL.DTO;
 using Tango.PPC.Shared.Updates;
 using Tango.PPC.Shared.RemoteUpgrade;
 using Tango.Core.Threading;
+using Tango.PPC.Common.Build;
 
 namespace Tango.PPC.Common.MachineUpdate
 {
@@ -45,6 +46,7 @@ namespace Tango.PPC.Common.MachineUpdate
         private IPPCApplicationManager _app_manager;
         private IMachineProvider _machineProvider;
         private IPackageRunner _packageRunner;
+        private IBuildProvider _buildProvider;
         private PPCWebClient _client;
         private List<LogItemBase> _logs;
         private System.Timers.Timer _checkForUpdateTimer;
@@ -101,13 +103,14 @@ namespace Tango.PPC.Common.MachineUpdate
         /// Initializes a new instance of the <see cref="MachineUpdateManager"/> class.
         /// </summary>
         /// <param name="applicationManager">The application manager.</param>
-        public MachineUpdateManager(PPCWebClient ppcWebClient, IPPCApplicationManager applicationManager, IMachineProvider machineProvider, IPackageRunner packageRunner, IPPCExternalBridgeService externalBridge)
+        public MachineUpdateManager(PPCWebClient ppcWebClient, IPPCApplicationManager applicationManager, IMachineProvider machineProvider, IPackageRunner packageRunner, IPPCExternalBridgeService externalBridge, IBuildProvider buildProvider)
         {
             _client = ppcWebClient;
             _machineProvider = machineProvider;
             _app_manager = applicationManager;
             _app_manager.ApplicationReady += _app_manager_ApplicationReady;
             _packageRunner = packageRunner;
+            _buildProvider = buildProvider;
             _packageRunner.PackageProgress += _packageRunner_PackageProgress;
 
             _logs = new List<LogItemBase>();
@@ -658,6 +661,12 @@ namespace Tango.PPC.Common.MachineUpdate
         /// <exception cref="System.InvalidProgramException">Database tango does not exists.</exception>
         public async Task<MachineUpdateResult> Update(bool setupFirmware, bool setupFPGA)
         {
+            if (_buildProvider.IsEureka)
+            {
+                setupFirmware = false;
+                setupFPGA = false;
+            }
+
             _updateStartDate = DateTime.UtcNow;
             _logs.Clear();
 
@@ -702,7 +711,7 @@ namespace Tango.PPC.Common.MachineUpdate
                     }
                 }
 
-                if (!op.CanPrint)
+                if (op.Status == MachineStatuses.Printing || op.Status == MachineStatuses.GettingReady)
                 {
                     throw LogManager.Log(new InvalidOperationException($"Could not perform an update while the machine is in {op.Status} status."));
                 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index 6fb521838..c45aad51e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -350,6 +350,11 @@ namespace Tango.PPC.Common
         public double FineTuningMinLimitdL { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether to force full screen mode on TwineX4.
+        /// </summary>
+        public bool ForceTouchMode { get; set; }
+
+        /// <summary>
         /// Gets the machine service address.
         /// </summary>
         /// <returns></returns>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs
index 983868c2c..03a004e6a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs
@@ -28,6 +28,8 @@ namespace Tango.PPC.Common.Publish
         /// </summary>
         public event EventHandler<PublishProgressEventArgs> PublishProgress;
 
+        public bool IsEureka { get; set; }
+
         private PublishOptions _options;
         /// <summary>
         /// Gets or sets the publish options.
@@ -200,7 +202,7 @@ namespace Tango.PPC.Common.Publish
                         String output_folder = Options.InstallerOutputFolder;
                         OnPublishProgress(0, 100, $"Building installer project...");
                         InstallerBuilder installerBuilder = new InstallerBuilder(Options.InstallerProject);
-                        String installer_name = $"PPC Installer_v{Version.Parse(local_version).ToString(3) + (Options.Tag.IsNotNullOrEmpty() ? $" [{Options.Tag}]" : String.Empty)}.exe";
+                        String installer_name = $"{(IsEureka ? "TwineX4" : "PPC")} Installer_v{Version.Parse(local_version).ToString(3) + (Options.Tag.IsNotNullOrEmpty() ? $" [{Options.Tag}]" : String.Empty)}.exe";
                         String output_file = Path.Combine(output_folder, installer_name);
                         installerBuilder.Build(local_version, output_file).Wait();
 
@@ -432,7 +434,9 @@ namespace Tango.PPC.Common.Publish
                         var cuf = zip.AddFile(update_config_file, update_dir);
                         cuf.FileName = update_dir + "\\config.xml";
 
-                        zip.AddDirectory(folder + "\\" + "Packages", "/Packages");
+                        String packagesFolder = folder + "\\" + "Packages";
+                        Directory.CreateDirectory(packagesFolder);
+                        zip.AddDirectory(packagesFolder, "/Packages");
 
                         foreach (var file in Directory.GetFiles(folder, "*.*", SearchOption.TopDirectoryOnly))
                         {