aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
diff options
context:
space:
mode:
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs32
1 files changed, 28 insertions, 4 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 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);