Improved machine operator firmware upgrade on emulated devices.

added isEmulated flag.
Dropped the need to modify the FirmwareUpgrade mode when emulated due to this new flag.

3 files changed, 14 insertions, 41 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/BackupRestore/DefaultBackupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/BackupRestore/DefaultBackupManager.cs
index 495521dd9..087534d48 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/BackupRestore/DefaultBackupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/BackupRestore/DefaultBackupManager.cs
@@ -510,16 +510,10 @@ namespace Tango.PPC.Common.BackupRestore
 
                             var stream = new FileStream(tfpFile, FileMode.Open);
 
-                            if (_machineProvider.Machine.IsDemo)
-                            {
-                                _machineProvider.MachineOperator.FirmwareUpgradeMode = FirmwareUpgradeModes.TFP_PACKAGE;
-                            }
-                            else
-                            {
-                                _machineProvider.MachineOperator.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
-                            }
+                            _machineProvider.MachineOperator.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
+
 
-                            var handler = _machineProvider.MachineOperator.UpgradeFirmware(stream).Result;
+                            var handler = _machineProvider.MachineOperator.UpgradeFirmware(stream, _machineProvider.Machine.IsDemo).Result;
                             handler.Failed += (_, ex) =>
                             {
                                 stream.Dispose();
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 2177efecc..a2a750805 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -436,7 +436,7 @@ namespace Tango.PPC.Common.MachineSetup
                     UpdateProgress("Updating Firmware", "Loading firmware package...");
                     var tfpPath = Path.Combine(_newPackageTempFolder, "firmware_package.tfp");
                     var stream = new FileStream(tfpPath, FileMode.Open);
-                    var handler = await op.UpgradeFirmware(stream);
+                    var handler = await op.UpgradeFirmware(stream, setup_response.IsDemo);
                     handler.Failed += (_, ex) =>
                     {
                         stream.Dispose();
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 c73cc6196..bbc8d93f6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -843,23 +843,16 @@ namespace Tango.PPC.Common.MachineUpdate
                     var tfpPath = Path.Combine(_newPackageTempFolder, "firmware_package.tfp");
                     var stream = new FileStream(tfpPath, FileMode.Open);
 
-                    if (!_machineProvider.Machine.IsDemo)
+                    if (setupFPGA)
                     {
-                        if (setupFPGA)
-                        {
-                            op.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
-                        }
-                        else
-                        {
-                            op.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU;
-                        }
+                        op.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
                     }
                     else
                     {
-                        op.FirmwareUpgradeMode = FirmwareUpgradeModes.TFP_PACKAGE;
+                        op.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU;
                     }
 
-                    var handler = await op.UpgradeFirmware(stream);
+                    var handler = await op.UpgradeFirmware(stream, _machineProvider.Machine.IsDemo);
                     handler.Failed += (_, ex) =>
                     {
                         stream.Dispose();
@@ -1432,23 +1425,16 @@ namespace Tango.PPC.Common.MachineUpdate
                     var tfpPath = Path.Combine(_newPackageTempFolder, "firmware_package.tfp");
                     var stream = new FileStream(tfpPath, FileMode.Open);
 
-                    if (!_machineProvider.Machine.IsDemo)
+                    if (setupFPGA)
                     {
-                        if (setupFPGA)
-                        {
-                            op.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
-                        }
-                        else
-                        {
-                            op.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU;
-                        }
+                        op.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
                     }
                     else
                     {
-                        op.FirmwareUpgradeMode = FirmwareUpgradeModes.TFP_PACKAGE;
+                        op.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU;
                     }
 
-                    var handler = await op.UpgradeFirmware(stream);
+                    var handler = await op.UpgradeFirmware(stream, _machineProvider.Machine.IsDemo);
                     handler.Failed += (_, ex) =>
                     {
                         stream.Dispose();
@@ -1543,16 +1529,9 @@ namespace Tango.PPC.Common.MachineUpdate
                 LogManager.Log("-------------------------------------------------------------------------");
                 LogManager.Log("Updating Firmware...");
 
-                if (!_machineProvider.Machine.IsDemo)
-                {
-                    op.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
-                }
-                else
-                {
-                    op.FirmwareUpgradeMode = FirmwareUpgradeModes.TFP_PACKAGE;
-                }
+                op.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
 
-                var handler = await op.UpgradeFirmware(stream);
+                var handler = await op.UpgradeFirmware(stream, _machineProvider.Machine.IsDemo);
                 handler.Failed += (_, ex) =>
                 {
                     stream.Dispose();