diff --git a/CMS_CORE_Library/Demo/Nc_Demo.cs b/CMS_CORE_Library/Demo/Nc_Demo.cs index 41ec55b..f312f88 100644 --- a/CMS_CORE_Library/Demo/Nc_Demo.cs +++ b/CMS_CORE_Library/Demo/Nc_Demo.cs @@ -735,9 +735,9 @@ namespace CMS_CORE_Library.Demo Id = (uint)i + 1, Process = readValues[headOffset], Override = readValues[headOffset + 1], - Load_Abrasive = BitConverter.ToInt16(readValues.ToArray(), headOffset + 2), // Uint16 = 2 byte - ActualSpeed_Pressure = BitConverter.ToInt32(readValues.ToArray(), headOffset + 4), // Int32 = 4byte - MountedTool_Vacum = BitConverter.ToInt16(readValues.ToArray(), headOffset + 8), // Uint 16 = 2byte + Param3 = BitConverter.ToInt16(readValues.ToArray(), headOffset + 2), // Uint16 = 2 byte + Param1 = BitConverter.ToInt32(readValues.ToArray(), headOffset + 4), // Int32 = 4byte + Param2 = BitConverter.ToInt16(readValues.ToArray(), headOffset + 8), // Uint 16 = 2byte IsActive = (readValues[headOffset + 10] & 1) != 0, // bit 0 IsSelected = (readValues[headOffset + 10] & 2) != 0, // bit 1 OverrideEditable = (readValues[headOffset + 10] & 4) != 0, // bit 2 diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs index 36d4b88..f691abc 100644 --- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs +++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs @@ -884,9 +884,9 @@ namespace CMS_CORE_Library.Fanuc Id = (uint)i + 1, Process = readValues[headOffset], Override = readValues[headOffset + 1], - Load_Abrasive = BitConverter.ToInt16(readValues.ToArray(), headOffset + 2), // Uint 16 = 2byte - MountedTool_Vacum = BitConverter.ToInt16(readValues.ToArray(), headOffset + 4), // Uint 16 = 2byte - ActualSpeed_Pressure = BitConverter.ToInt32(readValues.ToArray(), headOffset + 6), // Int32 = 4byte + Param3 = BitConverter.ToInt16(readValues.ToArray(), headOffset + 2), // Uint 16 = 2byte + Param2 = BitConverter.ToInt16(readValues.ToArray(), headOffset + 4), // Uint 16 = 2byte + Param1 = BitConverter.ToInt32(readValues.ToArray(), headOffset + 6), // Int32 = 4byte IsActive = (readValues[headOffset + 10] & 1) != 0, // bit 0 IsSelected = (readValues[headOffset + 10] & 2) != 0, // bit 1 OverrideEditable = (readValues[headOffset + 10] & 4) != 0, // bit 2 diff --git a/CMS_CORE_Library/Models/DataStructures.cs b/CMS_CORE_Library/Models/DataStructures.cs index 5987c2a..bf59e95 100644 --- a/CMS_CORE_Library/Models/DataStructures.cs +++ b/CMS_CORE_Library/Models/DataStructures.cs @@ -380,9 +380,9 @@ namespace CMS_CORE_Library.Models public uint Id; public byte Process; public byte Override; - public short Load_Abrasive; - public int ActualSpeed_Pressure; - public short MountedTool_Vacum; + public short Param3; + public int Param1; + public short Param2; public bool IsActive; public bool IsSelected; diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index 91b2d77..71fced3 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -877,9 +877,9 @@ namespace CMS_CORE_Library.Osai Id = (uint)i + 1, Process = readValues[headOffset], Override = readValues[headOffset + 1], - Load_Abrasive = BitConverter.ToInt16(readValues.ToArray(), headOffset + 2), // Uint 16 = 2byte - MountedTool_Vacum = BitConverter.ToInt16(readValues.ToArray(), headOffset + 4), // Uint 16 = 2byte - ActualSpeed_Pressure = BitConverter.ToInt32(readValues.ToArray(), headOffset + 6), // Int32 = 4byte + Param3 = BitConverter.ToInt16(readValues.ToArray(), headOffset + 2), // Uint 16 = 2byte + Param2 = BitConverter.ToInt16(readValues.ToArray(), headOffset + 4), // Uint 16 = 2byte + Param1 = BitConverter.ToInt32(readValues.ToArray(), headOffset + 6), // Int32 = 4byte IsActive = (readValues[headOffset + 10] & 1) != 0, // bit 0 IsSelected = (readValues[headOffset + 10] & 2) != 0, // bit 1 OverrideEditable = (readValues[headOffset + 10] & 4) != 0, // bit 2 diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index bf9141e..1b01d3f 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -1183,9 +1183,9 @@ namespace CMS_CORE_Library.Siemens Id = (uint)i + 1, Process = readValues[headOffset], Override = readValues[headOffset + 1], - Load_Abrasive = SwapShortEndianFormat(BitConverter.ToInt16(readValues.ToArray(), headOffset + 2)), // Uint 16 = 2byte - MountedTool_Vacum = toolId, // Uint 16 = 2byte - ActualSpeed_Pressure = SwapIntEndianFormat(BitConverter.ToInt32(readValues.ToArray(), headOffset + 6)), // Int32 = 4byte + Param3 = SwapShortEndianFormat(BitConverter.ToInt16(readValues.ToArray(), headOffset + 2)), // Uint 16 = 2byte + Param2 = toolId, // Uint 16 = 2byte + Param1 = SwapIntEndianFormat(BitConverter.ToInt32(readValues.ToArray(), headOffset + 6)), // Int32 = 4byte IsActive = (readValues[headOffset + 10] & 1) != 0, // bit 0 IsSelected = (readValues[headOffset + 10] & 2) != 0, // bit 1 OverrideEditable = (readValues[headOffset + 10] & 4) != 0, // bit 2