From 73196dd48da9d16b6949ab9dec0ae0a5d63accfe Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 14 Feb 2019 18:50:59 +0200
Subject: Working on DFU firmware upgrade...

---
 .../ViewModels/FirmwareUpgradeViewVM.cs                     | 13 +++++++++++++
 .../Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml   | 11 +++++++++++
 2 files changed, 24 insertions(+)

(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 09b63cfc9..14b9d0d8e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs
@@ -5,11 +5,14 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
 using Tango.Core.Commands;
 using Tango.Integration.Operation;
 using Tango.Integration.Upgrade;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.SharedUI;
+using Tango.SharedUI.Helpers;
 
 namespace Tango.MachineStudio.UI.ViewModels
 {
@@ -96,6 +99,10 @@ namespace Tango.MachineStudio.UI.ViewModels
 
             try
             {
+                IsFree = false;
+
+                _operator.FirmwareUpgradeMode = FirmwareUpgradeModes.DFU;
+
                 _stream = new FileStream(SelectedFile, FileMode.Open);
                 Handler = await _operator.UpgradeFirmware(_stream);
                 Handler.Progress += (_, e) =>
@@ -104,18 +111,22 @@ namespace Tango.MachineStudio.UI.ViewModels
                     {
                         AbortCommand.RaiseCanExecuteChanged();
                     });
+
+                    UIHelper.DoEvents();
                 };
                 Handler.Completed += (_, __) =>
                 {
                     CanClose = true;
                     _stream.Dispose();
                     CurrentPage = 2;
+                    IsFree = true;
                 };
                 Handler.Canceled += (_, __) =>
                 {
                     CanClose = true;
                     _stream.Dispose();
                     CurrentPage = 0;
+                    IsFree = true;
                 };
                 Handler.Failed += (_, ex) =>
                 {
@@ -123,10 +134,12 @@ namespace Tango.MachineStudio.UI.ViewModels
                     CanClose = true;
                     _stream.Dispose();
                     CurrentPage = 3;
+                    IsFree = true;
                 };
             }
             catch (Exception ex)
             {
+                IsFree = true;
                 CanClose = true;
                 UpgradeError = ex.FlattenMessage();
                 CurrentPage = 3;
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 84f4b2d92..4de64db12 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
@@ -14,6 +14,17 @@
     <UserControl.Resources>
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
     </UserControl.Resources>
+
+    <UserControl.Style>
+        <Style TargetType="UserControl">
+            <Setter Property="Cursor" Value="Arrow"></Setter>
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding IsFree}" Value="False">
+                    <Setter Property="Cursor" Value="Wait"></Setter>
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
+    </UserControl.Style>
     
     <Grid>
         <Grid Margin="10">
-- 
cgit v1.3.1