MessageType

2 files changed, 19 insertions, 6 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
index 797d4dcb0..45f1c9b26 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -5,6 +5,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:integration="clr-namespace:Tango.Integration.Services;assembly=Tango.Integration"
+             xmlns:integ="clr-namespace:Tango.Integration.Operation;assembly=Tango.Integration"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
@@ -50,17 +51,19 @@
                     <RowDefinition Height="50"/>
                 </Grid.RowDefinitions>
 
-                <Grid>
+                <Grid d:DataContext="{d:DesignInstance Type=integ:MachineOperator, IsDesignTimeCreatable=False}">
                     <ContentControl Content="{Binding ApplicationManager.ConnectedMachine}">
                         <ContentControl.Resources>
                             <DataTemplate DataType="{x:Type integration:ExternalBridgeTcpClient}">
-                                <controls:TableGrid RowHeight="30">
+                                <controls:TableGrid RowHeight="22">
                                     <TextBlock FontWeight="SemiBold" Text="Serial Number:" />
                                     <TextBlock Text="{Binding SerialNumber}" />
                                     <TextBlock FontWeight="SemiBold" Text="Name:" />
                                     <TextBlock Text="{Binding Machine.Name}" />
                                     <TextBlock FontWeight="SemiBold" Text="Organization:" />
                                     <TextBlock Text="{Binding Machine.Organization.Name}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" />
+                                    <TextBlock Text="{Binding DeviceInformation.Version}" />
                                     <TextBlock FontWeight="SemiBold" Text="IP Address:" />
                                     <TextBlock Text="{Binding IPAddress}" />
                                     <TextBlock FontWeight="SemiBold" Text="Total Bytes Sent:" />
@@ -72,17 +75,23 @@
                                         <Run Text="{Binding Adapter.TransferRate,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}"></Run>
                                         <Run Text="/ second"></Run>
                                     </TextBlock>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable Diagnostics:" />
+                                    <ToggleButton IsChecked="{Binding EnableDiagnostics}" HorizontalAlignment="Left"></ToggleButton>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable Embedded Debug Logs:" />
+                                    <ToggleButton IsChecked="{Binding EnableEmbeddedDebugging}" HorizontalAlignment="Left"></ToggleButton>
                                 </controls:TableGrid>
                             </DataTemplate>
 
                             <DataTemplate DataType="{x:Type integration:ExternalBridgeUsbClient}">
-                                <controls:TableGrid RowHeight="30">
+                                <controls:TableGrid RowHeight="22">
                                     <TextBlock FontWeight="SemiBold" Text="Serial Number:" />
                                     <TextBlock Text="{Binding SerialNumber}" />
                                     <TextBlock FontWeight="SemiBold" Text="Name:" />
                                     <TextBlock Text="{Binding Machine.Name}" />
                                     <TextBlock FontWeight="SemiBold" Text="Organization:" />
                                     <TextBlock Text="{Binding Machine.Organization.Name}" />
+                                    <TextBlock FontWeight="SemiBold" Text="Embedded Software Version:" />
+                                    <TextBlock Text="{Binding DeviceInformation.Version}" />
                                     <TextBlock FontWeight="SemiBold" Text="COM Port:" />
                                     <TextBlock Text="{Binding ComPort}" />
                                     <TextBlock FontWeight="SemiBold" Text="Device:" />
@@ -96,6 +105,10 @@
                                         <Run Text="{Binding Adapter.TransferRate,Converter={StaticResource ByteArrayToFileSizeConverter},Mode=OneWay}"></Run>
                                         <Run Text="/ second"></Run>
                                     </TextBlock>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable Diagnostics:" />
+                                    <ToggleButton IsChecked="{Binding EnableDiagnostics}" HorizontalAlignment="Left"></ToggleButton>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable Embedded Debug Logs:" />
+                                    <ToggleButton IsChecked="{Binding EnableEmbeddedDebugging}" HorizontalAlignment="Left"></ToggleButton>
                                 </controls:TableGrid>
                             </DataTemplate>
                         </ContentControl.Resources>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
index e34cdb83b..a5c31af3d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
@@ -8,11 +8,11 @@
              xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" DataContext="{Binding UpdateViewVM, Source={StaticResource Locator}}" Background="White" FontSize="20">
+             d:DesignHeight="1080" d:DesignWidth="1920" DataContext="{Binding UpdateViewVM, Source={StaticResource Locator}}" FontSize="20">
     <Grid>
-        <Grid.Background>
+        <!--<Grid.Background>
             <ImageBrush ImageSource="/Images/White-Abstract.png" />
-        </Grid.Background>
+        </Grid.Background>-->
         <Grid MaxWidth="1200" MaxHeight="700">
             <DockPanel>
                 <Grid DockPanel.Dock="Top" HorizontalAlignment="Center">