6 files changed, 34 insertions, 11 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Formulation/LubricantFormulaCalculator.cs b/Software/Visual_Studio/Tango.Integration/Formulation/LubricantFormulaCalculator.cs
new file mode 100644
index 000000000..3d75c9748
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Integration/Formulation/LubricantFormulaCalculator.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Integration.Observables;
+
+namespace Tango.Integration.Formulation
+{
+    [Formula(IdsPackFormulas.Lubricant)]
+    public class LubricantFormulaCalculator : FormulaCalculatorBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Integration/Formulation/DiluterFormulaCalculator.cs b/Software/Visual_Studio/Tango.Integration/Formulation/TransparentLiquidFormulaCalculator.cs
index a888cd8ce..bad40f7f8 100644
--- a/Software/Visual_Studio/Tango.Integration/Formulation/DiluterFormulaCalculator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Formulation/TransparentLiquidFormulaCalculator.cs
@@ -8,8 +8,8 @@ using Tango.Integration.Printing;
 
 namespace Tango.Integration.Formulation
 {
-    [Formula(IdsPackFormulas.Diluter)]
-    public class DiluterFormulaCalculator : FormulaCalculatorBase
+    [Formula(IdsPackFormulas.TransparentLiquid)]
+    public class TransparentLiquidFormulaCalculator : FormulaCalculatorBase
     {
         public override double CoerceVolume(LiquidVolume liquidVolume)
         {
diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs
index 743f506ee..7d9b36cba 100644
--- a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs
+++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs
@@ -10,16 +10,22 @@ namespace Tango.Integration.Observables
     {
 
         /// <summary>
+        /// (Lubricant Formula)
+        /// </summary>
+        [Description("Lubricant Formula")]
+        Lubricant = 2,
+
+        /// <summary>
         /// (Standard Color IDS Pack Formula)
         /// </summary>
         [Description("Standard Color IDS Pack Formula")]
         StandardColor = 0,
 
         /// <summary>
-        /// (Diluter)
+        /// (Diluter Formula)
         /// </summary>
-        [Description("Diluter")]
-        Diluter = 1,
+        [Description("Diluter Formula")]
+        TransparentLiquid = 1,
 
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs
index f3642bebe..69400cfe7 100644
--- a/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs
@@ -13,7 +13,7 @@ namespace Tango.Integration.Operators
         /// <summary>
         /// Occurs when there is new diagnostics data available.
         /// </summary>
-        event EventHandler<StartDiagnosticsResponse> DiagnosticsDataAvailable;
+        event EventHandler<PushDiagnosticsResponse> DiagnosticsDataAvailable;
 
         /// <summary>
         /// Gets or sets a value indicating whether to enable diagnostics messages by requesting diagnostics messages.
diff --git a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
index 68f68d47c..17884b677 100644
--- a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
@@ -10,6 +10,7 @@ using Tango.Transport.Transporters;
 using System.Reactive.Linq;
 using System.Reactive.Concurrency;
 using System.Reactive.Threading;
+using Tango.PMR.Common;
 
 namespace Tango.Integration.Operators
 {
@@ -18,7 +19,7 @@ namespace Tango.Integration.Operators
         /// <summary>
         /// Occurs when there is new diagnostics data available.
         /// </summary>
-        public event EventHandler<StartDiagnosticsResponse> DiagnosticsDataAvailable;
+        public event EventHandler<PushDiagnosticsResponse> DiagnosticsDataAvailable;
 
         private bool _enableDiagnostics;
         /// <summary>
@@ -46,12 +47,12 @@ namespace Tango.Integration.Operators
         {
             if (value && State == TransportComponentState.Connected)
             {
-                SendContinuousRequest<StartDiagnosticsRequest, StartDiagnosticsResponse>(new TangoMessage<StartDiagnosticsRequest>(new StartDiagnosticsRequest()
+                SendContinuousRequest<PushDiagnosticsRequest, PushDiagnosticsResponse>(new TangoMessage<PushDiagnosticsRequest>(new PushDiagnosticsRequest()
                 {
                     PushMotors = true,
                     PushSensors = true,
 
-                }, PMR.Common.MessageType.StartDiagnosticsRequest)).ObserveOn(new NewThreadScheduler()).Subscribe(
+                }, MessageType.PushDiagnosticsRequest)).ObserveOn(new NewThreadScheduler()).Subscribe(
                     (response) =>
                     {
                         OnDiagnosticsDataAvailable(response);
@@ -71,7 +72,7 @@ namespace Tango.Integration.Operators
         /// Invokes the <see cref="DiagnosticsDataAvailable"/> event.
         /// </summary>
         /// <param name="data">The sensors data.</param>
-        protected virtual void OnDiagnosticsDataAvailable(StartDiagnosticsResponse data)
+        protected virtual void OnDiagnosticsDataAvailable(PushDiagnosticsResponse data)
         {
             DiagnosticsDataAvailable?.Invoke(this, data);
         }
diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
index 42ca836c3..077f66869 100644
--- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
+++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
@@ -74,12 +74,13 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ExtensionMethods\IExternalBridgeClientExtensions.cs" />
-    <Compile Include="Formulation\DiluterFormulaCalculator.cs" />
+    <Compile Include="Formulation\TransparentLiquidFormulaCalculator.cs" />
     <Compile Include="Formulation\FormulaCalculatorBase.cs" />
     <Compile Include="Formulation\FormulasCalculationService.cs" />
     <Compile Include="Formulation\FormulaResolver.cs" />
     <Compile Include="Formulation\FormulaAttribute.cs" />
     <Compile Include="Formulation\IFormulaCalculator.cs" />
+    <Compile Include="Formulation\LubricantFormulaCalculator.cs" />
     <Compile Include="Formulation\StandardColorFormulaCalculator.cs" />
     <Compile Include="Observables\Entities\ActionType.cs" />
     <Compile Include="Observables\Entities\Address.cs" />