Sic-Software/MoS2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	App/SicRT/Config/System.sccfg
This commit is contained in:
SIC1016\caipeilun 2026-08-27 16:44:45 +08:00
commit 5df2fb38d1
5 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
View File

@ -373,9 +373,6 @@
<IoGasBoxTemp id="HeatoutsidePanelTemp" display="outsidePanelTemp(ATC-4)" aiHeatTMA="AI_HeatoutsidePanel" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区4" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/> <IoGasBoxTemp id="HeatoutsidePanelTemp" display="outsidePanelTemp(ATC-4)" aiHeatTMA="AI_HeatoutsidePanel" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区4" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatoutsideSHTemp" display="outsideSHTemp(ATC-5)" aiHeatTMA="AI_HeatoutsideSH" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区5" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/> <IoGasBoxTemp id="HeatoutsideSHTemp" display="outsideSHTemp(ATC-5)" aiHeatTMA="AI_HeatoutsideSH" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区5" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatLeakBypassTemp" display="LeakBypassTemp(ATC-6)" aiHeatTMA="AI_HeatLeakBypass" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区6" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/> <IoGasBoxTemp id="HeatLeakBypassTemp" display="LeakBypassTemp(ATC-6)" aiHeatTMA="AI_HeatLeakBypass" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区6" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<!--<IoGasBoxTemp id="HeatTailFilter" display="HeatTailFilter" aiHeatTMA="AI_HeatTailFilter" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="PumpLineTempLimt" scWarningLog="PumpLineTempAlarm" doLineHeaterEnable="" />
<IoGasBoxTemp id="HeatTailPipe" display="HeatTailPipe" aiHeatTMA="AI_HeatTailPipe" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="PumpLineTempLimt" scWarningLog="PumpLineTempAlarm" doLineHeaterEnable=""/>-->
</IoGasBoxTemps> </IoGasBoxTemps>
<IoPumps classType="Aitex.Core.RT.Device.Devices.IoPump" assembly="MECF.Framework.RT.EquipmentLibrary"> <IoPumps classType="Aitex.Core.RT.Device.Devices.IoPump" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoPump id="Pump" module="" display="Pump" schematicId="Pump" unit="" aioType="" diDryPumpAlarm="DI_DryPumpAlarm" diPumpExhaustPress="DI_PumpExhaustPressSW" diDryPumpFlow="DI_DryPumpFlowSW" diDryPump1Running="DI_DryPump1Running" diDryPump1Warning="DI_DryPump1Warning" /> <IoPump id="Pump" module="" display="Pump" schematicId="Pump" unit="" aioType="" diDryPumpAlarm="DI_DryPumpAlarm" diPumpExhaustPress="DI_PumpExhaustPressSW" diDryPumpFlow="DI_DryPumpFlowSW" diDryPump1Running="DI_DryPump1Running" diDryPump1Warning="DI_DryPump1Warning" />

3
App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
View File

@ -217,9 +217,6 @@
<IoGasBoxTemp id="HeatoutsidePanelTemp" display="outsidePanelTemp(ATC-4)" aiHeatTMA="AI_HeatoutsidePanel" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区4" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/> <IoGasBoxTemp id="HeatoutsidePanelTemp" display="outsidePanelTemp(ATC-4)" aiHeatTMA="AI_HeatoutsidePanel" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区4" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatoutsideSHTemp" display="outsideSHTemp(ATC-5)" aiHeatTMA="AI_HeatoutsideSH" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区5" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/> <IoGasBoxTemp id="HeatoutsideSHTemp" display="outsideSHTemp(ATC-5)" aiHeatTMA="AI_HeatoutsideSH" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区5" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<IoGasBoxTemp id="HeatLeakBypassTemp" display="LeakBypassTemp(ATC-6)" aiHeatTMA="AI_HeatLeakBypass" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区6" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/> <IoGasBoxTemp id="HeatLeakBypassTemp" display="LeakBypassTemp(ATC-6)" aiHeatTMA="AI_HeatLeakBypass" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="加热带温区6" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
<!--<IoGasBoxTemp id="HeatTailFilter" display="HeatTailFilter" aiHeatTMA="AI_HeatTailFilter" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="PumpLineTempLimt" scWarningLog="PumpLineTempAlarm" doLineHeaterEnable="" />
<IoGasBoxTemp id="HeatTailPipe" display="HeatTailPipe" aiHeatTMA="AI_HeatTailPipe" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="PumpLineTempLimt" scWarningLog="PumpLineTempAlarm" doLineHeaterEnable=""/>-->
</IoGasBoxTemps> </IoGasBoxTemps>
<IoPumps classType="Aitex.Core.RT.Device.Devices.IoPump" assembly="MECF.Framework.RT.EquipmentLibrary"> <IoPumps classType="Aitex.Core.RT.Device.Devices.IoPump" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoPump id="Pump" module="" display="Pump" schematicId="Pump" unit="" aioType="" diDryPumpAlarm="DI_DryPumpAlarm" diPumpExhaustPress="DI_PumpExhaustPressSW" diDryPumpFlow="DI_DryPumpFlowSW" diDryPump1Running="DI_DryPump1Running" diDryPump1Warning="DI_DryPump1Warning" /> <IoPump id="Pump" module="" display="Pump" schematicId="Pump" unit="" aioType="" diDryPumpAlarm="DI_DryPumpAlarm" diPumpExhaustPress="DI_PumpExhaustPressSW" diDryPumpFlow="DI_DryPumpFlowSW" diDryPump1Running="DI_DryPump1Running" diDryPump1Warning="DI_DryPump1Warning" />

18
App/SicRT/Config/System.sccfg
View File

@ -1117,15 +1117,15 @@
<config default="10" name="ResetErrorTimeout" description="Reset Error Timeout" max="100" min="0" paramter="" tag="" unit="s" type="Integer" /> <config default="10" name="ResetErrorTimeout" description="Reset Error Timeout" max="100" min="0" paramter="" tag="" unit="s" type="Integer" />
</configs> </configs>
<configs name="Efficiency"> <configs name="Efficiency">
<config default="1" name="TCS-Eff" description="TCS Bubbling efficiency for recipe" max="100" min="0" paramter="" tag="" unit="" type="Double" /> <config default="1" name="CS2FlowRatio" description="CS2流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" />
<config default="1" name="TMA-Eff" description="TMA Bubbling efficiency for recipe" max="100" min="0" paramter="" tag="" unit="" type="Double" /> <config default="1" name="H2SFlowRatio" description="H2S流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" />
<config default="1" name="TMAFlowRatio" description="TMA流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" /> <config default="1" name="H2SeFlowRatio" description="H2Se流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" />
<config default="1" name="TCSFlowRatio" description="TCS流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" /> <config default="1" name="MOFlowRatio" description="MO流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" />
<config default="1" name="HCLFlowRatio" description="HCL流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" /> <config default="1" name="MOCO6FlowRatio" description="MOCO6流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" />
<config default="1" name="C2H4/C3H8FlowRatio" description="C2H4/C3H8流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" /> <config default="1" name="N2FlowRatio" description="N2流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" />
<config default="1" name="SiH4FlowRatio" description="SiH4流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" /> <config default="1" name="O2FlowRatio" description="O2流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" />
<config default="1" name="PN2FlowRatio" description="PN2流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" /> <config default="1" name="SO2FlowRatio" description="SO2流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" />
<config default="1" name="ArFlowRatio" description="Ar流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" /> <config default="1" name="WCO6FlowRatio" description="WCO6流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" />
<config default="1" name="H2FlowRatio" description="H2流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" /> <config default="1" name="H2FlowRatio" description="H2流量计算需要乘以的系数" max="100" min="0" paramter="" tag="" unit="" type="Double" />
</configs> </configs>

3
Framework/MECF.Framework.Common/Aitex/Core/RT/IOCore/Interlock/InterlockManager.cs
View File

@ -197,6 +197,9 @@ namespace Aitex.Core.RT.IOCore.Interlock
/// <returns></returns> /// <returns></returns>
public static bool GetScBypassInterlockValue(string module) public static bool GetScBypassInterlockValue(string module)
{ {
if (module == "System")
return false;
if (ModuleHelper.IsPm(module)) if (ModuleHelper.IsPm(module))
return SC.SafeGetValue($"PM.{module}.BypassInterlock", false); return SC.SafeGetValue($"PM.{module}.BypassInterlock", false);
else else

7
Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoValve.cs
View File

@ -157,10 +157,11 @@ namespace Aitex.Core.RT.Device.Devices
_uniqueName = $"{Module}.{Name}"; _uniqueName = $"{Module}.{Name}";
string path; string path;
if(module.StartsWith("PM")) if(ioModule.StartsWith("PM"))
path = $"PM.{module}.BypassEnableTable"; //_scBypassEnableTable = ParseScNode("scBypassEnableTable", node, module, $"PM.{module}.BypassEnableTable"); path = $"PM.{ioModule}.BypassEnableTable"; //_scBypassEnableTable = ParseScNode("scBypassEnableTable", node, module, $"PM.{module}.BypassEnableTable");
else 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); _scBypassEnableTable = SC.SafeGetValue(path, false);