From 0cd0b590f62b31a8874ea21f225ba75c7a37053c Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 17 Feb 2019 11:46:27 +0200
Subject: Improved firmware upgrade.. Added firmware upgrade type selection to
 machine studio. Made upload hw config async when connecting. Removed success
 message for hw upload after connect.

---
 .../Views/FirmwareUpgradeView.xaml                      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

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

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 4de64db12..9acd0386a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
@@ -25,7 +25,7 @@
             </Style.Triggers>
         </Style>
     </UserControl.Style>
-    
+
     <Grid>
         <Grid Margin="10">
             <Grid.RowDefinitions>
@@ -58,10 +58,17 @@
                         <LineBreak/>
                         <Run>Press 'SELECT' to browse for an .tfp file (Tango Firmware Package).</Run>
                                 </TextBlock>
-                                <DockPanel Margin="0 30 0 0" Width="600" HorizontalAlignment="Left">
-                                    <Button DockPanel.Dock="Right" Margin="10 0 0 0" Command="{Binding SelectCommand}">SELECT</Button>
-                                    <TextBox Style="{x:Null}" VerticalContentAlignment="Center" BorderBrush="{StaticResource AccentColorBrush}" Padding="5 0" Foreground="DimGray" IsReadOnly="True" Text="{Binding SelectedFile,Mode=OneWay}"></TextBox>
-                                </DockPanel>
+                                <StackPanel>
+                                    <DockPanel Margin="0 30 0 0" Width="600" HorizontalAlignment="Left">
+                                        <Button DockPanel.Dock="Right" Margin="10 0 0 0" Command="{Binding SelectCommand}">SELECT</Button>
+                                        <TextBox Style="{x:Null}" VerticalContentAlignment="Center" BorderBrush="{StaticResource AccentColorBrush}" Padding="5 0" Foreground="DimGray" IsReadOnly="True" Text="{Binding SelectedFile,Mode=OneWay}"></TextBox>
+                                    </DockPanel>
+
+                                    <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>
+                                    </StackPanel>
+                                </StackPanel>
                             </StackPanel>
 
                             <Grid Height="60" Grid.Row="1">
-- 
cgit v1.3.1