From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Views/MachineCreationDialog.xaml               |  47 +-----
 .../Views/MachineDetailsView.xaml                  |  16 +-
 .../Views/MachineSettingsView.xaml                 | 184 +++++++++------------
 .../Views/MachineUpdateDetailsDialog.xaml          |  94 -----------
 .../Views/MachineUpdateDetailsDialog.xaml.cs       |  28 ----
 .../Views/MachineUpdatesView.xaml                  | 114 -------------
 .../Views/MachineUpdatesView.xaml.cs               |  28 ----
 .../Views/MachinesView.xaml                        |   4 +-
 .../Views/MainView.xaml                            |   2 +-
 .../Views/SpoolsView.xaml                          |  11 +-
 .../Views/TupView.xaml                             |  60 -------
 .../Views/TupView.xaml.cs                          |  28 ----
 12 files changed, 92 insertions(+), 524 deletions(-)
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml.cs
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml.cs
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/TupView.xaml
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/TupView.xaml.cs

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
index 0640b846e..e3ba1bff4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
@@ -6,15 +6,9 @@
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="400" d:DesignWidth="700" Height="460" Width="750" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:MachineCreationDialogVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource Dialog.Foreground}">
-
-    <UserControl.Resources>
-        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></converters:BooleanToVisibilityConverter>
-    </UserControl.Resources>
-
+             d:DesignHeight="400" d:DesignWidth="700" Height="400" Width="700" Background="White" d:DataContext="{d:DesignInstance Type=vm:MachineCreationDialogVM, IsDesignTimeCreatable=False}">
     <Grid Margin="10">
         <DockPanel>
             <Grid DockPanel.Dock="Top">
@@ -23,18 +17,7 @@
                         <Image Source="../Images/machine-full-fx.png" Width="120" RenderOptions.BitmapScalingMode="Fant"></Image>
                         <materialDesign:PackIcon HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -10 -10" Kind="PlusCircle" Foreground="#15C315" Width="42" Height="42" />
                     </Grid>
-                    <TextBlock Margin="30 0 0 0" VerticalAlignment="Bottom" FontSize="22">
-                        <TextBlock.Style>
-                            <Style TargetType="TextBlock">
-                                <Setter Property="Text" Value="CLONE MACHINE"></Setter>
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsNewMachine}" Value="True">
-                                        <Setter Property="Text" Value="NEW MACHINE"></Setter>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </TextBlock.Style>
-                    </TextBlock>
+                    <TextBlock Margin="30 0 0 0" VerticalAlignment="Bottom" FontSize="22">NEW MACHINE</TextBlock>
                 </StackPanel>
             </Grid>
 
@@ -50,30 +33,12 @@
             </Grid>
 
             <Grid>
-                <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20 20 0 0" Width="400">
-                    <TextBlock TextWrapping="Wrap" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Run>Please specify the machine version in order to prototype the new machine with default machine settings and configuration.</Run>
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="400">
+                    <TextBlock TextWrapping="Wrap" TextAlignment="Center">
+                        <Run>Please specify the machine version in order to prototype the new machine with default machine settings and configuartion.</Run>
                     </TextBlock>
 
-                    <ComboBox Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}" ItemsSource="{Binding MachineVersions}" SelectedItem="{Binding SelectedMachineVersion}" DisplayMemberPath="Name" Margin="0 10 0 0" FontSize="16" materialDesign:HintAssist.Hint="NONE"></ComboBox>
-
-                    <TextBlock Margin="0 20 0 0" FontSize="10">Serial Number</TextBlock>
-                    <TextBox Margin="0 2 0 0" Text="{Binding SerialNumber,UpdateSourceTrigger=PropertyChanged}"></TextBox>
-
-                    <TextBlock Margin="0 20 0 0" FontSize="10">Name</TextBlock>
-                    <TextBox Margin="0 2 0 0" Text="{Binding Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
-
-                    <CheckBox Margin="0 30 0 0" IsChecked="{Binding GenerateDispensers}">
-                        <TextBlock>
-                            <Run>Automatically generate 8 dispensers for this machine</Run>
-                            <Run>(</Run><Run Foreground="{StaticResource GrayBrush}" FontSize="10" Text="{Binding SerialNumber}"></Run><Run Foreground="{StaticResource GrayBrush}" FontSize="10">-1-8</Run><Run>)</Run>
-                        </TextBlock>
-                    </CheckBox>
-
-                    <StackPanel Margin="20 10 0 0" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <TextBlock FontSize="10">Dispenser max nl/cm</TextBlock>
-                        <mahapps:NumericUpDown Minimum="0" StringFormat="0.00" Maximum="10" InterceptMouseWheel="True" Value="{Binding DispenserFactor,Mode=TwoWay}" HorizontalContentAlignment="Left" Width="95" HorizontalAlignment="Left" BorderThickness="0 0 0 1" Margin="0 2 0 0" HideUpDownButtons="True" HasDecimals="True" Background="Transparent"></mahapps:NumericUpDown>
-                    </StackPanel>
+                    <ComboBox ItemsSource="{Binding MachineVersions}" SelectedItem="{Binding SelectedMachineVersion}" DisplayMemberPath="Name" Margin="0 10 0 0" FontSize="16" materialDesign:HintAssist.Hint="NONE"></ComboBox>
                 </StackPanel>
             </Grid>
         </DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
index b2b770698..1f748fe9f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
@@ -5,17 +5,11 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
              xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
-
-    <UserControl.Resources>
-        <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
-    </UserControl.Resources>
-    
     <Grid Margin="20">
         <DockPanel>
             <Grid DockPanel.Dock="Top">
@@ -29,7 +23,7 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 20 0">
-                    <Button Width="170" Height="45"  VerticalAlignment="Center" Command="{Binding SaveCommand}">
+                    <Button  Width="170" Height="45"  VerticalAlignment="Center" Command="{Binding SaveCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
                             <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
@@ -67,12 +61,6 @@
                     <TabItem Header="HW CONFIGURATION">
                         <local:HardwareConfigurationView/>
                     </TabItem>
-                    <TabItem Header="UPDATES" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                        <local:MachineUpdatesView/>
-                    </TabItem>
-                    <TabItem Header="TUP" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                        <local:TupView/>
-                    </TabItem>
                 </TabControl>
             </Grid>
         </DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index 76517ec37..40ce9ea08 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -6,7 +6,6 @@
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
              xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
@@ -14,11 +13,6 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
-
-    <UserControl.Resources>
-        <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter"/>
-    </UserControl.Resources>
-    
     <Grid Margin="20">
         <DockPanel>
             <Grid DockPanel.Dock="Bottom">
@@ -33,106 +27,84 @@
 
                 <local:MachineView DataContext="{Binding ActiveMachine}" IsHitTestVisible="False" />
 
-                <StackPanel Grid.Column="1" Margin="100 30">
-                    <Border CornerRadius="5" Background="{StaticResource TransparentBackgroundBrush600}" Padding="10" BorderBrush="{StaticResource borderBrush}" BorderThickness="1">
-                        <Grid TextElement.Foreground="{StaticResource GrayBrush280}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition/>
-                            </Grid.ColumnDefinitions>
-
-                            <StackPanel>
-                                <controls:TableGrid RowHeight="50" Margin="10">
-                                    <TextBlock FontWeight="SemiBold">Serial Number</TextBlock>
-                                    <TextBox Text="{Binding ActiveMachine.SerialNumber}"></TextBox>
-
-                                    <TextBlock FontWeight="SemiBold">Name</TextBlock>
-                                    <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
-
-                                    <TextBlock FontWeight="SemiBold">Head Type</TextBlock>
-                                    <ComboBox ItemsSource="{Binding Source={x:Type enumerations:HeadTypes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding ActiveMachine.MachineHeadType}" SelectedValuePath="Value" DisplayMemberPath="DisplayName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-
-                                    <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
-                                    <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}" ></ComboBox>
-
-                                    <TextBlock FontWeight="SemiBold">Organization</TextBlock>
-                                    <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-
-                                    <TextBlock FontWeight="SemiBold">Site</TextBlock>
-                                    <ComboBox Background="Transparent" ItemsSource="{Binding Sites}" SelectedItem="{Binding SelectedSite}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
-
-                                    <TextBlock FontWeight="SemiBold">OS Key</TextBlock>
-                                    <TextBox Text="{Binding ActiveMachine.OsKey}"></TextBox>
-
-                                    <TextBlock FontWeight="SemiBold">Device COM Port</TextBlock>
-                                    <TextBox Text="{Binding ActiveMachine.DeviceComPort}"></TextBox>
-                                </controls:TableGrid>
-
-                                <Button Margin="0 20 0 0" Background="{StaticResource RedBrush300}" ToolTip="Make this machine configuration as a prototype for the selected machine version" BorderBrush="{StaticResource RedBrush300}"  Width="200" Height="45"  VerticalAlignment="Bottom" Command="{Binding MakePrototypeCommand}">
-                                    <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Kind="Copyright" Width="24" Height="24" />
-                                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">MAKE PROTOTYPE</TextBlock>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
-
-                            <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="{StaticResource borderBrush}" HorizontalAlignment="Center" Margin="50 50" />
-                            <controls:TableGrid RowHeight="50" Margin="10" Grid.Column="2">
-                                <TextBlock FontWeight="SemiBold">Auto Login</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoLogin}"></ToggleButton>
-
-                                <!--<TextBlock FontWeight="SemiBold">Auto Check For Updates</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoCheckForUpdates}"></ToggleButton>-->
-
-                                <TextBlock FontWeight="SemiBold">Setup Activation</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupActivation}"></ToggleButton>
-
-                                <TextBlock FontWeight="SemiBold">Setup Remote Assistance</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupRemoteAssistance}"></ToggleButton>
-
-                                <TextBlock FontWeight="SemiBold">Setup UWF</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupUwf}"></ToggleButton>
-
-                                <TextBlock FontWeight="SemiBold">Setup Firmware</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupFirmware}"></ToggleButton>
-
-                                <TextBlock FontWeight="SemiBold">Setup FPGA</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupFpga}"></ToggleButton>
-
-                                <TextBlock FontWeight="SemiBold">Is Demo Machine</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.IsDemo}"></ToggleButton>
-
-                                <TextBlock FontWeight="SemiBold">Suspend Version Update</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SuspendVersionUpdate}"></ToggleButton>
-
-                                <TextBlock FontWeight="SemiBold">Force Version Update</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.ForceVersionUpdate}"></ToggleButton>
-
-                                <TextBlock FontWeight="SemiBold">Update Schema on Update</TextBlock>
-                                <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.PerformSchemaUpdateOnDataUpdate}"></ToggleButton>
-                            </controls:TableGrid>
-                        </Grid>
-                    </Border>
-
-                    <Border Visibility="{Binding ActiveMachine.IsDeviceRegistered,Converter={StaticResource BoolToVisConverter}}" Margin="0 10 0 0" CornerRadius="5" Background="{StaticResource TransparentBackgroundBrush600}" Padding="20" BorderBrush="{StaticResource borderBrush}" BorderThickness="1">
-                        <DockPanel>
-                            <StackPanel DockPanel.Dock="Left">
-                                <TextBlock FontSize="16" FontWeight="SemiBold">Device Registration</TextBlock>
-                                <TextBlock Margin="0 10 0 0">
-                                <Run FontWeight="SemiBold">Device ID:</Run>
-                                <Run Text="{Binding ActiveMachine.DeviceId}"></Run>
-                                </TextBlock>
-                                <TextBlock Margin="0 5 0 0">
-                                <Run FontWeight="SemiBold">Device Name:</Run>
-                                <Run Text="{Binding ActiveMachine.DeviceName}"></Run>
-                                </TextBlock>
-                            </StackPanel>
-
-                            <Button Command="{Binding ResetDeviceRegistrationCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Padding="10" Height="45" Width="240">RESET DEVICE REGISTRATION</Button>
-                        </DockPanel>
-                    </Border>
-                </StackPanel>
+                <Border Grid.Column="1" Margin="100 70" CornerRadius="5" Background="{StaticResource TransparentBackgroundBrush600}" Padding="10" BorderBrush="{StaticResource borderBrush}" BorderThickness="1">
+                    <Grid TextElement.Foreground="{StaticResource GrayBrush280}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <controls:TableGrid RowHeight="50" Margin="10">
+                            <TextBlock FontWeight="SemiBold">Serial Number</TextBlock>
+                            <TextBox Text="{Binding ActiveMachine.SerialNumber}"></TextBox>
+
+                            <TextBlock FontWeight="SemiBold">Name</TextBlock>
+                            <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
+
+                            <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
+                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">Organization</TextBlock>
+                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">Default RML</TextBlock>
+                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedItem="{Binding ActiveMachine.DefaultRml}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">Loaded RML</TextBlock>
+                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedValue="{Binding ActiveMachine.LoadedRmlGuid}" SelectedValuePath="Guid" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">Default Color Space</TextBlock>
+                            <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.ColorSpaces}" SelectedItem="{Binding ActiveMachine.DefaultColorSpace}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">Default Segment Length</TextBlock>
+                            <mahapps:NumericUpDown HideUpDownButtons="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="1000" Value="{Binding ActiveMachine.DefaultSegmentLength}" HasDecimals="False"></mahapps:NumericUpDown>
+
+                            <TextBlock FontWeight="SemiBold">Default Spool Type</TextBlock>
+                            <ComboBox  Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.SpoolTypes}" SelectedItem="{Binding ActiveMachine.DefaultSpoolType}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">OS Key</TextBlock>
+                            <TextBox Text="{Binding ActiveMachine.OsKey}"></TextBox>
+
+                            <TextBlock FontWeight="SemiBold">Device COM Port</TextBlock>
+                            <TextBox Text="{Binding ActiveMachine.DeviceComPort}"></TextBox>
+                        </controls:TableGrid>
+                        <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="{StaticResource borderBrush}" HorizontalAlignment="Center" Margin="50 50" />
+                        <controls:TableGrid RowHeight="50" Margin="10" Grid.Column="2">
+                            <TextBlock FontWeight="SemiBold">Auto Login</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoLogin}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Auto Check For Updates</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoCheckForUpdates}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Setup Activation</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupActivation}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Setup Remote Assistance</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupRemoteAssistance}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Setup UWF</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupUwf}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Setup Firmware</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupFirmware}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Setup FPGA</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupFpga}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Is Demo Machine</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.IsDemo}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Suspend Version Update</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SuspendVersionUpdate}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Force Version Update</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.ForceVersionUpdate}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Update Schema on Update</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.PerformSchemaUpdateOnDataUpdate}"></ToggleButton>
+                        </controls:TableGrid>
+                    </Grid>
+                </Border>
             </Grid>
         </DockPanel>
     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml
deleted file mode 100644
index 0e793dc6a..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml
+++ /dev/null
@@ -1,94 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.MachineDesigner.Views.MachineUpdateDetailsDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
-             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
-             mc:Ignorable="d" 
-             d:DesignHeight="400" d:DesignWidth="700" Height="700" Width="1280" Background="White" d:DataContext="{d:DesignInstance Type=vm:MachineUpdateDetailsDialogVM, IsDesignTimeCreatable=False}">
-    <UserControl.Resources>
-        <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
-        <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
-        <converters:StringToOneLineConverter x:Key="StringToOneLineConverter"  />
-    </UserControl.Resources>
-
-    <Grid>
-        <Grid Grid.RowSpan="2">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="60"/>
-                <RowDefinition Height="31*"/>
-                <RowDefinition Height="50"/>
-            </Grid.RowDefinitions>
-
-            <StackPanel Orientation="Horizontal" DataContext="{Binding Update}">
-                <materialDesign:PackIcon Width="42" Height="42" VerticalAlignment="Center">
-                    <materialDesign:PackIcon.Style>
-                        <Style TargetType="materialDesign:PackIcon">
-                            <Setter Property="Kind" Value="Information"></Setter>
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding IsSetup}" Value="True">
-                                    <Setter Property="Kind" Value="Settings"></Setter>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding IsUpdate}" Value="True">
-                                    <Setter Property="Kind" Value="CloudDownload"></Setter>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding IsDataBase}" Value="True">
-                                    <Setter Property="Kind" Value="Database"></Setter>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding IsSynchronization}" Value="True">
-                                    <Setter Property="Kind" Value="Sync"></Setter>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding IsOfflineUpdate}" Value="True">
-                                    <Setter Property="Kind" Value="Sd"></Setter>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding IsOfflineFirmwareUpgrade}" Value="True">
-                                    <Setter Property="Kind" Value="Chip"></Setter>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding IsStarted}" Value="True">
-                                    <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding IsCompleted}" Value="True">
-                                    <Setter Property="Foreground" Value="{StaticResource GreenBrush }"></Setter>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding IsFailed}" Value="True">
-                                    <Setter Property="Foreground" Value="Red"></Setter>
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </materialDesign:PackIcon.Style>
-                </materialDesign:PackIcon>
-                <TextBlock VerticalAlignment="Center" Text="{Binding UpdateStatus,Converter={StaticResource EnumToDescriptionConverter}}" TextWrapping="NoWrap" Height="22" TextTrimming="CharacterEllipsis" Width="500" Margin="10 0 0 0" FontSize="16"></TextBlock>
-            </StackPanel>
-
-            <Grid Grid.Row="1">
-                <DockPanel>
-                    <Grid DockPanel.Dock="Top">
-                        <controls:TableGrid RowHeight="30">
-                            <TextBlock Text="Started On:" FontWeight="SemiBold" />
-                            <TextBlock Text="{Binding Update.StartDate,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}"></TextBlock>
-                            <TextBlock Text="Application:" FontWeight="SemiBold" />
-                            <TextBlock Text="{Binding Update.ApplicationVersion}"></TextBlock>
-                            <TextBlock Text="Firmware:" FontWeight="SemiBold" />
-                            <TextBlock Text="{Binding Update.FirmwareVersion}"></TextBlock>
-                            <TextBlock Text="Ended:" FontWeight="SemiBold" />
-                            <TextBlock Text="{Binding Update.EndDate,TargetNullValue='Never',FallbackValue='Never',Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}"></TextBlock>
-                        </controls:TableGrid>
-                    </Grid>
-
-                    <Border Padding="5" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                        <TextBox BorderThickness="0" Text="{Binding Update.FailedLog,TargetNullValue='No further Information available.'}" Style="{x:Null}" TextWrapping="NoWrap" IsReadOnly="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Background="Transparent" />
-                    </Border>
-                </DockPanel>
-            </Grid>
-
-            <Grid Grid.Row="2">
-                <Button HorizontalAlignment="Right" Width="140" Command="{Binding CloseCommand}">CLOSE</Button>
-            </Grid>
-        </Grid>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml.cs
deleted file mode 100644
index 8bb051c51..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Tango.MachineStudio.MachineDesigner.Views
-{
-    /// <summary>
-    /// Interaction logic for MachineCreationDialog.xaml
-    /// </summary>
-    public partial class MachineUpdateDetailsDialog : UserControl
-    {
-        public MachineUpdateDetailsDialog()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml
deleted file mode 100644
index bd272718d..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml
+++ /dev/null
@@ -1,114 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.MachineDesigner.Views.MachineUpdatesView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
-             xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
-             mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1500" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
-
-    <UserControl.Resources>
-        <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
-        <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
-        <converters:StringToOneLineConverter x:Key="StringToOneLineConverter"  />
-    </UserControl.Resources>
-
-    <Grid Margin="20" DataContext="{Binding MachineUpdatesViewVM}">
-        <DockPanel IsEnabled="{Binding IsFree}">
-            <Grid DockPanel.Dock="Bottom">
-
-            </Grid>
-
-            <Grid Margin="0 20">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="38*"/>
-                    <ColumnDefinition Width="117*"/>
-                </Grid.ColumnDefinitions>
-
-                <local:MachineView Margin="30 80 0 0" DataContext="{Binding Machine}" IsHitTestVisible="False" VerticalAlignment="Top" Height="241" />
-
-                <DockPanel Grid.Column="1" Margin="50 100 50 50">
-                    <Grid DockPanel.Dock="Bottom" Height="50">
-                        <StackPanel Orientation="Horizontal">
-                            <CheckBox IsChecked="{Binding DisplayMachineSetups}">Machine Setups</CheckBox>
-                            <CheckBox IsChecked="{Binding DisplayApplicationUpdates}" Margin="30 0">Software Updates</CheckBox>
-                            <CheckBox IsChecked="{Binding DisplayDatabaseUpdates}">Database Updates</CheckBox>
-                            <CheckBox IsChecked="{Binding DisplaySynchronizations}" Margin="30 0 0 0">Synchronizations</CheckBox>
-                            <CheckBox IsChecked="{Binding DisplayOfflineUpdates}" Margin="30 0 0 0">Offline Updates</CheckBox>
-                            <CheckBox IsChecked="{Binding DisplayFirmwareUpgrades}" Margin="30 0 0 0">Offline Firmware Upgrades</CheckBox>
-                        </StackPanel>
-
-                        <Button Command="{Binding RefreshCommand}" HorizontalAlignment="Right" Width="150" Style="{StaticResource MaterialDesignFlatButton}">REFRESH</Button>
-                    </Grid>
-                    <Grid>
-                        <DataGrid Margin="0 0 0 10" SelectionUnit="FullRow" BorderBrush="{StaticResource borderBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" ItemsSource="{Binding Updates}" SelectedItem="{Binding SelectedUpdate}">
-                            <DataGrid.CellStyle>
-                                <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
-                                    <Setter Property="BorderThickness" Value="0"/>
-                                    <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-                                    <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-                                </Style>
-                            </DataGrid.CellStyle>
-                            <DataGrid.Columns>
-                                <DataGridTemplateColumn Header="">
-                                    <DataGridTemplateColumn.CellTemplate>
-                                        <DataTemplate>
-                                            <materialDesign:PackIcon Width="16" Height="16">
-                                                <materialDesign:PackIcon.Style>
-                                                    <Style TargetType="materialDesign:PackIcon">
-                                                        <Setter Property="Kind" Value="Information"></Setter>
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding IsSetup}" Value="True">
-                                                                <Setter Property="Kind" Value="Settings"></Setter>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding IsUpdate}" Value="True">
-                                                                <Setter Property="Kind" Value="CloudDownload"></Setter>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding IsDataBase}" Value="True">
-                                                                <Setter Property="Kind" Value="Database"></Setter>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding IsSynchronization}" Value="True">
-                                                                <Setter Property="Kind" Value="Sync"></Setter>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding IsOfflineUpdate}" Value="True">
-                                                                <Setter Property="Kind" Value="Sd"></Setter>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding IsOfflineFirmwareUpgrade}" Value="True">
-                                                                <Setter Property="Kind" Value="Chip"></Setter>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding IsStarted}" Value="True">
-                                                                <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding IsCompleted}" Value="True">
-                                                                <Setter Property="Foreground" Value="{StaticResource GreenBrush }"></Setter>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding IsFailed}" Value="True">
-                                                                <Setter Property="Foreground" Value="Red"></Setter>
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </materialDesign:PackIcon.Style>
-                                            </materialDesign:PackIcon>
-                                        </DataTemplate>
-                                    </DataGridTemplateColumn.CellTemplate>
-                                </DataGridTemplateColumn>
-                                <DataGridTextColumn Header="STARTED" Binding="{Binding StartDate,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="Auto" />
-                                <DataGridTextColumn Header="APPLICATION" Binding="{Binding ApplicationVersion}" Width="Auto" />
-                                <DataGridTextColumn Header="FIRMWARE" Binding="{Binding FirmwareVersion}" Width="Auto" />
-                                <DataGridTextColumn Header="ENDED" Binding="{Binding EndDate,TargetNullValue='Never',FallbackValue='Never',Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="Auto" />
-                                <DataGridTextColumn Header="STATUS" Binding="{Binding UpdateStatus,Converter={StaticResource EnumToDescriptionConverter}}" Width="Auto" />
-                                <DataGridTextColumn Header="REASON" Binding="{Binding FailedReason,Converter={StaticResource StringToOneLineConverter},ConverterParameter='80'}" Width="*" />
-                            </DataGrid.Columns>
-                        </DataGrid>
-                    </Grid>
-                </DockPanel>
-            </Grid>
-        </DockPanel>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml.cs
deleted file mode 100644
index d13ef2d0e..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Tango.MachineStudio.MachineDesigner.Views
-{
-    /// <summary>
-    /// Interaction logic for SpoolsView.xaml
-    /// </summary>
-    public partial class MachineUpdatesView : UserControl
-    {
-        public MachineUpdatesView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
index a231e92a3..35b578b6a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
@@ -15,7 +15,6 @@
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <UserControl.Resources>
         <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
-        <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -74,8 +73,7 @@
                         <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
                         <DataGridTextColumn Header="ORGANIZATION" Binding="{Binding Organization.Name}" Width="Auto" />
                         <DataGridTextColumn Header="VERSION" Binding="{Binding MachineVersion.Name}" Width="Auto" />
-                        <DataGridTextColumn Header="REGISTERED" Binding="{Binding IsDeviceRegistered,Converter={StaticResource BooleanToYesNoConverter}}" Width="Auto" />
-                        <DataGridTextColumn Header="DEMO MACHINE" Binding="{Binding IsDemo,Converter={StaticResource BooleanToYesNoConverter}}" Width="Auto" />
+                        <DataGridTextColumn Header="DEMO MACHINE" Binding="{Binding IsDemo}" Width="Auto" />
                         <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
                     </DataGrid.Columns>
                 </controls:DoubleClickDataGrid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
index 833086bf0..bc9b038dc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
@@ -9,7 +9,7 @@
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
-    <Grid IsEnabled="{Binding IsFree}">
+    <Grid>
         <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide">
             <local:MachinesView />
             <local:MachineDetailsView/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
index f08da88d1..3663f72f8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
@@ -9,14 +9,8 @@
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
              d:DesignHeight="720" d:DesignWidth="1280" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
-
-    <UserControl.Resources>
-        <converters:EmptyStringToNullConverter x:Key="EmptyStringToNullConverter" />
-    </UserControl.Resources>
-    
     <Grid Margin="20">
         <DockPanel>
             <Grid DockPanel.Dock="Bottom">
@@ -73,7 +67,10 @@
                                         </Style>
                                     </DataGridComboBoxColumn.EditingElementStyle>
                                 </DataGridComboBoxColumn>
-                                <DataGridTextColumn Header="LIMIT SWITCH START POINT OFFSET" Binding="{Binding LimitSwitchStartPointOffset,Converter={StaticResource EmptyStringToNullConverter}}" Width="1*" />
+                                <DataGridTextColumn Header="START OFFSET PULSES" Binding="{Binding StartOffsetPulses}" Width="Auto" />
+                                <DataGridTextColumn Header="BACKING RATE" Binding="{Binding BackingRate}" Width="Auto" />
+                                <DataGridTextColumn Header="SEGMENT OFFSET PULSES" Binding="{Binding SegmentOffsetPulses}" Width="Auto" />
+                                <DataGridTextColumn Header="BOTTOM BACKING RATE" Binding="{Binding BottomBackingRate}" Width="1*" />
                             </DataGrid.Columns>
                         </DataGrid>
                     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/TupView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/TupView.xaml
deleted file mode 100644
index 895a26ca0..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/TupView.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.MachineDesigner.Views.TupView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
-             xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
-              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
-             mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" Background="Transparent">
-
-    <Grid Margin="20" DataContext="{Binding TupViewVM}">
-        <DockPanel IsEnabled="{Binding IsFree}">
-            <Grid DockPanel.Dock="Bottom">
-
-            </Grid>
-
-            <Grid Margin="0 20">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="38*"/>
-                    <ColumnDefinition Width="117*"/>
-                </Grid.ColumnDefinitions>
-
-                <local:MachineView Margin="30 80 0 0" DataContext="{Binding Machine}" IsHitTestVisible="False" VerticalAlignment="Top" Height="241" />
-
-                <DockPanel Grid.Column="1" Margin="50 100 300 100">
-                    <TextBlock DockPanel.Dock="Top">
-                        <Run>Create a complete update package (.tup) in order to update this machine offline using a removable storage device.</Run>
-                        <LineBreak/>
-                        <Run>The latest PPC version is </Run>
-                        <Run Foreground="{StaticResource AccentColorBrush}" FontWeight="SemiBold" Text="{Binding LatestVersion,FallbackValue='loading...',TargetNullValue='loading...'}"></Run>
-                    </TextBlock>
-                    <Grid Margin="0 20 0 0">
-                        <Border Background="{StaticResource Transparent200}" CornerRadius="5" Padding="60" BorderThickness="1" BorderBrush="Silver">
-                            <DockPanel>
-                                <DockPanel DockPanel.Dock="Top" Height="40">
-                                    <Button Command="{Binding SelectFileCommand}" DockPanel.Dock="Right" BorderBrush="Silver" BorderThickness="1" Padding="0" Height="Auto" Width="40" Margin="5 0 0 0" Style="{StaticResource MaterialDesignFlatButton}">
-                                        <material:PackIcon Kind="Folder" />
-                                    </Button>
-                                    <TextBox materialDesign:HintAssist.Hint="Select package location" BorderBrush="Silver" BorderThickness="1" Text="{Binding FilePath}" IsReadOnly="True" VerticalContentAlignment="Center" Padding="10 0 0 0"></TextBox>
-                                </DockPanel>
-                                <StackPanel DockPanel.Dock="Bottom">
-                                    <TextBlock  HorizontalAlignment="Center" Text="{Binding Progress.Message,FallbackValue='Ready',TargetNullValue='Ready'}"></TextBlock>
-                                    <ProgressBar Margin="0 10 0 0" Height="15" IsIndeterminate="{Binding Progress.IsIntermediate}" Value="{Binding Progress.Progress}" Maximum="{Binding Progress.Total}"></ProgressBar>
-                                </StackPanel>
-                                <Grid>
-                                    <Button Command="{Binding CreateTupFileCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Padding="20 10" Height="60" Width="300">GENERATE UPDATE PACKAGE</Button>
-                                </Grid>
-                            </DockPanel>
-                        </Border>
-                    </Grid>
-                </DockPanel>
-            </Grid>
-        </DockPanel>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/TupView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/TupView.xaml.cs
deleted file mode 100644
index fe01296d8..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/TupView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Tango.MachineStudio.MachineDesigner.Views
-{
-    /// <summary>
-    /// Interaction logic for SpoolsView.xaml
-    /// </summary>
-    public partial class TupView : UserControl
-    {
-        public TupView()
-        {
-            InitializeComponent();
-        }
-    }
-}
-- 
cgit v1.3.1