Support for 64 Bit Dispenser Levels.

15 files changed, 273 insertions, 199 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index e41e12e87..b3bf6c9cd 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 4ce628579..bc7c1f051 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/PMR/Messages/Connection/ConnectRequest.proto b/Software/PMR/Messages/Connection/ConnectRequest.proto
index a672aeb3f..332a357c7 100644
--- a/Software/PMR/Messages/Connection/ConnectRequest.proto
+++ b/Software/PMR/Messages/Connection/ConnectRequest.proto
@@ -12,4 +12,5 @@ message ConnectRequest
 	int64 UnixTime = 2;
 	PMR.Printing.JobSpoolType SpoolType = 3;
 	PMR.Common.MachineType MachineType = 4;
+	bool Supports64BitDispenserLevel = 5;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto b/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto
index 5b0268684..120bd6453 100644
--- a/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto
+++ b/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto
@@ -15,4 +15,7 @@ message IDSPackLevel
 	bool MidTankRefillPumpActive = 7;
 
 	int32 TimerRemainingSeconds = 8;
+
+	//Used only for X4
+	int64 DispenserLevel64 = 9;
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index a63c0fca2..bff9489c5 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -995,7 +995,7 @@ if $(ConfigurationName) == Eureka copy /Y "$(ProjectDir)Intro.wmv" "$(TargetDir)
   </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>
   <Import Project="..\..\packages\WPFMediaKit.2.2.0\build\WPFMediaKit.targets" Condition="Exists('..\..\packages\WPFMediaKit.2.2.0\build\WPFMediaKit.targets')" />
diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
index 45aa02514..fe0816ff5 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
@@ -168,7 +168,7 @@ namespace Tango.BL.DTO
         /// <summary>
         /// cyan quantity
         /// </summary>
-        public Int32 CyanQuantity 
+        public Int64 CyanQuantity 
         {
             get; set; 
         }
@@ -176,7 +176,7 @@ namespace Tango.BL.DTO
         /// <summary>
         /// magenta quantity
         /// </summary>
-        public Int32 MagentaQuantity 
+        public Int64 MagentaQuantity 
         {
             get; set; 
         }
@@ -184,7 +184,7 @@ namespace Tango.BL.DTO
         /// <summary>
         /// yellow quantity
         /// </summary>
-        public Int32 YellowQuantity 
+        public Int64 YellowQuantity 
         {
             get; set; 
         }
@@ -192,7 +192,7 @@ namespace Tango.BL.DTO
         /// <summary>
         /// black quantity
         /// </summary>
-        public Int32 BlackQuantity 
+        public Int64 BlackQuantity 
         {
             get; set; 
         }
@@ -200,7 +200,7 @@ namespace Tango.BL.DTO
         /// <summary>
         /// transparent quantity
         /// </summary>
-        public Int32 TransparentQuantity 
+        public Int64 TransparentQuantity 
         {
             get; set; 
         }
@@ -208,7 +208,7 @@ namespace Tango.BL.DTO
         /// <summary>
         /// lubricant quantity
         /// </summary>
-        public Int32 LubricantQuantity 
+        public Int64 LubricantQuantity 
         {
             get; set; 
         }
@@ -216,7 +216,7 @@ namespace Tango.BL.DTO
         /// <summary>
         /// cleaner quantity
         /// </summary>
-        public Int32 CleanerQuantity 
+        public Int64 CleanerQuantity 
         {
             get; set; 
         }
@@ -224,7 +224,7 @@ namespace Tango.BL.DTO
         /// <summary>
         /// light cyan quantity
         /// </summary>
-        public Int32 LightCyanQuantity 
+        public Int64 LightCyanQuantity 
         {
             get; set; 
         }
@@ -232,7 +232,7 @@ namespace Tango.BL.DTO
         /// <summary>
         /// light magenta quantity
         /// </summary>
-        public Int32 LightMagentaQuantity 
+        public Int64 LightMagentaQuantity 
         {
             get; set; 
         }
@@ -240,7 +240,7 @@ namespace Tango.BL.DTO
         /// <summary>
         /// light yellow quantity
         /// </summary>
-        public Int32 LightYellowQuantity 
+        public Int64 LightYellowQuantity 
         {
             get; set; 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
index ddb33e7d2..efb6c70d6 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
@@ -55,25 +55,25 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> LiquidQuantityStringChanged;
 
-        public event EventHandler<Int32> CyanQuantityChanged;
+        public event EventHandler<Int64> CyanQuantityChanged;
 
-        public event EventHandler<Int32> MagentaQuantityChanged;
+        public event EventHandler<Int64> MagentaQuantityChanged;
 
-        public event EventHandler<Int32> YellowQuantityChanged;
+        public event EventHandler<Int64> YellowQuantityChanged;
 
-        public event EventHandler<Int32> BlackQuantityChanged;
+        public event EventHandler<Int64> BlackQuantityChanged;
 
-        public event EventHandler<Int32> TransparentQuantityChanged;
+        public event EventHandler<Int64> TransparentQuantityChanged;
 
-        public event EventHandler<Int32> LubricantQuantityChanged;
+        public event EventHandler<Int64> LubricantQuantityChanged;
 
-        public event EventHandler<Int32> CleanerQuantityChanged;
+        public event EventHandler<Int64> CleanerQuantityChanged;
 
-        public event EventHandler<Int32> LightCyanQuantityChanged;
+        public event EventHandler<Int64> LightCyanQuantityChanged;
 
-        public event EventHandler<Int32> LightMagentaQuantityChanged;
+        public event EventHandler<Int64> LightMagentaQuantityChanged;
 
-        public event EventHandler<Int32> LightYellowQuantityChanged;
+        public event EventHandler<Int64> LightYellowQuantityChanged;
 
         public event EventHandler<Double> EndPositionChanged;
 
@@ -577,7 +577,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _cyanquantity;
+        protected Int64 _cyanquantity;
 
         /// <summary>
         /// Gets or sets the jobrunbase cyan quantity.
@@ -585,7 +585,7 @@ namespace Tango.BL.Entities
 
         [Column("CYAN_QUANTITY")]
 
-        public  Int32 CyanQuantity
+        public  Int64 CyanQuantity
         {
             get 
             {
@@ -604,7 +604,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _magentaquantity;
+        protected Int64 _magentaquantity;
 
         /// <summary>
         /// Gets or sets the jobrunbase magenta quantity.
@@ -612,7 +612,7 @@ namespace Tango.BL.Entities
 
         [Column("MAGENTA_QUANTITY")]
 
-        public  Int32 MagentaQuantity
+        public  Int64 MagentaQuantity
         {
             get 
             {
@@ -631,7 +631,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _yellowquantity;
+        protected Int64 _yellowquantity;
 
         /// <summary>
         /// Gets or sets the jobrunbase yellow quantity.
@@ -639,7 +639,7 @@ namespace Tango.BL.Entities
 
         [Column("YELLOW_QUANTITY")]
 
-        public  Int32 YellowQuantity
+        public  Int64 YellowQuantity
         {
             get 
             {
@@ -658,7 +658,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _blackquantity;
+        protected Int64 _blackquantity;
 
         /// <summary>
         /// Gets or sets the jobrunbase black quantity.
@@ -666,7 +666,7 @@ namespace Tango.BL.Entities
 
         [Column("BLACK_QUANTITY")]
 
-        public  Int32 BlackQuantity
+        public  Int64 BlackQuantity
         {
             get 
             {
@@ -685,7 +685,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _transparentquantity;
+        protected Int64 _transparentquantity;
 
         /// <summary>
         /// Gets or sets the jobrunbase transparent quantity.
@@ -693,7 +693,7 @@ namespace Tango.BL.Entities
 
         [Column("TRANSPARENT_QUANTITY")]
 
-        public  Int32 TransparentQuantity
+        public  Int64 TransparentQuantity
         {
             get 
             {
@@ -712,7 +712,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _lubricantquantity;
+        protected Int64 _lubricantquantity;
 
         /// <summary>
         /// Gets or sets the jobrunbase lubricant quantity.
@@ -720,7 +720,7 @@ namespace Tango.BL.Entities
 
         [Column("LUBRICANT_QUANTITY")]
 
-        public  Int32 LubricantQuantity
+        public  Int64 LubricantQuantity
         {
             get 
             {
@@ -739,7 +739,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _cleanerquantity;
+        protected Int64 _cleanerquantity;
 
         /// <summary>
         /// Gets or sets the jobrunbase cleaner quantity.
@@ -747,7 +747,7 @@ namespace Tango.BL.Entities
 
         [Column("CLEANER_QUANTITY")]
 
-        public  Int32 CleanerQuantity
+        public  Int64 CleanerQuantity
         {
             get 
             {
@@ -766,7 +766,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _lightcyanquantity;
+        protected Int64 _lightcyanquantity;
 
         /// <summary>
         /// Gets or sets the jobrunbase light cyan quantity.
@@ -774,7 +774,7 @@ namespace Tango.BL.Entities
 
         [Column("LIGHT_CYAN_QUANTITY")]
 
-        public  Int32 LightCyanQuantity
+        public  Int64 LightCyanQuantity
         {
             get 
             {
@@ -793,7 +793,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _lightmagentaquantity;
+        protected Int64 _lightmagentaquantity;
 
         /// <summary>
         /// Gets or sets the jobrunbase light magenta quantity.
@@ -801,7 +801,7 @@ namespace Tango.BL.Entities
 
         [Column("LIGHT_MAGENTA_QUANTITY")]
 
-        public  Int32 LightMagentaQuantity
+        public  Int64 LightMagentaQuantity
         {
             get 
             {
@@ -820,7 +820,7 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _lightyellowquantity;
+        protected Int64 _lightyellowquantity;
 
         /// <summary>
         /// Gets or sets the jobrunbase light yellow quantity.
@@ -828,7 +828,7 @@ namespace Tango.BL.Entities
 
         [Column("LIGHT_YELLOW_QUANTITY")]
 
-        public  Int32 LightYellowQuantity
+        public  Int64 LightYellowQuantity
         {
             get 
             {
@@ -1298,7 +1298,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the CyanQuantity has changed.
         /// </summary>
-        protected virtual void OnCyanQuantityChanged(Int32 cyanquantity)
+        protected virtual void OnCyanQuantityChanged(Int64 cyanquantity)
         {
             CyanQuantityChanged?.Invoke(this, cyanquantity);
             RaisePropertyChanged(nameof(CyanQuantity));
@@ -1307,7 +1307,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the MagentaQuantity has changed.
         /// </summary>
-        protected virtual void OnMagentaQuantityChanged(Int32 magentaquantity)
+        protected virtual void OnMagentaQuantityChanged(Int64 magentaquantity)
         {
             MagentaQuantityChanged?.Invoke(this, magentaquantity);
             RaisePropertyChanged(nameof(MagentaQuantity));
@@ -1316,7 +1316,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the YellowQuantity has changed.
         /// </summary>
-        protected virtual void OnYellowQuantityChanged(Int32 yellowquantity)
+        protected virtual void OnYellowQuantityChanged(Int64 yellowquantity)
         {
             YellowQuantityChanged?.Invoke(this, yellowquantity);
             RaisePropertyChanged(nameof(YellowQuantity));
@@ -1325,7 +1325,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the BlackQuantity has changed.
         /// </summary>
-        protected virtual void OnBlackQuantityChanged(Int32 blackquantity)
+        protected virtual void OnBlackQuantityChanged(Int64 blackquantity)
         {
             BlackQuantityChanged?.Invoke(this, blackquantity);
             RaisePropertyChanged(nameof(BlackQuantity));
@@ -1334,7 +1334,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the TransparentQuantity has changed.
         /// </summary>
-        protected virtual void OnTransparentQuantityChanged(Int32 transparentquantity)
+        protected virtual void OnTransparentQuantityChanged(Int64 transparentquantity)
         {
             TransparentQuantityChanged?.Invoke(this, transparentquantity);
             RaisePropertyChanged(nameof(TransparentQuantity));
@@ -1343,7 +1343,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the LubricantQuantity has changed.
         /// </summary>
-        protected virtual void OnLubricantQuantityChanged(Int32 lubricantquantity)
+        protected virtual void OnLubricantQuantityChanged(Int64 lubricantquantity)
         {
             LubricantQuantityChanged?.Invoke(this, lubricantquantity);
             RaisePropertyChanged(nameof(LubricantQuantity));
@@ -1352,7 +1352,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the CleanerQuantity has changed.
         /// </summary>
-        protected virtual void OnCleanerQuantityChanged(Int32 cleanerquantity)
+        protected virtual void OnCleanerQuantityChanged(Int64 cleanerquantity)
         {
             CleanerQuantityChanged?.Invoke(this, cleanerquantity);
             RaisePropertyChanged(nameof(CleanerQuantity));
@@ -1361,7 +1361,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the LightCyanQuantity has changed.
         /// </summary>
-        protected virtual void OnLightCyanQuantityChanged(Int32 lightcyanquantity)
+        protected virtual void OnLightCyanQuantityChanged(Int64 lightcyanquantity)
         {
             LightCyanQuantityChanged?.Invoke(this, lightcyanquantity);
             RaisePropertyChanged(nameof(LightCyanQuantity));
@@ -1370,7 +1370,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the LightMagentaQuantity has changed.
         /// </summary>
-        protected virtual void OnLightMagentaQuantityChanged(Int32 lightmagentaquantity)
+        protected virtual void OnLightMagentaQuantityChanged(Int64 lightmagentaquantity)
         {
             LightMagentaQuantityChanged?.Invoke(this, lightmagentaquantity);
             RaisePropertyChanged(nameof(LightMagentaQuantity));
@@ -1379,7 +1379,7 @@ namespace Tango.BL.Entities
         /// <summary>
         /// Called when the LightYellowQuantity has changed.
         /// </summary>
-        protected virtual void OnLightYellowQuantityChanged(Int32 lightyellowquantity)
+        protected virtual void OnLightYellowQuantityChanged(Int64 lightyellowquantity)
         {
             LightYellowQuantityChanged?.Invoke(this, lightyellowquantity);
             RaisePropertyChanged(nameof(LightYellowQuantity));
diff --git a/Software/Visual_Studio/Tango.BL/ValueObjects/JobRunLiquidQuantity.cs b/Software/Visual_Studio/Tango.BL/ValueObjects/JobRunLiquidQuantity.cs
index 9950e1c26..47935c3a0 100644
--- a/Software/Visual_Studio/Tango.BL/ValueObjects/JobRunLiquidQuantity.cs
+++ b/Software/Visual_Studio/Tango.BL/ValueObjects/JobRunLiquidQuantity.cs
@@ -10,7 +10,7 @@ namespace Tango.BL.ValueObjects
     public class JobRunLiquidQuantity
     {
         public LiquidTypes LiquidType { get; set; }
-        public int Quantity { get; set; }
+        public long Quantity { get; set; }
 
         public override string ToString()
         {
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
index 090263ff2..cf7a202b4 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
@@ -35,16 +35,16 @@ namespace Tango.DAL.Remote.DB
         public bool IS_GRADIENT { get; set; }
         public int GRADIENT_RESOLUTION_CM { get; set; }
         public string LIQUID_QUANTITY_STRING { get; set; }
-        public int CYAN_QUANTITY { get; set; }
-        public int MAGENTA_QUANTITY { get; set; }
-        public int YELLOW_QUANTITY { get; set; }
-        public int BLACK_QUANTITY { get; set; }
-        public int TRANSPARENT_QUANTITY { get; set; }
-        public int LUBRICANT_QUANTITY { get; set; }
-        public int CLEANER_QUANTITY { get; set; }
-        public int LIGHT_CYAN_QUANTITY { get; set; }
-        public int LIGHT_MAGENTA_QUANTITY { get; set; }
-        public int LIGHT_YELLOW_QUANTITY { get; set; }
+        public long CYAN_QUANTITY { get; set; }
+        public long MAGENTA_QUANTITY { get; set; }
+        public long YELLOW_QUANTITY { get; set; }
+        public long BLACK_QUANTITY { get; set; }
+        public long TRANSPARENT_QUANTITY { get; set; }
+        public long LUBRICANT_QUANTITY { get; set; }
+        public long CLEANER_QUANTITY { get; set; }
+        public long LIGHT_CYAN_QUANTITY { get; set; }
+        public long LIGHT_MAGENTA_QUANTITY { get; set; }
+        public long LIGHT_YELLOW_QUANTITY { get; set; }
         public double END_POSITION { get; set; }
         public string FAILED_MESSAGE { get; set; }
         public bool IS_HEAD_CLEANING { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 0a3fa8bd7..148f36159 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -772,16 +772,16 @@
           <Property Name="IS_GRADIENT" Type="bit" Nullable="false" />
           <Property Name="GRADIENT_RESOLUTION_CM" Type="int" Nullable="false" />
           <Property Name="LIQUID_QUANTITY_STRING" Type="nvarchar(max)" />
-          <Property Name="CYAN_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="MAGENTA_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="YELLOW_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="BLACK_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="TRANSPARENT_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="LUBRICANT_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="CLEANER_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="LIGHT_CYAN_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="LIGHT_MAGENTA_QUANTITY" Type="int" Nullable="false" />
-          <Property Name="LIGHT_YELLOW_QUANTITY" Type="int" Nullable="false" />
+          <Property Name="CYAN_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="MAGENTA_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="YELLOW_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="BLACK_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="TRANSPARENT_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="LUBRICANT_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="CLEANER_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="LIGHT_CYAN_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="LIGHT_MAGENTA_QUANTITY" Type="bigint" Nullable="false" />
+          <Property Name="LIGHT_YELLOW_QUANTITY" Type="bigint" Nullable="false" />
           <Property Name="END_POSITION" Type="float" Nullable="false" />
           <Property Name="FAILED_MESSAGE" Type="nvarchar" MaxLength="300" />
           <Property Name="IS_HEAD_CLEANING" Type="bit" Nullable="false" />
@@ -6425,16 +6425,16 @@
           <Property Name="IS_GRADIENT" Type="Boolean" Nullable="false" />
           <Property Name="GRADIENT_RESOLUTION_CM" Type="Int32" Nullable="false" />
           <Property Name="LIQUID_QUANTITY_STRING" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="CYAN_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="MAGENTA_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="YELLOW_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="BLACK_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="TRANSPARENT_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="LUBRICANT_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="CLEANER_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="LIGHT_CYAN_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="LIGHT_MAGENTA_QUANTITY" Type="Int32" Nullable="false" />
-          <Property Name="LIGHT_YELLOW_QUANTITY" Type="Int32" Nullable="false" />
+          <Property Name="CYAN_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="MAGENTA_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="YELLOW_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="BLACK_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="TRANSPARENT_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="LUBRICANT_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="CLEANER_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="LIGHT_CYAN_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="LIGHT_MAGENTA_QUANTITY" Type="Int64" Nullable="false" />
+          <Property Name="LIGHT_YELLOW_QUANTITY" Type="Int64" Nullable="false" />
           <Property Name="END_POSITION" Type="Double" Nullable="false" />
           <Property Name="FAILED_MESSAGE" Type="String" MaxLength="300" FixedLength="false" Unicode="true" />
           <Property Name="IS_HEAD_CLEANING" Type="Boolean" Nullable="false" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 8ab83d696..7116aa48f 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,102 +5,102 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="58">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="17.5" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="76.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="69.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="79.75" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="6.125" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="22.25" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="35.5" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="41.75" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="7.75" PointY="46.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="59.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="54.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="52.875" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="25.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="7.75" PointY="6.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="41.875" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="72" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="48.875" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="82.5" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="5.5" PointY="90.5" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="7.75" PointY="90" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="66.25" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="36" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="14.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="62.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="67.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="82.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="77.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.5" PointY="97.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11.75" PointY="71.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.5" PointY="59.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="14.75" PointY="69.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.5" PointY="63.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="14.75" PointY="62" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="101.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="11.75" PointY="77.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="72.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.5" PointY="66.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="11.75" PointY="67.75" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="7.75" PointY="94.25" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10" PointY="53.125" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="34.75" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="67" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="83.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="77.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="74.5" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="22.125" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="29.5" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="43.375" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="21.75" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="44.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="6.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="7.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="25.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="2.75" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="33.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="80.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="63.125" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="30.625" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="83.375" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="5.75" PointY="98.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="8" PointY="97.875" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="80.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="70.5" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="21.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="32.875" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="49.5" />
+        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="12.125" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="11.75" PointY="10.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="94.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="90.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="90.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="86.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="101.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="91.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="10.5" PointY="95.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="12.75" PointY="87.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.5" PointY="102.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9.75" PointY="88" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="94.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="87.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="86.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="8.5" PointY="79.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="10.75" PointY="83.75" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8" PointY="63.25" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="43.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.75" PointY="2.125" />
         <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="22" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="26.25" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="34.375" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="26" />
-        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="45.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="7.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="34.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="82.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="70.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="45.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="38.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="15" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="32.625" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="7.75" PointY="86.625" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="38.625" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.125" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="56.375" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="2.75" PointY="10.375" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="5" PointY="10.625" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="8" PointY="2.375" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.75" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="21.5" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="3.625" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="16.75" PointY="13.125" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="35.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="7.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="29.875" />
+        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="41.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="13.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="39.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="71.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="71.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="57.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="26.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="38.75" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="66.625" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="65.125" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="15" PointY="49.625" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="46.625" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="52.875" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="8.75" PointY="6.25" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="11" PointY="6.5" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="11" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.625" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="53.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="17.25" PointY="53.625" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="5.75" PointY="16.125" />
         <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="25.75" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="26.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="5.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="39.375" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="26" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="15.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="12.5" />
         <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="22.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="7.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="12.25" PointY="49.875" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="13.75" PointY="11.125" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="13.75" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="45.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="16.75" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="18.75" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="18.75" PointY="5.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="8.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="14.625" />
-        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="5.75" PointY="2.875" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="30.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="11.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.25" PointY="44" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="15.75" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="15.75" PointY="5.125" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="53.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="15.75" PointY="10.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="11.75" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="15.75" PointY="14.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="13.75" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="15.75" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="17.75" PointY="2.125" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="37.25" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="38.625" />
+        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="8.75" PointY="2.75" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="17.125" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs b/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs
index 797d4f498..367345bde 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs
@@ -12,9 +12,9 @@ namespace Tango.Integration.Operation
         public class IDSPackLevel
         {
             public IdsPack IdsPack { get; set; }
-            public int Current { get; set; }
-            public int Required { get; set; }
-            public int Maximum { get; set; }
+            public long Current { get; set; }
+            public long Required { get; set; }
+            public long Maximum { get; set; }
 
             public bool IsValid
             {
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 2e885e00b..9596dc29c 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -102,7 +102,7 @@ namespace Tango.Integration.Operation
         private class RequiredLiquid
         {
             public IdsPack IdsPack { get; set; }
-            public int Quantity { get; set; }
+            public long Quantity { get; set; }
         }
 
         #endregion
@@ -1030,6 +1030,14 @@ namespace Tango.Integration.Operation
 
             bool changed = (MachineStatus == null || response.Status.State != MachineStatus.State);
 
+            foreach (var idsPack in response.Status.IDSPacksLevels)
+            {
+                if (idsPack.DispenserLevel > 0 && idsPack.DispenserLevel64 == 0)
+                {
+                    idsPack.DispenserLevel64 = idsPack.DispenserLevel;
+                }
+            }
+
             MachineStatus = response.Status;
             MachineStatusChanged?.Invoke(this, MachineStatus);
 
@@ -1510,6 +1518,7 @@ namespace Tango.Integration.Operation
                     UnixTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
                     SpoolType = _currentSpoolType,
                     MachineType = (PMR.Common.MachineType)MachineType,
+                    Supports64BitDispenserLevel = true
                 };
 
                 try
@@ -2169,7 +2178,7 @@ namespace Tango.Integration.Operation
                         var idsLevel = new InsufficientLiquidQuantityException.IDSPackLevel()
                         {
                             IdsPack = idsPack,
-                            Current = packLevel.DispenserLevel,
+                            Current = packLevel.DispenserLevel64,
                             Required = (int)liquidQuantities[index],
                             Maximum = MAX_DISPENSER_NANOLITER,
                         };
@@ -2278,7 +2287,7 @@ namespace Tango.Integration.Operation
                         var idsLevel = new InsufficientLiquidQuantityException.IDSPackLevel()
                         {
                             IdsPack = idsPack,
-                            Current = packLevel.DispenserLevel,
+                            Current = packLevel.DispenserLevel64,
                             Required = (int)liquidQuantities[index],
                             Maximum = MAX_DISPENSER_NANOLITER,
                         };
@@ -2364,16 +2373,16 @@ namespace Tango.Integration.Operation
 
                         if (packLevelAfter != null && packLevelBefore != null)
                         {
-                            if (packLevelAfter.DispenserLevel > packLevelBefore.DispenserLevel)
+                            if (packLevelAfter.DispenserLevel64 > packLevelBefore.DispenserLevel64)
                             {
-                                LogManager.Log($"Invalid '{pack.LiquidType.Name}' dispenser level calculated: {packLevelBefore.DispenserLevel} - {packLevelAfter.DispenserLevel} = {packLevelBefore.DispenserLevel - packLevelAfter.DispenserLevel}. Ignoring...");
+                                LogManager.Log($"Invalid '{pack.LiquidType.Name}' dispenser level calculated: {packLevelBefore.DispenserLevel64} - {packLevelAfter.DispenserLevel64} = {packLevelBefore.DispenserLevel64 - packLevelAfter.DispenserLevel64}. Ignoring...");
                                 continue;
                             }
 
                             _lastJobLiquidQuantities.Add(new BL.ValueObjects.JobRunLiquidQuantity()
                             {
                                 LiquidType = pack.LiquidType.Type,
-                                Quantity = packLevelBefore.DispenserLevel - packLevelAfter.DispenserLevel,
+                                Quantity = packLevelBefore.DispenserLevel64 - packLevelAfter.DispenserLevel64,
                             });
                         }
                     }
@@ -3079,7 +3088,7 @@ namespace Tango.Integration.Operation
                             JobPrepareDispenser prepareDispenser = new JobPrepareDispenser();
                             prepareDispenser.DispenserLiquidType = (DispenserLiquidType)requiredLiquid.IdsPack.LiquidType.Type;
                             prepareDispenser.Index = requiredLiquid.IdsPack.PackIndex;
-                            prepareDispenser.TotalNanoliter = requiredLiquid.Quantity;
+                            prepareDispenser.TotalNanoliter = Convert.ToInt32(requiredLiquid.Quantity);
                             prepareDispenser.Active = requiredLiquid.Quantity > 0;
 
                             prepareRequest.Dispensers.Add(prepareDispenser);
@@ -3254,7 +3263,7 @@ namespace Tango.Integration.Operation
                     }
 
                     double resumePreProgress = 0;
-                    
+
                     if (config.ResumeConfig != null)
                     {
                         resumePreProgress = config.ResumeConfig.GlobalStartPosition - config.ResumeConfig.FirstUnitStartPosition;//- processParameters.DryerBufferLengthMeters;
@@ -3268,11 +3277,11 @@ namespace Tango.Integration.Operation
                     {
                         if (!completed)
                         {
-                           if(resumePreProgress > 0 )
-                           {
-                              response.Message.Status.Progress += resumePreProgress;//LogManager.Log($" MACHINE OPERATOR Added   Progress = {response.Message.Status.Progress}");  
-                           }
-                           
+                            if (resumePreProgress > 0)
+                            {
+                                response.Message.Status.Progress += resumePreProgress;//LogManager.Log($" MACHINE OPERATOR Added   Progress = {response.Message.Status.Progress}");  
+                            }
+
                             handler.RaiseStatusReceived(response.Message.Status);
                             _last_job_status = handler.Status;
 
diff --git a/Software/Visual_Studio/Tango.PMR/Connection/ConnectRequest.cs b/Software/Visual_Studio/Tango.PMR/Connection/ConnectRequest.cs
index d62d5dbc5..27d5d6cb2 100644
--- a/Software/Visual_Studio/Tango.PMR/Connection/ConnectRequest.cs
+++ b/Software/Visual_Studio/Tango.PMR/Connection/ConnectRequest.cs
@@ -23,16 +23,17 @@ namespace Tango.PMR.Connection {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChRDb25uZWN0UmVxdWVzdC5wcm90bxIUVGFuZ28uUE1SLkNvbm5lY3Rpb24a",
-            "EkpvYlNwb29sVHlwZS5wcm90bxoRTWFjaGluZVR5cGUucHJvdG8inQEKDkNv",
+            "EkpvYlNwb29sVHlwZS5wcm90bxoRTWFjaGluZVR5cGUucHJvdG8iwgEKDkNv",
             "bm5lY3RSZXF1ZXN0EhAKCFBhc3N3b3JkGAEgASgJEhAKCFVuaXhUaW1lGAIg",
             "ASgDEjMKCVNwb29sVHlwZRgDIAEoDjIgLlRhbmdvLlBNUi5QcmludGluZy5K",
             "b2JTcG9vbFR5cGUSMgoLTWFjaGluZVR5cGUYBCABKA4yHS5UYW5nby5QTVIu",
-            "Q29tbW9uLk1hY2hpbmVUeXBlQiAKHmNvbS50d2luZS50YW5nby5wbXIuY29u",
-            "bmVjdGlvbmIGcHJvdG8z"));
+            "Q29tbW9uLk1hY2hpbmVUeXBlEiMKG1N1cHBvcnRzNjRCaXREaXNwZW5zZXJM",
+            "ZXZlbBgFIAEoCEIgCh5jb20udHdpbmUudGFuZ28ucG1yLmNvbm5lY3Rpb25i",
+            "BnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSpoolTypeReflection.Descriptor, global::Tango.PMR.Common.MachineTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Connection.ConnectRequest), global::Tango.PMR.Connection.ConnectRequest.Parser, new[]{ "Password", "UnixTime", "SpoolType", "MachineType" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Connection.ConnectRequest), global::Tango.PMR.Connection.ConnectRequest.Parser, new[]{ "Password", "UnixTime", "SpoolType", "MachineType", "Supports64BitDispenserLevel" }, null, null, null)
           }));
     }
     #endregion
@@ -67,6 +68,7 @@ namespace Tango.PMR.Connection {
       unixTime_ = other.unixTime_;
       spoolType_ = other.spoolType_;
       machineType_ = other.machineType_;
+      supports64BitDispenserLevel_ = other.supports64BitDispenserLevel_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -118,6 +120,17 @@ namespace Tango.PMR.Connection {
       }
     }
 
+    /// <summary>Field number for the "Supports64BitDispenserLevel" field.</summary>
+    public const int Supports64BitDispenserLevelFieldNumber = 5;
+    private bool supports64BitDispenserLevel_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Supports64BitDispenserLevel {
+      get { return supports64BitDispenserLevel_; }
+      set {
+        supports64BitDispenserLevel_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ConnectRequest);
@@ -135,6 +148,7 @@ namespace Tango.PMR.Connection {
       if (UnixTime != other.UnixTime) return false;
       if (SpoolType != other.SpoolType) return false;
       if (MachineType != other.MachineType) return false;
+      if (Supports64BitDispenserLevel != other.Supports64BitDispenserLevel) return false;
       return true;
     }
 
@@ -145,6 +159,7 @@ namespace Tango.PMR.Connection {
       if (UnixTime != 0L) hash ^= UnixTime.GetHashCode();
       if (SpoolType != 0) hash ^= SpoolType.GetHashCode();
       if (MachineType != 0) hash ^= MachineType.GetHashCode();
+      if (Supports64BitDispenserLevel != false) hash ^= Supports64BitDispenserLevel.GetHashCode();
       return hash;
     }
 
@@ -171,6 +186,10 @@ namespace Tango.PMR.Connection {
         output.WriteRawTag(32);
         output.WriteEnum((int) MachineType);
       }
+      if (Supports64BitDispenserLevel != false) {
+        output.WriteRawTag(40);
+        output.WriteBool(Supports64BitDispenserLevel);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -188,6 +207,9 @@ namespace Tango.PMR.Connection {
       if (MachineType != 0) {
         size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) MachineType);
       }
+      if (Supports64BitDispenserLevel != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -208,6 +230,9 @@ namespace Tango.PMR.Connection {
       if (other.MachineType != 0) {
         MachineType = other.MachineType;
       }
+      if (other.Supports64BitDispenserLevel != false) {
+        Supports64BitDispenserLevel = other.Supports64BitDispenserLevel;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -234,6 +259,10 @@ namespace Tango.PMR.Connection {
             machineType_ = (global::Tango.PMR.Common.MachineType) input.ReadEnum();
             break;
           }
+          case 40: {
+            Supports64BitDispenserLevel = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
index a11341386..917fa5304 100644
--- a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs
@@ -23,16 +23,17 @@ namespace Tango.PMR.MachineStatus {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChJJRFNQYWNrTGV2ZWwucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz",
-            "ItcBCgxJRFNQYWNrTGV2ZWwSDQoFSW5kZXgYASABKAUSFgoORGlzcGVuc2Vy",
+            "IvEBCgxJRFNQYWNrTGV2ZWwSDQoFSW5kZXgYASABKAUSFgoORGlzcGVuc2Vy",
             "TGV2ZWwYAiABKAUSFAoMTWlkVGFua0xldmVsGAMgASgBEhcKD0plcnJpY2Fu",
             "UHJlc2VudBgEIAEoCBIbChNGaWxsaW5nVGltZW91dEVycm9yGAUgASgIEhQK",
             "DE1pZFRhbmtFbXB0eRgGIAEoCBIfChdNaWRUYW5rUmVmaWxsUHVtcEFjdGl2",
-            "ZRgHIAEoCBIdChVUaW1lclJlbWFpbmluZ1NlY29uZHMYCCABKAVCIwohY29t",
-            "LnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM="));
+            "ZRgHIAEoCBIdChVUaW1lclJlbWFpbmluZ1NlY29uZHMYCCABKAUSGAoQRGlz",
+            "cGVuc2VyTGV2ZWw2NBgJIAEoA0IjCiFjb20udHdpbmUudGFuZ28ucG1yLm1h",
+            "Y2hpbmVzdGF0dXNiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.IDSPackLevel), global::Tango.PMR.MachineStatus.IDSPackLevel.Parser, new[]{ "Index", "DispenserLevel", "MidTankLevel", "JerricanPresent", "FillingTimeoutError", "MidTankEmpty", "MidTankRefillPumpActive", "TimerRemainingSeconds" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.IDSPackLevel), global::Tango.PMR.MachineStatus.IDSPackLevel.Parser, new[]{ "Index", "DispenserLevel", "MidTankLevel", "JerricanPresent", "FillingTimeoutError", "MidTankEmpty", "MidTankRefillPumpActive", "TimerRemainingSeconds", "DispenserLevel64" }, null, null, null)
           }));
     }
     #endregion
@@ -71,6 +72,7 @@ namespace Tango.PMR.MachineStatus {
       midTankEmpty_ = other.midTankEmpty_;
       midTankRefillPumpActive_ = other.midTankRefillPumpActive_;
       timerRemainingSeconds_ = other.timerRemainingSeconds_;
+      dispenserLevel64_ = other.dispenserLevel64_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -166,6 +168,20 @@ namespace Tango.PMR.MachineStatus {
       }
     }
 
+    /// <summary>Field number for the "DispenserLevel64" field.</summary>
+    public const int DispenserLevel64FieldNumber = 9;
+    private long dispenserLevel64_;
+    /// <summary>
+    ///Used only for X4
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public long DispenserLevel64 {
+      get { return dispenserLevel64_; }
+      set {
+        dispenserLevel64_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as IDSPackLevel);
@@ -187,6 +203,7 @@ namespace Tango.PMR.MachineStatus {
       if (MidTankEmpty != other.MidTankEmpty) return false;
       if (MidTankRefillPumpActive != other.MidTankRefillPumpActive) return false;
       if (TimerRemainingSeconds != other.TimerRemainingSeconds) return false;
+      if (DispenserLevel64 != other.DispenserLevel64) return false;
       return true;
     }
 
@@ -201,6 +218,7 @@ namespace Tango.PMR.MachineStatus {
       if (MidTankEmpty != false) hash ^= MidTankEmpty.GetHashCode();
       if (MidTankRefillPumpActive != false) hash ^= MidTankRefillPumpActive.GetHashCode();
       if (TimerRemainingSeconds != 0) hash ^= TimerRemainingSeconds.GetHashCode();
+      if (DispenserLevel64 != 0L) hash ^= DispenserLevel64.GetHashCode();
       return hash;
     }
 
@@ -243,6 +261,10 @@ namespace Tango.PMR.MachineStatus {
         output.WriteRawTag(64);
         output.WriteInt32(TimerRemainingSeconds);
       }
+      if (DispenserLevel64 != 0L) {
+        output.WriteRawTag(72);
+        output.WriteInt64(DispenserLevel64);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -272,6 +294,9 @@ namespace Tango.PMR.MachineStatus {
       if (TimerRemainingSeconds != 0) {
         size += 1 + pb::CodedOutputStream.ComputeInt32Size(TimerRemainingSeconds);
       }
+      if (DispenserLevel64 != 0L) {
+        size += 1 + pb::CodedOutputStream.ComputeInt64Size(DispenserLevel64);
+      }
       return size;
     }
 
@@ -304,6 +329,9 @@ namespace Tango.PMR.MachineStatus {
       if (other.TimerRemainingSeconds != 0) {
         TimerRemainingSeconds = other.TimerRemainingSeconds;
       }
+      if (other.DispenserLevel64 != 0L) {
+        DispenserLevel64 = other.DispenserLevel64;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -346,6 +374,10 @@ namespace Tango.PMR.MachineStatus {
             TimerRemainingSeconds = input.ReadInt32();
             break;
           }
+          case 72: {
+            DispenserLevel64 = input.ReadInt64();
+            break;
+          }
         }
       }
     }