Merge branch 'develop' of http://112.124.35.216:65000/Sic-Software/MoS2 into develop

# Conflicts:
#	App/SicRT/Config/System.sccfg
This commit is contained in:
SIC1016\caipeilun
2026-08-27 16:44:45 +08:00
5 changed files with 16 additions and 18 deletions
@@ -197,6 +197,9 @@ namespace Aitex.Core.RT.IOCore.Interlock
/// <returns></returns>
public static bool GetScBypassInterlockValue(string module)
{
if (module == "System")
return false;
if (ModuleHelper.IsPm(module))
return SC.SafeGetValue($"PM.{module}.BypassInterlock", false);
else
@@ -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);