Some refactoring

This commit is contained in:
Matthias Heisig
2025-01-17 08:08:37 +01:00
parent 39a02352f6
commit 0345f57a3f
10 changed files with 2921 additions and 934 deletions

View File

@@ -305,7 +305,7 @@ _fbModule1(
stModuleVoltageConfig := stStringModuleVoltageConfig.stModule1VoltConfig,
xInSafetyCheckMode := xInSafetyCheckMode,
xEmergencyStopOk:= xEmergencyStopOk,
stHMIInterface:= stHMIInterface.stHMIInterfaceModule1,
refstHMIInterface:= stHMIInterface.stHMIInterfaceModule1,
xReleaseErrors:= xReleaseErrors,
xReleaseLimitErrors:= xReleaseLimitErrors AND _xReleaseLimitErrorsInternal,
xReleaseManualMode := xReleaseManualMode,
@@ -325,7 +325,7 @@ _fbModule2(
stModuleVoltageConfig := stStringModuleVoltageConfig.stModule2VoltConfig,
xInSafetyCheckMode := xInSafetyCheckMode,
xEmergencyStopOk:= xEmergencyStopOk,
stHMIInterface:= stHMIInterface.stHMIInterfaceModule2,
refstHMIInterface:= stHMIInterface.stHMIInterfaceModule2,
xReleaseErrors:= xReleaseErrors,
xReleaseLimitErrors:= xReleaseLimitErrors AND _xReleaseLimitErrorsInternal,
xReleaseManualMode := xReleaseManualMode,
@@ -344,7 +344,7 @@ _fbModule3(
stModuleVoltageConfig := stStringModuleVoltageConfig.stModule3VoltConfig,
xInSafetyCheckMode := xInSafetyCheckMode,
xEmergencyStopOk:= xEmergencyStopOk,
stHMIInterface:= stHMIInterface.stHMIInterfaceModule3,
refstHMIInterface:= stHMIInterface.stHMIInterfaceModule3,
xReleaseErrors:= xReleaseErrors,
xReleaseLimitErrors:= xReleaseLimitErrors AND _xReleaseLimitErrorsInternal,
xReleaseManualMode := xReleaseManualMode,
@@ -887,98 +887,5 @@ _fbSafetyInterlocksNotOkAlarm.ipArguments.Clear().AddString(_sName);]]></ST>
</Implementation>
</Set>
</Property>
<LineIds Name="FB_String">
<LineId Id="3" Count="7" />
<LineId Id="600" Count="2" />
<LineId Id="599" Count="0" />
<LineId Id="603" Count="2" />
<LineId Id="607" Count="0" />
<LineId Id="606" Count="0" />
<LineId Id="608" Count="1" />
<LineId Id="611" Count="0" />
<LineId Id="610" Count="0" />
<LineId Id="612" Count="1" />
<LineId Id="11" Count="10" />
<LineId Id="638" Count="3" />
<LineId Id="22" Count="0" />
<LineId Id="664" Count="0" />
<LineId Id="662" Count="0" />
<LineId Id="665" Count="0" />
<LineId Id="663" Count="0" />
<LineId Id="661" Count="0" />
<LineId Id="643" Count="0" />
<LineId Id="646" Count="1" />
<LineId Id="649" Count="0" />
<LineId Id="648" Count="0" />
<LineId Id="650" Count="1" />
<LineId Id="653" Count="0" />
<LineId Id="652" Count="0" />
<LineId Id="654" Count="1" />
<LineId Id="658" Count="0" />
<LineId Id="657" Count="0" />
<LineId Id="659" Count="1" />
<LineId Id="642" Count="0" />
<LineId Id="23" Count="236" />
<LineId Id="623" Count="0" />
<LineId Id="260" Count="6" />
<LineId Id="624" Count="0" />
<LineId Id="267" Count="14" />
<LineId Id="630" Count="0" />
<LineId Id="282" Count="14" />
<LineId Id="629" Count="0" />
<LineId Id="297" Count="27" />
<LineId Id="628" Count="0" />
<LineId Id="325" Count="12" />
<LineId Id="597" Count="0" />
<LineId Id="338" Count="16" />
<LineId Id="627" Count="0" />
<LineId Id="355" Count="6" />
<LineId Id="625" Count="0" />
<LineId Id="362" Count="7" />
<LineId Id="626" Count="0" />
<LineId Id="370" Count="0" />
<LineId Id="578" Count="0" />
<LineId Id="371" Count="0" />
<LineId Id="582" Count="0" />
<LineId Id="584" Count="0" />
<LineId Id="372" Count="2" />
<LineId Id="587" Count="2" />
<LineId Id="377" Count="0" />
<LineId Id="596" Count="0" />
<LineId Id="378" Count="29" />
<LineId Id="631" Count="0" />
<LineId Id="408" Count="3" />
<LineId Id="632" Count="0" />
<LineId Id="412" Count="58" />
<LineId Id="633" Count="0" />
<LineId Id="471" Count="10" />
<LineId Id="634" Count="0" />
<LineId Id="482" Count="13" />
<LineId Id="635" Count="1" />
<LineId Id="496" Count="18" />
<LineId Id="637" Count="0" />
<LineId Id="515" Count="16" />
</LineIds>
<LineIds Name="FB_String.FB_init">
<LineId Id="3" Count="21" />
<LineId Id="31" Count="2" />
<LineId Id="35" Count="0" />
<LineId Id="34" Count="0" />
<LineId Id="25" Count="5" />
<LineId Id="2" Count="0" />
<LineId Id="37" Count="0" />
<LineId Id="36" Count="0" />
<LineId Id="38" Count="1" />
</LineIds>
<LineIds Name="FB_String.Name.Get">
<LineId Id="1" Count="0" />
</LineIds>
<LineIds Name="FB_String.Name.Set">
<LineId Id="1" Count="5" />
<LineId Id="12" Count="0" />
<LineId Id="11" Count="0" />
<LineId Id="13" Count="0" />
<LineId Id="7" Count="3" />
</LineIds>
</POU>
</TcPlcObject>