Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software

23 files changed, 397 insertions, 100 deletions

diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto
index 753f3392a..7b7115d50 100644
--- a/Software/PMR/Messages/Common/MessageType.proto
+++ b/Software/PMR/Messages/Common/MessageType.proto
@@ -319,6 +319,8 @@ enum MessageType
 	//IFS
 	StartInkFillingStatusRequest = 12000;
 	StartInkFillingStatusResponse = 12001;
+	InitiateInkFillingRequest = 12002;
+	InitiateInkFillingResponse = 12003;
 
 	//DataStore
 	PutDataStoreItemRequest = 13000;
diff --git a/Software/PMR/Messages/IFS/InitiateInkFillingRequest.proto b/Software/PMR/Messages/IFS/InitiateInkFillingRequest.proto
new file mode 100644
index 000000000..6f82accff
--- /dev/null
+++ b/Software/PMR/Messages/IFS/InitiateInkFillingRequest.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package Tango.PMR.MachineStatus;
+option java_package = "com.twine.tango.pmr.machinestatus";
+
+message InitiateInkFillingRequest
+{
+    
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/IFS/InitiateInkFillingResponse.proto b/Software/PMR/Messages/IFS/InitiateInkFillingResponse.proto
new file mode 100644
index 000000000..ba84c0b5f
--- /dev/null
+++ b/Software/PMR/Messages/IFS/InitiateInkFillingResponse.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package Tango.PMR.MachineStatus;
+option java_package = "com.twine.tango.pmr.machinestatus";
+
+message InitiateInkFillingResponse
+{
+    
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/MachineStatus.proto b/Software/PMR/Messages/MachineStatus/MachineStatus.proto
index 4e0649510..9ea3db19d 100644
--- a/Software/PMR/Messages/MachineStatus/MachineStatus.proto
+++ b/Software/PMR/Messages/MachineStatus/MachineStatus.proto
@@ -13,5 +13,5 @@ message MachineStatus
 	repeated IDSPackLevel IDSPacksLevels = 2;
 	double OverallTemperature = 3;
 	SpoolState SpoolState = 4;
-	bool AutoInkFillingDisabled = 5;
+	bool AutoInkFillingEnabled = 5;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/SetInkAutoFillingModeRequest.proto b/Software/PMR/Messages/MachineStatus/SetInkAutoFillingModeRequest.proto
index 68bb65fca..9d3647342 100644
--- a/Software/PMR/Messages/MachineStatus/SetInkAutoFillingModeRequest.proto
+++ b/Software/PMR/Messages/MachineStatus/SetInkAutoFillingModeRequest.proto
@@ -5,5 +5,5 @@ option java_package = "com.twine.tango.pmr.machinestatus";
 
 message SetInkAutoFillingModeRequest
 {
-    bool Disabled = 1;
+    bool Enable = 1;
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
index 1a2038cfa..5fe5afe5a 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index a142596ca..df89b2c7b 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{81A2A484-1DAD-4B56-8746-16580C7215A1} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{3543A10B-DFB2-4DDC-B586-8AB0DE719603} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.7.10.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.7.11.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -509,7 +509,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.7.10" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.7.10"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.7.11" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.7.11"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
index 132f33849..87a1a361f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
@@ -399,7 +399,7 @@
 
                                         <DockPanel Margin="0 20 0 0" TextElement.FontSize="{StaticResource TangoDefaultFontSize}">
                                             <TextBlock VerticalAlignment="Center">Gradient Resolution CM</TextBlock>
-                                            <touch:TouchNumericTextBox Minimum="10" Maximum="500" KeyboardContainer="{Binding ElementName=Container}" Value="{Binding Settings.GradientGenerationResolution}" Margin="0 0 100 0" DockPanel.Dock="Right" HorizontalAlignment="Right" Width="90"></touch:TouchNumericTextBox>
+                                            <touch:TouchNumericTextBox Minimum="40" Maximum="500" KeyboardContainer="{Binding ElementName=Container}" Value="{Binding Settings.GradientGenerationResolution}" Margin="0 0 100 0" DockPanel.Dock="Right" HorizontalAlignment="Right" Width="90"></touch:TouchNumericTextBox>
                                         </DockPanel>
 
                                         <DockPanel Margin="0 20 0 0" TextElement.FontSize="{StaticResource TangoDefaultFontSize}">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
index 6e1d76d9d..cd646ce02 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
@@ -92,11 +92,11 @@ namespace Tango.PPC.Maintenance.ViewModels
             set { _wasteStates = value; RaisePropertyChangedAuto(); }
         }
 
-        private bool _isInkAutoFillingDisabled;
-        public bool IsInkAutoFillingDisabled
+        private bool _isInkAutoFillingEnabled;
+        public bool IsInkAutoFillingEnabled
         {
-            get { return _isInkAutoFillingDisabled; }
-            set { _isInkAutoFillingDisabled = value; RaisePropertyChangedAuto(); OnInkAutoFillingChanged(); }
+            get { return _isInkAutoFillingEnabled; }
+            set { _isInkAutoFillingEnabled = value; RaisePropertyChangedAuto(); OnInkAutoFillingChanged(); }
         }
 
         public RelayCommand ExportLogsCommand { get; set; }
@@ -190,8 +190,8 @@ namespace Tango.PPC.Maintenance.ViewModels
             UpdateMidTankLevels(status);
             OverallTemperature.Temperature = status.OverallTemperature;
             SpoolState = status.SpoolState;
-            _isInkAutoFillingDisabled = status.AutoInkFillingDisabled;
-            RaisePropertyChanged(nameof(IsInkAutoFillingDisabled));
+            _isInkAutoFillingEnabled = status.AutoInkFillingEnabled;
+            RaisePropertyChanged(nameof(IsInkAutoFillingEnabled));
             InvalidateRelayCommands();
         }
 
@@ -335,22 +335,22 @@ namespace Tango.PPC.Maintenance.ViewModels
 
         private async void OnInkAutoFillingChanged()
         {
-            if (IsInkAutoFillingDisabled)
+            if (IsInkAutoFillingEnabled)
             {
                 try
                 {
-                    NotificationProvider.SetGlobalBusyMessage("Disabling auto ink filling...");
+                    NotificationProvider.SetGlobalBusyMessage("Enabling auto ink filling...");
                     await MachineProvider.MachineOperator.SendRequest<SetInkAutoFillingModeRequest, SetInkAutoFillingModeResponse>(new SetInkAutoFillingModeRequest()
                     {
-                        Disabled = true
+                        Enable = true
                     });
                 }
                 catch (Exception ex)
                 {
-                    LogManager.Log(ex, "Error disabling ink filling.");
-                    _isInkAutoFillingDisabled = false;
-                    RaisePropertyChanged(nameof(IsInkAutoFillingDisabled));
-                    await NotificationProvider.ShowError($"Error disabling auto ink filling.\n{ex.Message}");
+                    LogManager.Log(ex, "Error enabling auto ink filling.");
+                    _isInkAutoFillingEnabled = false;
+                    RaisePropertyChanged(nameof(IsInkAutoFillingEnabled));
+                    await NotificationProvider.ShowError($"Error enabling auto ink filling.\n{ex.Message}");
                 }
                 finally
                 {
@@ -361,18 +361,18 @@ namespace Tango.PPC.Maintenance.ViewModels
             {
                 try
                 {
-                    NotificationProvider.SetGlobalBusyMessage("Enabling auto ink filling...");
+                    NotificationProvider.SetGlobalBusyMessage("Disabling auto ink filling...");
                     await MachineProvider.MachineOperator.SendRequest<SetInkAutoFillingModeRequest, SetInkAutoFillingModeResponse>(new SetInkAutoFillingModeRequest()
                     {
-                        Disabled = false
+                        Enable = false
                     });
                 }
                 catch (Exception ex)
                 {
-                    LogManager.Log(ex, "Error enabling ink filling.");
-                    _isInkAutoFillingDisabled = true;
-                    RaisePropertyChanged(nameof(IsInkAutoFillingDisabled));
-                    await NotificationProvider.ShowError($"Error enabling auto ink filling.\n{ex.Message}");
+                    LogManager.Log(ex, "Error disabling auto ink filling.");
+                    _isInkAutoFillingEnabled = true;
+                    RaisePropertyChanged(nameof(IsInkAutoFillingEnabled));
+                    await NotificationProvider.ShowError($"Error disabling auto ink filling.\n{ex.Message}");
                 }
                 finally
                 {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
index 4f93f9b31..a77ec5901 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
@@ -261,7 +261,7 @@
 
                                     <touch:TouchButton Margin="20" CornerRadius="25" Height="50" FontSize="18" Style="{StaticResource TangoHollowButton}" Command="{Binding ViewBitResultsCommand}">VIEW BIT RESULTS</touch:TouchButton>
 
-                                    <touch:TouchToggleButton EnableDropShadow="False" Background="Transparent" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Margin="20" CornerRadius="25" Height="50" FontSize="18" IsChecked="{Binding IsInkAutoFillingDisabled}" IsEnabled="{Binding MachineProvider.IsConnected}" Content="DISABLE AUTO INK FILLING" CheckedContent="ENABLE AUTO INK FILLING" Foreground="{StaticResource TangoPrimaryAccentBrush}"></touch:TouchToggleButton>
+                                    <touch:TouchToggleButton EnableDropShadow="False" Background="Transparent" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Margin="20" CornerRadius="25" Height="50" FontSize="18" IsChecked="{Binding IsInkAutoFillingEnabled}" IsEnabled="{Binding MachineProvider.IsConnected}" Content="ENABLE AUTO INK FILLING" CheckedContent="DISABLE AUTO INK FILLING" Foreground="{StaticResource TangoPrimaryAccentBrush}"></touch:TouchToggleButton>
                                     
                                 </UniformGrid>
                             </StackPanel>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index 2cf0e193a..fce1ce046 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -22,6 +22,8 @@ namespace Tango.PPC.Common
     /// <seealso cref="Tango.Settings.SettingsBase" />
     public class PPCSettings : SettingsBase
     {
+        private int _gradientGenerationResolution;
+
         /// <summary>
         /// Gets or sets the state of the application.
         /// </summary>
@@ -105,7 +107,7 @@ namespace Tango.PPC.Common
         /// <summary>
         /// Gets or sets the gradient generation resolution.
         /// </summary>
-        public int GradientGenerationResolution { get; set; }
+        public int GradientGenerationResolution { get => Math.Max(40, _gradientGenerationResolution); set => _gradientGenerationResolution = value; }
 
         /// <summary>
         /// Gets or sets a value indicating whether to enable the application lock screen.
@@ -215,7 +217,7 @@ namespace Tango.PPC.Common
         /// <summary>
         /// Gets or sets the automatic update check interval.
         /// </summary>
-        public TimeSpan AutoUpdateCheckInterval { get; set; }        
+        public TimeSpan AutoUpdateCheckInterval { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether to enable the automatic thread loading support.
@@ -308,9 +310,11 @@ namespace Tango.PPC.Common
         /// </summary>
         public bool UseJobsModuleV2 { get; set; }
 
-        public ColorSpaces? DefaultTabColorSpace {
+        public ColorSpaces? DefaultTabColorSpace
+        {
             get;
-            set; }
+            set;
+        }
 
         /// <summary>
         /// Gets or sets the fine tuning trial length in meters.
@@ -335,7 +339,7 @@ namespace Tango.PPC.Common
             JobUploadStrategy = JobUploadStrategy.JobDescriptionFile;
             FineTuningTrialLengthMeters = 200;
             EnableGradientGeneration = true;
-            GradientGenerationResolution = 20;
+            GradientGenerationResolution = 40;
             MachineScanningTimeoutSeconds = 20;
             EmbeddedComPort = "COM10";
             EmbeddedDeviceHint = "Tango USB Serial Port";
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml
index d2fe31387..d9ec6d1c2 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml
@@ -12,9 +12,9 @@
             <Grid DockPanel.Dock="Bottom">
                 <touch:TouchButton HorizontalAlignment="Right" CornerRadius="25" Command="{Binding OKCommand}" Style="{StaticResource TangoHollowButton}" Width="150" Height="50" VerticalAlignment="Bottom">CLOSE</touch:TouchButton>
 
-                <StackPanel HorizontalAlignment="Left" Visibility="{Binding IsAutoInkFillingDisabled,Converter={StaticResource BooleanToVisibilityConverter}}">
+                <StackPanel HorizontalAlignment="Left" Visibility="{Binding IsAutoInkFillingEnabled,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                     <TextBlock HorizontalAlignment="Center" Foreground="{StaticResource TangoErrorBrush}">Auto ink filling is disabled</TextBlock>
-                    <touch:TouchButton CornerRadius="25" Margin="0 5 0 0" Command="{Binding EnableAutoInkFillingCommand}" Style="{StaticResource TangoHollowButton}" Width="300" Height="50" VerticalAlignment="Bottom">ENABLE AUTO INK FILLING</touch:TouchButton>
+                    <touch:TouchButton CornerRadius="25" Margin="0 5 0 0" Command="{Binding StartAutoInkFillingCommand}" Style="{StaticResource TangoHollowButton}" Width="300" Height="50" VerticalAlignment="Bottom">START INK FILLING</touch:TouchButton>
                 </StackPanel>
             </Grid>
             <StackPanel DockPanel.Dock="Top">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs
index 6d4c90e21..20f1fc18a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs
@@ -13,22 +13,22 @@ namespace Tango.PPC.UI.Dialogs
     {
         public InsufficientLiquidQuantityException Exception { get; set; }
 
-        public bool IsAutoInkFillingDisabled { get; set; }
+        public bool IsAutoInkFillingEnabled { get; set; }
 
-        public bool EnableAutoInkFillingOnExit { get; set; }
+        public bool StartAutoInkFillingOnExit { get; set; }
 
-        public RelayCommand EnableAutoInkFillingCommand { get; set; }
+        public RelayCommand StartAutoInkFillingCommand { get; set; }
 
-        public InsufficientLiquidQuantityViewVM(InsufficientLiquidQuantityException ex,bool isAutoInkFillingDisabled)
+        public InsufficientLiquidQuantityViewVM(InsufficientLiquidQuantityException ex,bool isAutoInkFillingEnabled)
         {
             Exception = ex;
-            IsAutoInkFillingDisabled = isAutoInkFillingDisabled;
-            EnableAutoInkFillingCommand = new RelayCommand(EnableAutoInkFilling);
+            IsAutoInkFillingEnabled = isAutoInkFillingEnabled;
+            StartAutoInkFillingCommand = new RelayCommand(StartAutoInkFilling);
         }
 
-        private void EnableAutoInkFilling()
+        private void StartAutoInkFilling()
         {
-            EnableAutoInkFillingOnExit = true;
+            StartAutoInkFillingOnExit = true;
             Accept();
         }
     }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
index 9856faf3d..938d99451 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
@@ -104,22 +104,19 @@ namespace Tango.PPC.UI.Printing
                 _notificationProvider.ReleaseGlobalBusyMessage();
                 LogManager.Log(ex);
 
-                var vm = await _notificationProvider.ShowDialog(new InsufficientLiquidQuantityViewVM(ex, _machineProvider.MachineOperator.MachineStatus.AutoInkFillingDisabled));
+                var vm = await _notificationProvider.ShowDialog(new InsufficientLiquidQuantityViewVM(ex, _machineProvider.MachineOperator.MachineStatus.AutoInkFillingEnabled));
 
-                if (vm.EnableAutoInkFillingOnExit)
+                if (vm.StartAutoInkFillingOnExit)
                 {
                     try
                     {
-                        _notificationProvider.SetGlobalBusyMessage("Enabling auto ink filling...");
-                        await _machineProvider.MachineOperator.SendRequest<SetInkAutoFillingModeRequest, SetInkAutoFillingModeResponse>(new SetInkAutoFillingModeRequest()
-                        {
-                            Disabled = false
-                        });
+                        _notificationProvider.SetGlobalBusyMessage("Starting ink filling...");
+                        await _machineProvider.MachineOperator.SendRequest<InitiateInkFillingRequest, InitiateInkFillingResponse>(new InitiateInkFillingRequest());
                     }
                     catch (Exception exx)
                     {
-                        LogManager.Log(exx, "Error enabling ink filling.");
-                        await _notificationProvider.ShowError($"Error enabling auto ink filling.\n{ex.Message}");
+                        LogManager.Log(exx, "Error starting ink filling.");
+                        await _notificationProvider.ShowError($"Error starting ink filling.\n{ex.Message}");
                     }
                     finally
                     {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 9025b1908..3630c7ef6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")] 
-[assembly: AssemblyVersion("1.7.10.0")]
+[assembly: AssemblyVersion("1.7.11.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index ff35fb059..1417c79f3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -291,7 +291,7 @@
                                                 <Style TargetType="Grid">
                                                     <Setter Property="Visibility" Value="Hidden"></Setter>
                                                     <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding MachineProvider.MachineOperator.MachineStatus.AutoInkFillingDisabled}" Value="True">
+                                                        <DataTrigger Binding="{Binding MachineProvider.MachineOperator.MachineStatus.AutoInkFillingEnabled}" Value="True">
                                                             <Setter Property="Visibility" Value="Visible"></Setter>
                                                         </DataTrigger>
                                                         <DataTrigger Binding="{Binding MachineProvider.MachineOperator.IsConnected}" Value="False">
@@ -300,7 +300,7 @@
                                                     </Style.Triggers>
                                                 </Style>
                                             </Grid.Style>
-                                            <touch:TouchIcon Icon="LightningBoltOutline" Foreground="#151515" Width="24" Height="24" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 3 -35 0"></touch:TouchIcon>
+                                            <touch:TouchIcon Icon="InvertColors" Foreground="#151515" Width="18" Height="18" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 6 -30 0"></touch:TouchIcon>
                                         </Grid>
                                     </Grid>
 
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 6d3c15fee..5bf3b8a9a 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -493,6 +493,9 @@ namespace Tango.Emulations.Emulators
                 case MessageType.SpoolTypeChangedRequest:
                     HandleSpoolTypeChangedRequest(MessageFactory.ParseTangoMessageFromContainer<SpoolTypeChangedRequest>(container));
                     break;
+                case MessageType.InitiateInkFillingRequest:
+                    HandleInitiateInkFillingRequest(MessageFactory.ParseTangoMessageFromContainer<InitiateInkFillingRequest>(container));
+                    break;
             }
         }
 
@@ -1814,7 +1817,7 @@ namespace Tango.Emulations.Emulators
         private async void HandleSetInkAutoFillingModeRequest(TangoMessage<SetInkAutoFillingModeRequest> request)
         {
             await Task.Delay(1000);
-            MachineStatus.AutoInkFillingDisabled = request.Message.Disabled;
+            MachineStatus.AutoInkFillingEnabled = request.Message.Enable;
             await Transporter.SendResponse<SetInkAutoFillingModeResponse>(new SetInkAutoFillingModeResponse(), request.Container.Token);
         }
 
@@ -1863,6 +1866,12 @@ namespace Tango.Emulations.Emulators
             await Transporter.SendResponse<SpoolTypeChangedResponse>(new SpoolTypeChangedResponse(), request.Container.Token);
         }
 
+        private async void HandleInitiateInkFillingRequest(TangoMessage<InitiateInkFillingRequest> request)
+        {
+            await Task.Delay(1000);
+            await Transporter.SendResponse<InitiateInkFillingResponse>(new InitiateInkFillingResponse(), request.Container.Token);
+        }
+
         #endregion
 
         #region Public Methods
diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index 2612810bf..ca81b2050 100644
--- a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
@@ -22,7 +22,7 @@ namespace Tango.PMR.Common {
     static MessageTypeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbir7QAoLTWVz",
+            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiq8QQoLTWVz",
             "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj",
             "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n",
             "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh",
@@ -203,12 +203,13 @@ namespace Tango.PMR.Common {
             "Z1Jlc3BvbnNlEP9VEiAKG0F0dGVtcHRUaHJlYWRKb2dnaW5nUmVxdWVzdBCA",
             "VhIhChxBdHRlbXB0VGhyZWFkSm9nZ2luZ1Jlc3BvbnNlEIFWEiEKHFN0YXJ0",
             "SW5rRmlsbGluZ1N0YXR1c1JlcXVlc3QQ4F0SIgodU3RhcnRJbmtGaWxsaW5n",
-            "U3RhdHVzUmVzcG9uc2UQ4V0SHAoXUHV0RGF0YVN0b3JlSXRlbVJlcXVlc3QQ",
-            "yGUSHQoYUHV0RGF0YVN0b3JlSXRlbVJlc3BvbnNlEMllEhwKF0dldERhdGFT",
-            "dG9yZUl0ZW1SZXF1ZXN0EMplEh0KGEdldERhdGFTdG9yZUl0ZW1SZXNwb25z",
-            "ZRDLZRIhChxEYXRhU3RvcmVJdGVtTW9kaWZpZWRSZXF1ZXN0EMxlEiIKHURh",
-            "dGFTdG9yZUl0ZW1Nb2RpZmllZFJlc3BvbnNlEM1lQhwKGmNvbS50d2luZS50",
-            "YW5nby5wbXIuY29tbW9uYgZwcm90bzM="));
+            "U3RhdHVzUmVzcG9uc2UQ4V0SHgoZSW5pdGlhdGVJbmtGaWxsaW5nUmVxdWVz",
+            "dBDiXRIfChpJbml0aWF0ZUlua0ZpbGxpbmdSZXNwb25zZRDjXRIcChdQdXRE",
+            "YXRhU3RvcmVJdGVtUmVxdWVzdBDIZRIdChhQdXREYXRhU3RvcmVJdGVtUmVz",
+            "cG9uc2UQyWUSHAoXR2V0RGF0YVN0b3JlSXRlbVJlcXVlc3QQymUSHQoYR2V0",
+            "RGF0YVN0b3JlSXRlbVJlc3BvbnNlEMtlEiEKHERhdGFTdG9yZUl0ZW1Nb2Rp",
+            "ZmllZFJlcXVlc3QQzGUSIgodRGF0YVN0b3JlSXRlbU1vZGlmaWVkUmVzcG9u",
+            "c2UQzWVCHAoaY29tLnR3aW5lLnRhbmdvLnBtci5jb21tb25iBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null));
@@ -543,6 +544,8 @@ namespace Tango.PMR.Common {
     /// </summary>
     [pbr::OriginalName("StartInkFillingStatusRequest")] StartInkFillingStatusRequest = 12000,
     [pbr::OriginalName("StartInkFillingStatusResponse")] StartInkFillingStatusResponse = 12001,
+    [pbr::OriginalName("InitiateInkFillingRequest")] InitiateInkFillingRequest = 12002,
+    [pbr::OriginalName("InitiateInkFillingResponse")] InitiateInkFillingResponse = 12003,
     /// <summary>
     ///DataStore
     /// </summary>
diff --git a/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingRequest.cs b/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingRequest.cs
new file mode 100644
index 000000000..925e54aef
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingRequest.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: InitiateInkFillingRequest.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.MachineStatus {
+
+  /// <summary>Holder for reflection information generated from InitiateInkFillingRequest.proto</summary>
+  public static partial class InitiateInkFillingRequestReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for InitiateInkFillingRequest.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static InitiateInkFillingRequestReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "Ch9Jbml0aWF0ZUlua0ZpbGxpbmdSZXF1ZXN0LnByb3RvEhdUYW5nby5QTVIu",
+            "TWFjaGluZVN0YXR1cyIbChlJbml0aWF0ZUlua0ZpbGxpbmdSZXF1ZXN0QiMK",
+            "IWNvbS50d2luZS50YW5nby5wbXIubWFjaGluZXN0YXR1c2IGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.InitiateInkFillingRequest), global::Tango.PMR.MachineStatus.InitiateInkFillingRequest.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class InitiateInkFillingRequest : pb::IMessage<InitiateInkFillingRequest> {
+    private static readonly pb::MessageParser<InitiateInkFillingRequest> _parser = new pb::MessageParser<InitiateInkFillingRequest>(() => new InitiateInkFillingRequest());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<InitiateInkFillingRequest> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.MachineStatus.InitiateInkFillingRequestReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingRequest(InitiateInkFillingRequest other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingRequest Clone() {
+      return new InitiateInkFillingRequest(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as InitiateInkFillingRequest);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(InitiateInkFillingRequest other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(InitiateInkFillingRequest other) {
+      if (other == null) {
+        return;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingResponse.cs b/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingResponse.cs
new file mode 100644
index 000000000..b5297c054
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingResponse.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: InitiateInkFillingResponse.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.MachineStatus {
+
+  /// <summary>Holder for reflection information generated from InitiateInkFillingResponse.proto</summary>
+  public static partial class InitiateInkFillingResponseReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for InitiateInkFillingResponse.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static InitiateInkFillingResponseReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "CiBJbml0aWF0ZUlua0ZpbGxpbmdSZXNwb25zZS5wcm90bxIXVGFuZ28uUE1S",
+            "Lk1hY2hpbmVTdGF0dXMiHAoaSW5pdGlhdGVJbmtGaWxsaW5nUmVzcG9uc2VC",
+            "IwohY29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.InitiateInkFillingResponse), global::Tango.PMR.MachineStatus.InitiateInkFillingResponse.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class InitiateInkFillingResponse : pb::IMessage<InitiateInkFillingResponse> {
+    private static readonly pb::MessageParser<InitiateInkFillingResponse> _parser = new pb::MessageParser<InitiateInkFillingResponse>(() => new InitiateInkFillingResponse());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<InitiateInkFillingResponse> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.MachineStatus.InitiateInkFillingResponseReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingResponse(InitiateInkFillingResponse other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingResponse Clone() {
+      return new InitiateInkFillingResponse(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as InitiateInkFillingResponse);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(InitiateInkFillingResponse other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(InitiateInkFillingResponse other) {
+      if (other == null) {
+        return;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs
index ccc02e572..a50669c26 100644
--- a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs
@@ -24,17 +24,17 @@ namespace Tango.PMR.MachineStatus {
           string.Concat(
             "ChNNYWNoaW5lU3RhdHVzLnByb3RvEhdUYW5nby5QTVIuTWFjaGluZVN0YXR1",
             "cxoSTWFjaGluZVN0YXRlLnByb3RvGhJJRFNQYWNrTGV2ZWwucHJvdG8aEFNw",
-            "b29sU3RhdGUucHJvdG8i+QEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB",
+            "b29sU3RhdGUucHJvdG8i+AEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB",
             "KA4yJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5NYWNoaW5lU3RhdGUSPQoO",
             "SURTUGFja3NMZXZlbHMYAiADKAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1",
             "cy5JRFNQYWNrTGV2ZWwSGgoST3ZlcmFsbFRlbXBlcmF0dXJlGAMgASgBEjcK",
             "ClNwb29sU3RhdGUYBCABKA4yIy5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5T",
-            "cG9vbFN0YXRlEh4KFkF1dG9JbmtGaWxsaW5nRGlzYWJsZWQYBSABKAhCIwoh",
-            "Y29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM="));
+            "cG9vbFN0YXRlEh0KFUF1dG9JbmtGaWxsaW5nRW5hYmxlZBgFIAEoCEIjCiFj",
+            "b20udHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.MachineStatus.MachineStateReflection.Descriptor, global::Tango.PMR.MachineStatus.IDSPackLevelReflection.Descriptor, global::Tango.PMR.MachineStatus.SpoolStateReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState", "AutoInkFillingDisabled" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState", "AutoInkFillingEnabled" }, null, null, null)
           }));
     }
     #endregion
@@ -69,7 +69,7 @@ namespace Tango.PMR.MachineStatus {
       iDSPacksLevels_ = other.iDSPacksLevels_.Clone();
       overallTemperature_ = other.overallTemperature_;
       spoolState_ = other.spoolState_;
-      autoInkFillingDisabled_ = other.autoInkFillingDisabled_;
+      autoInkFillingEnabled_ = other.autoInkFillingEnabled_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -120,14 +120,14 @@ namespace Tango.PMR.MachineStatus {
       }
     }
 
-    /// <summary>Field number for the "AutoInkFillingDisabled" field.</summary>
-    public const int AutoInkFillingDisabledFieldNumber = 5;
-    private bool autoInkFillingDisabled_;
+    /// <summary>Field number for the "AutoInkFillingEnabled" field.</summary>
+    public const int AutoInkFillingEnabledFieldNumber = 5;
+    private bool autoInkFillingEnabled_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool AutoInkFillingDisabled {
-      get { return autoInkFillingDisabled_; }
+    public bool AutoInkFillingEnabled {
+      get { return autoInkFillingEnabled_; }
       set {
-        autoInkFillingDisabled_ = value;
+        autoInkFillingEnabled_ = value;
       }
     }
 
@@ -148,7 +148,7 @@ namespace Tango.PMR.MachineStatus {
       if(!iDSPacksLevels_.Equals(other.iDSPacksLevels_)) return false;
       if (OverallTemperature != other.OverallTemperature) return false;
       if (SpoolState != other.SpoolState) return false;
-      if (AutoInkFillingDisabled != other.AutoInkFillingDisabled) return false;
+      if (AutoInkFillingEnabled != other.AutoInkFillingEnabled) return false;
       return true;
     }
 
@@ -159,7 +159,7 @@ namespace Tango.PMR.MachineStatus {
       hash ^= iDSPacksLevels_.GetHashCode();
       if (OverallTemperature != 0D) hash ^= OverallTemperature.GetHashCode();
       if (SpoolState != 0) hash ^= SpoolState.GetHashCode();
-      if (AutoInkFillingDisabled != false) hash ^= AutoInkFillingDisabled.GetHashCode();
+      if (AutoInkFillingEnabled != false) hash ^= AutoInkFillingEnabled.GetHashCode();
       return hash;
     }
 
@@ -183,9 +183,9 @@ namespace Tango.PMR.MachineStatus {
         output.WriteRawTag(32);
         output.WriteEnum((int) SpoolState);
       }
-      if (AutoInkFillingDisabled != false) {
+      if (AutoInkFillingEnabled != false) {
         output.WriteRawTag(40);
-        output.WriteBool(AutoInkFillingDisabled);
+        output.WriteBool(AutoInkFillingEnabled);
       }
     }
 
@@ -202,7 +202,7 @@ namespace Tango.PMR.MachineStatus {
       if (SpoolState != 0) {
         size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SpoolState);
       }
-      if (AutoInkFillingDisabled != false) {
+      if (AutoInkFillingEnabled != false) {
         size += 1 + 1;
       }
       return size;
@@ -223,8 +223,8 @@ namespace Tango.PMR.MachineStatus {
       if (other.SpoolState != 0) {
         SpoolState = other.SpoolState;
       }
-      if (other.AutoInkFillingDisabled != false) {
-        AutoInkFillingDisabled = other.AutoInkFillingDisabled;
+      if (other.AutoInkFillingEnabled != false) {
+        AutoInkFillingEnabled = other.AutoInkFillingEnabled;
       }
     }
 
@@ -253,7 +253,7 @@ namespace Tango.PMR.MachineStatus {
             break;
           }
           case 40: {
-            AutoInkFillingDisabled = input.ReadBool();
+            AutoInkFillingEnabled = input.ReadBool();
             break;
           }
         }
diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs
index d41234d99..cfc1b7d40 100644
--- a/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs
@@ -23,13 +23,13 @@ namespace Tango.PMR.MachineStatus {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "CiJTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1ZXN0LnByb3RvEhdUYW5nby5Q",
-            "TVIuTWFjaGluZVN0YXR1cyIwChxTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1",
-            "ZXN0EhAKCERpc2FibGVkGAEgASgIQiMKIWNvbS50d2luZS50YW5nby5wbXIu",
-            "bWFjaGluZXN0YXR1c2IGcHJvdG8z"));
+            "TVIuTWFjaGluZVN0YXR1cyIuChxTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1",
+            "ZXN0Eg4KBkVuYWJsZRgBIAEoCEIjCiFjb20udHdpbmUudGFuZ28ucG1yLm1h",
+            "Y2hpbmVzdGF0dXNiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequest), global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequest.Parser, new[]{ "Disabled" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequest), global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequest.Parser, new[]{ "Enable" }, null, null, null)
           }));
     }
     #endregion
@@ -60,7 +60,7 @@ namespace Tango.PMR.MachineStatus {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public SetInkAutoFillingModeRequest(SetInkAutoFillingModeRequest other) : this() {
-      disabled_ = other.disabled_;
+      enable_ = other.enable_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -68,14 +68,14 @@ namespace Tango.PMR.MachineStatus {
       return new SetInkAutoFillingModeRequest(this);
     }
 
-    /// <summary>Field number for the "Disabled" field.</summary>
-    public const int DisabledFieldNumber = 1;
-    private bool disabled_;
+    /// <summary>Field number for the "Enable" field.</summary>
+    public const int EnableFieldNumber = 1;
+    private bool enable_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Disabled {
-      get { return disabled_; }
+    public bool Enable {
+      get { return enable_; }
       set {
-        disabled_ = value;
+        enable_ = value;
       }
     }
 
@@ -92,14 +92,14 @@ namespace Tango.PMR.MachineStatus {
       if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (Disabled != other.Disabled) return false;
+      if (Enable != other.Enable) return false;
       return true;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
-      if (Disabled != false) hash ^= Disabled.GetHashCode();
+      if (Enable != false) hash ^= Enable.GetHashCode();
       return hash;
     }
 
@@ -110,16 +110,16 @@ namespace Tango.PMR.MachineStatus {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
-      if (Disabled != false) {
+      if (Enable != false) {
         output.WriteRawTag(8);
-        output.WriteBool(Disabled);
+        output.WriteBool(Enable);
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
-      if (Disabled != false) {
+      if (Enable != false) {
         size += 1 + 1;
       }
       return size;
@@ -130,8 +130,8 @@ namespace Tango.PMR.MachineStatus {
       if (other == null) {
         return;
       }
-      if (other.Disabled != false) {
-        Disabled = other.Disabled;
+      if (other.Enable != false) {
+        Enable = other.Enable;
       }
     }
 
@@ -144,7 +144,7 @@ namespace Tango.PMR.MachineStatus {
             input.SkipLastField();
             break;
           case 8: {
-            Disabled = input.ReadBool();
+            Enable = input.ReadBool();
             break;
           }
         }
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 9577be6a9..9effc3fcf 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -238,6 +238,8 @@
     <Compile Include="Hardware\UploadHardwareConfigurationResponse.cs" />
     <Compile Include="IFS\CartridgeState.cs" />
     <Compile Include="IFS\CartridgeStatus.cs" />
+    <Compile Include="IFS\InitiateInkFillingRequest.cs" />
+    <Compile Include="IFS\InitiateInkFillingResponse.cs" />
     <Compile Include="IFS\InkFillingStatus.cs" />
     <Compile Include="IFS\StartInkFillingStatusRequest.cs" />
     <Compile Include="IFS\StartInkFillingStatusResponse.cs" />
@@ -511,7 +513,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file