aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-02-17 11:46:27 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-02-17 11:46:27 +0200
commit0cd0b590f62b31a8874ea21f225ba75c7a37053c (patch)
tree7cfda9f863eb827b5c3ea14eeddf638e73841ffd /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views
parent7d7d28fdeab29f74d064e50f19a4985c763ee813 (diff)
downloadTango-0cd0b590f62b31a8874ea21f225ba75c7a37053c.tar.gz
Tango-0cd0b590f62b31a8874ea21f225ba75c7a37053c.zip
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.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml17
1 files changed, 12 insertions, 5 deletions
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">