diff --git a/CMS_CORE_Library/Models/ThermoModels.cs b/CMS_CORE_Library/Models/ThermoModels.cs index 6d73520..51847c2 100644 --- a/CMS_CORE_Library/Models/ThermoModels.cs +++ b/CMS_CORE_Library/Models/ThermoModels.cs @@ -828,6 +828,8 @@ namespace CMS_CORE_Library.Models public double Value1 { get; set; } = 0; public double Value2 { get; set; } = 0; public double Value3 { get; set; } = 0; + public ushort TypeVal { get; set; } = 0; + #endregion Public Properties diff --git a/CMS_CORE_Library/S7Net/Nc_S7Net.cs b/CMS_CORE_Library/S7Net/Nc_S7Net.cs index 9720fcc..f648b76 100644 --- a/CMS_CORE_Library/S7Net/Nc_S7Net.cs +++ b/CMS_CORE_Library/S7Net/Nc_S7Net.cs @@ -183,7 +183,7 @@ namespace CMS_CORE_Library.S7Net internal static MEMORY_CELL PROCESS_STATUS = new MEMORY_CELL(MEMORY_TYPE.Siemens_DB, 605, 0, 2); - internal static MEMORY_CELL HISTORY_SHEETS = new MEMORY_CELL(MEMORY_TYPE.Siemens_DB, 143, 2, 14); + internal static MEMORY_CELL HISTORY_SHEETS = new MEMORY_CELL(MEMORY_TYPE.Siemens_DB, 143, 2, 16); internal static MEMORY_CELL HISTORY_ACK_SHEETS = new MEMORY_CELL(MEMORY_TYPE.Siemens_DB, 143, 0, 2); // Prod strobe/ack @@ -3766,7 +3766,8 @@ namespace CMS_CORE_Library.S7Net newData = (S7.Net.Types.Int.FromByteArray(currMem.Skip(0).Take(2).ToArray()) & 1) == 1, Value1 = S7.Net.Types.Single.FromByteArray(currMem.Skip(2).Take(4).ToArray()), Value2 = S7.Net.Types.Single.FromByteArray(currMem.Skip(6).Take(4).ToArray()), - Value3 = S7.Net.Types.Single.FromByteArray(currMem.Skip(10).Take(4).ToArray()), + Value3 = S7.Net.Types.Single.FromByteArray(currMem.Skip(10).Take(4).ToArray()), + TypeVal = S7.Net.Types.Word.FromByteArray(currMem.Skip(14).Take(2).ToArray()), }; return NO_ERROR;