1 files changed, 39 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs
index 14b9d0d8e..e3726f1dd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs
@@ -50,6 +50,35 @@ namespace Tango.MachineStudio.UI.ViewModels
             set { upgradeError = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _dfu;
+        public bool DFU
+        {
+            get { return _dfu; }
+            set
+            {
+                _dfu = value; RaisePropertyChangedAuto();
+
+                if (_dfu)
+                {
+                    UploadTFP = false;
+                }
+            }
+        }
+
+        private bool _uploadTFP;
+        public bool UploadTFP
+        {
+            get { return _uploadTFP; }
+            set
+            {
+                _uploadTFP = value; RaisePropertyChangedAuto();
+
+                if (_uploadTFP)
+                {
+                    DFU = false;
+                }
+            }
+        }
 
         public RelayCommand SelectCommand { get; set; }
 
@@ -59,6 +88,8 @@ namespace Tango.MachineStudio.UI.ViewModels
 
         public FirmwareUpgradeViewVM(IMachineOperator machineOperator, INotificationProvider notificationProvider) : base()
         {
+            DFU = true;
+            UploadTFP = true;
             _notification = notificationProvider;
             _operator = machineOperator;
             SelectCommand = new RelayCommand(BrowseForFile);
@@ -101,7 +132,14 @@ namespace Tango.MachineStudio.UI.ViewModels
             {
                 IsFree = false;
 
-                _operator.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU;
+                if (UploadTFP)
+                {
+                    _operator.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
+                }
+                else
+                {
+                    _operator.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU;
+                }
 
                 _stream = new FileStream(SelectedFile, FileMode.Open);
                 Handler = await _operator.UpgradeFirmware(_stream);