diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml index 0e8dc19..ead3dd3 100644 --- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml @@ -373,9 +373,6 @@ - - diff --git a/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml b/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml index 6bc2448..c5d67f9 100644 --- a/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml @@ -217,9 +217,6 @@ - - diff --git a/App/SicRT/Config/System.sccfg b/App/SicRT/Config/System.sccfg index 4833280..e7f670c 100644 --- a/App/SicRT/Config/System.sccfg +++ b/App/SicRT/Config/System.sccfg @@ -1089,6 +1089,14 @@ + + + + + + + + @@ -1117,15 +1125,15 @@ - - - - - - - - - + + + + + + + + + @@ -1229,7 +1237,8 @@ - + + @@ -1868,7 +1877,8 @@ - + + diff --git a/Framework/MECF.Framework.Common/Aitex/Core/RT/IOCore/Interlock/InterlockManager.cs b/Framework/MECF.Framework.Common/Aitex/Core/RT/IOCore/Interlock/InterlockManager.cs index d3f3d34..058e0ee 100644 --- a/Framework/MECF.Framework.Common/Aitex/Core/RT/IOCore/Interlock/InterlockManager.cs +++ b/Framework/MECF.Framework.Common/Aitex/Core/RT/IOCore/Interlock/InterlockManager.cs @@ -197,6 +197,9 @@ namespace Aitex.Core.RT.IOCore.Interlock /// public static bool GetScBypassInterlockValue(string module) { + if (module == "System") + return false; + if (ModuleHelper.IsPm(module)) return SC.SafeGetValue($"PM.{module}.BypassInterlock", false); else diff --git a/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoValve.cs b/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoValve.cs index eb23f0d..7bc75be 100644 --- a/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoValve.cs +++ b/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoValve.cs @@ -157,10 +157,11 @@ namespace Aitex.Core.RT.Device.Devices _uniqueName = $"{Module}.{Name}"; string path; - if(module.StartsWith("PM")) - path = $"PM.{module}.BypassEnableTable"; //_scBypassEnableTable = ParseScNode("scBypassEnableTable", node, module, $"PM.{module}.BypassEnableTable"); + if(ioModule.StartsWith("PM")) + path = $"PM.{ioModule}.BypassEnableTable"; //_scBypassEnableTable = ParseScNode("scBypassEnableTable", node, module, $"PM.{module}.BypassEnableTable"); else - path = $"{module}.BypassEnableTable"; //_scBypassEnableTable = ParseScNode("scBypassEnableTable", node, module, $"{module}.BypassEnableTable"); + path = $"{ioModule}.BypassEnableTable"; //_scBypassEnableTable = ParseScNode("scBypassEnableTable", node, module, $"{module}.BypassEnableTable"); + _scBypassEnableTable = SC.SafeGetValue(path, false);