diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index 6aa332a..aee3177 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -1961,10 +1961,10 @@ namespace CMS_CORE_Library.Osai int index = (20 * procNumber) + 2; ushort readWord = 0; bool isInPiece = false; - cmsError = MEM_RWWord(R, 0, MEMORY_TYPE.Osai_SW, PROCESS_STATUS.Address + ((procNumber - 1) * 2), ref readWord); - if (cmsError.IsError()) - return cmsError; - isInPiece = (readWord & 0x1) != 0x1; //Bit 1 + //cmsError = MEM_RWWord(R, 0, PROCESS_STATUS.MemType, PROCESS_STATUS.Address + ((procNumber - 1) * 2), ref readWord); + //if (cmsError.IsError()) + // return cmsError; + //isInPiece = (readWord & 0x1) != 0x1; //Bit 1 // Convert Byte into true/false array BitArray bits = new BitArray(new byte[] { bytes[0] }); //1st byte -> 0 : Proccess type (AUX-WORK), 1: Process in alarm status, 2: Run, 3: Hold, 4: Read, 5: PartProgramVisible diff --git a/CMS_CORE_Library/ToolConfigurations.cs b/CMS_CORE_Library/ToolConfigurations.cs index db874bb..324fd28 100644 --- a/CMS_CORE_Library/ToolConfigurations.cs +++ b/CMS_CORE_Library/ToolConfigurations.cs @@ -281,8 +281,8 @@ namespace CMS_CORE_Library new FieldsConfiguration{ Name = "dressed", Type = "boolean", SelectValues = null, Category = "status", SubCategory = "revive", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue}, new FieldsConfiguration{ Name = "integrityCheck", Type = "boolean", SelectValues = null, Category = "status", SubCategory = "integrityCheck", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue}, new FieldsConfiguration{ Name = "residualLife", Type = "int", SelectValues = null, Category = "life", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue}, - new FieldsConfiguration{ Name = "residualRevive", Type = "int", SelectValues = null, Category = "life", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue}, - new FieldsConfiguration{ Name = "residualPresetting", Type = "int", SelectValues = null, Category = "life", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "residualRevive", Type = "int", SelectValues = null, Category = "life", SubCategory = "revive", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "residualPresetting", Type = "int", SelectValues = null, Category = "life", SubCategory = "revive", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue}, new FieldsConfiguration{ Name = "offsetId1", Type = "int", SelectValues = null, Category = "offset", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue}, new FieldsConfiguration{ Name = "offsetId2", Type = "int", SelectValues = null, Category = "offset", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue}, new FieldsConfiguration{ Name = "offsetId3", Type = "int", SelectValues = null, Category = "offset", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue},