Egalware/cms-core-active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Type to History

Browse Source
This commit is contained in:
Thermo_SIM
2021-03-22 16:16:31 +01:00
parent f4f0c95ad4
commit f0f2d415f6
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Library/Models/ThermoModels.cs
+2
View File
@@ -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
CMS_CORE_Library/S7Net/Nc_S7Net.cs
+3 -2
View File
@@ -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;