From 28c6cfac99ea17993c34fa85b17cb13ad2fa9a44 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.local.net>
Date: Thu, 2 Jul 2020 15:09:22 +0200
Subject: [PATCH] Update gauge/LiveProd data retrieving

---
 CMS_CORE_Library/Models/ThermoModels.cs | 14 +++++++-------
 CMS_CORE_Library/NcThermo.cs            |  2 +-
 CMS_CORE_Library/S7Net/Nc_S7Net.cs      |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMS_CORE_Library/Models/ThermoModels.cs b/CMS_CORE_Library/Models/ThermoModels.cs
index 59d51ad..046b3e7 100644
--- a/CMS_CORE_Library/Models/ThermoModels.cs
+++ b/CMS_CORE_Library/Models/ThermoModels.cs
@@ -8,19 +8,19 @@ namespace CMS_CORE_Library.Models
         #region Thermo models
 
         /// <summary>
-        /// Represents thermo gauge data
+        /// Represents thermo LIVE prod data (gauge, time adv...)
         /// </summary>
-        public class GaugeModel
+        public class LiveProdDataModel
         {
-            public uint TimeAdv { get; set; } = 0;
-            public int Power { get; set; } = 0;
-            public int Vacuum { get; set; } = 0;
-            public int Air { get; set; } = 0;
+            public double TimeAdv { get; set; } = 0;
+            public double Power { get; set; } = 0;
+            public double Vacuum { get; set; } = 0;
+            public double Air { get; set; } = 0;
 
             public override bool Equals(object obj)
             {
                 // Object is not a GaugeModel instance
-                if (!(obj is GaugeModel item))
+                if (!(obj is LiveProdDataModel item))
                     return false;
 
                 if (TimeAdv != item.TimeAdv)
diff --git a/CMS_CORE_Library/NcThermo.cs b/CMS_CORE_Library/NcThermo.cs
index 471203b..bec6010 100644
--- a/CMS_CORE_Library/NcThermo.cs
+++ b/CMS_CORE_Library/NcThermo.cs
@@ -728,7 +728,7 @@ namespace CMS_CORE_Library
         /// <returns cref="CmsError">Returns an error when an internal or a library error occours</returns>
         /// </summary>
         /// <param name="gaugeData">Reference to the value of the gauge data</param>
-        public abstract CmsError PLC_RGaugeData(ref ThermoModels.GaugeModel gaugeData);
+        public abstract CmsError PLC_RGaugeData(ref ThermoModels.LiveProdDataModel gaugeData);
         /// <summary>
         /// Get current Production Info data
         /// </summary>
diff --git a/CMS_CORE_Library/S7Net/Nc_S7Net.cs b/CMS_CORE_Library/S7Net/Nc_S7Net.cs
index 365a31c..4617621 100644
--- a/CMS_CORE_Library/S7Net/Nc_S7Net.cs
+++ b/CMS_CORE_Library/S7Net/Nc_S7Net.cs
@@ -2198,7 +2198,7 @@ namespace CMS_CORE_Library.S7Net
         /// </summary>
         /// <param name="gaugeData"></param>
         /// <returns></returns>
-        public override CmsError PLC_RGaugeData(ref ThermoModels.GaugeModel gaugeData)
+        public override CmsError PLC_RGaugeData(ref ThermoModels.LiveProdDataModel gaugeData)
         {
             List<int> Values = new List<int>();
             CmsError libraryError = MEM_RWIntegerList(R, 1, MACHINE_GAUGE_DATA.MemType, MACHINE_GAUGE_DATA.Address, MACHINE_GAUGE_DATA.SubAddress, MACHINE_GAUGE_DATA.Size / 4, ref Values);
@@ -2206,7 +2206,7 @@ namespace CMS_CORE_Library.S7Net
             if (libraryError.IsError())
                 return libraryError;
 
-            gaugeData = new ThermoModels.GaugeModel()
+            gaugeData = new ThermoModels.LiveProdDataModel()
             {
                 TimeAdv = Convert.ToUInt32(Values[0]),
                 Power = Values[1],