From 2248c386c45aa0b1f2d077907424b6fdbcc0d53c Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 24 Feb 2019 20:26:44 +0200
Subject: Machine Studio v4.0.9 PPC v1.0.3

---
 .../ViewModels/FirmwareUpgradeViewVM.cs            | 32 +++++++++++++++++++---
 .../Views/FirmwareUpgradeView.xaml                 |  3 +-
 2 files changed, 30 insertions(+), 5 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')

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 e54c28e17..e45c29f73 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs
@@ -61,6 +61,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                 if (_dfu)
                 {
                     UploadTFP = false;
+                    DFUAndTFP = false;
                 }
             }
         }
@@ -76,10 +77,29 @@ namespace Tango.MachineStudio.UI.ViewModels
                 if (_uploadTFP)
                 {
                     DFU = false;
+                    DFUAndTFP = false;
                 }
             }
         }
 
+        private bool _dfuAndTFP;
+
+        public bool DFUAndTFP
+        {
+            get { return _dfuAndTFP; }
+            set
+            {
+                _dfuAndTFP = value; RaisePropertyChangedAuto();
+
+                if (_dfuAndTFP)
+                {
+                    DFU = false;
+                    UploadTFP = false;
+                }
+            }
+        }
+
+
         public RelayCommand SelectCommand { get; set; }
 
         public RelayCommand UpgradeCommand { get; set; }
@@ -131,13 +151,17 @@ namespace Tango.MachineStudio.UI.ViewModels
             {
                 IsFree = false;
 
-                if (UploadTFP)
+                if (DFU)
                 {
-                    _operator.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
+                    _operator.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU;
                 }
-                else
+                else if (UploadTFP)
                 {
-                    _operator.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU;
+                    _operator.FirmwareUpgradeMode = FirmwareUpgradeModes.TFP_PACKAGE;
+                }
+                else if (DFUAndTFP)
+                {
+                    _operator.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
                 }
 
                 _stream = new FileStream(SelectedFile, FileMode.Open);
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
index 9acd0386a..976c3866a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
@@ -66,7 +66,8 @@
 
                                     <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
                                         <RadioButton IsChecked="{Binding DFU,Mode=TwoWay}">DFU</RadioButton>
-                                        <RadioButton IsChecked="{Binding UploadTFP,Mode=TwoWay}" Margin="20 0 0 0">DFU &amp; Package</RadioButton>
+                                        <RadioButton IsChecked="{Binding UploadTFP,Mode=TwoWay}" Margin="25 0 0 0">TFP Package</RadioButton>
+                                        <RadioButton IsChecked="{Binding DFUAndTFP,Mode=TwoWay}" Margin="10 0 0 0">DFU &amp; Package</RadioButton>
                                     </StackPanel>
                                 </StackPanel>
                             </StackPanel>
-- 
cgit v1.3.1