Heisig_GmbH/Uniper_PLC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/ManualModeSwitch' into develop

Browse Source 
# Conflicts:
#	PLC/PLC.tmc
#	PLC/POUs/FB_String.TcPOU
#	PLC/POUs/MAIN.TcPOU
#	Uniper.tsproj
This commit is contained in:
Matthias Heisig
2024-08-30 14:32:11 +02:00
parent 08d2ffd136 112f7cb7d9
commit 5e94ba4868
8 changed files with 686 additions and 1367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
PLC/POUs/FB_String.TcPOU
View File

@@ -45,6 +45,9 @@ VAR_INPUT
// Input to confirm all errors
xConfirmAlarms : BOOL;
// Switch all components to manual mode
xAllToManualMode : BOOL;
// Repair switch closed
xRepairSwitchOk AT %I* : BOOL;
@@ -194,7 +197,10 @@ VAR PERSISTENT
END_VAR
]]></Declaration>
<Implementation>
<ST><![CDATA[// Reset all modules in automatic mode
<ST><![CDATA[// Reset error flag
xError := FALSE;
// Reset all modules in automatic mode
xAllModulesInAutoMode := TRUE;
// Reset Safety
@@ -249,6 +255,7 @@ _fbModule1(
xReleaseLimitErrors:= xReleaseLimitErrors AND _xReleaseLimitErrorsInternal,
xReleaseManualMode := xReleaseManualMode,
xConfirmAlarms:= xConfirmAlarms,
xAllToManualMode := xAllToManualMode,
rBalancingTargetVoltage := rSmallestSegmentVoltage);
@@ -268,6 +275,7 @@ _fbModule2(
xReleaseLimitErrors:= xReleaseLimitErrors AND _xReleaseLimitErrorsInternal,
xReleaseManualMode := xReleaseManualMode,
xConfirmAlarms:= xConfirmAlarms,
xAllToManualMode := xAllToManualMode,
rBalancingTargetVoltage := rSmallestSegmentVoltage);
@@ -286,6 +294,7 @@ _fbModule3(
xReleaseLimitErrors:= xReleaseLimitErrors AND _xReleaseLimitErrorsInternal,
xReleaseManualMode := xReleaseManualMode,
xConfirmAlarms:= xConfirmAlarms,
xAllToManualMode := xAllToManualMode,
rBalancingTargetVoltage := rSmallestSegmentVoltage);
// ===============================
@@ -353,7 +362,7 @@ xOff := _fbModule1.xOff AND _fbModule2.xOff AND _fbModule3.xOff;
// Calculate string voltage
// ===============================
rCurrentVoltage := _fbModule1.rCurrentVoltage + _fbModule2.rCurrentVoltage + _fbModule3.rCurrentVoltage;
stHMIInterface.rVoltage := rCurrentVoltage;
stHMIInterface.rVoltage := stHMIInterface.rVoltage* 0.95 + rCurrentVoltage * 0.05;
// ===============================
// String balance check
@@ -803,102 +812,18 @@ _fbSafetyInterlocksNotOkAlarm.ipArguments.Clear().AddString(_sName);]]></ST>
</Set>
</Property>
<LineIds Name="FB_String">
<LineId Id="4876" Count="1" />
<LineId Id="4881" Count="53" />
<LineId Id="4947" Count="18" />
<LineId Id="4978" Count="17" />
<LineId Id="5966" Count="1" />
<LineId Id="5965" Count="0" />
<LineId Id="5969" Count="0" />
<LineId Id="5968" Count="0" />
<LineId Id="5971" Count="2" />
<LineId Id="5970" Count="0" />
<LineId Id="5008" Count="0" />
<LineId Id="5976" Count="0" />
<LineId Id="5978" Count="1" />
<LineId Id="5977" Count="0" />
<LineId Id="5975" Count="0" />
<LineId Id="5009" Count="115" />
<LineId Id="5776" Count="0" />
<LineId Id="5775" Count="0" />
<LineId Id="5773" Count="0" />
<LineId Id="5590" Count="0" />
<LineId Id="5125" Count="0" />
<LineId Id="5774" Count="0" />
<LineId Id="5777" Count="0" />
<LineId Id="5126" Count="103" />
<LineId Id="5962" Count="1" />
<LineId Id="5230" Count="35" />
<LineId Id="5964" Count="0" />
<LineId Id="5266" Count="18" />
<LineId Id="5772" Count="0" />
<LineId Id="5285" Count="0" />
<LineId Id="5288" Count="23" />
<LineId Id="5581" Count="2" />
<LineId Id="5585" Count="1" />
<LineId Id="5584" Count="0" />
<LineId Id="5312" Count="51" />
<LineId Id="5985" Count="2" />
<LineId Id="5980" Count="0" />
<LineId Id="5995" Count="1" />
<LineId Id="5990" Count="0" />
<LineId Id="5993" Count="0" />
<LineId Id="5991" Count="1" />
<LineId Id="5994" Count="0" />
<LineId Id="5988" Count="0" />
<LineId Id="5999" Count="1" />
<LineId Id="6009" Count="1" />
<LineId Id="6013" Count="0" />
<LineId Id="6001" Count="0" />
<LineId Id="6008" Count="0" />
<LineId Id="6002" Count="0" />
<LineId Id="6004" Count="0" />
<LineId Id="6003" Count="0" />
<LineId Id="6005" Count="1" />
<LineId Id="5981" Count="0" />
<LineId Id="5989" Count="0" />
<LineId Id="5364" Count="1" />
<LineId Id="5997" Count="0" />
<LineId Id="5368" Count="30" />
<LineId Id="527" Count="0" />
<LineId Id="3" Count="542" />
<LineId Id="2" Count="0" />
</LineIds>
<LineIds Name="FB_String.FB_init">
<LineId Id="7" Count="0" />
<LineId Id="33" Count="0" />
<LineId Id="32" Count="0" />
<LineId Id="34" Count="2" />
<LineId Id="16" Count="0" />
<LineId Id="15" Count="0" />
<LineId Id="17" Count="0" />
<LineId Id="20" Count="0" />
<LineId Id="31" Count="0" />
<LineId Id="29" Count="1" />
<LineId Id="28" Count="0" />
<LineId Id="45" Count="0" />
<LineId Id="44" Count="0" />
<LineId Id="46" Count="1" />
<LineId Id="56" Count="0" />
<LineId Id="55" Count="0" />
<LineId Id="57" Count="1" />
<LineId Id="67" Count="0" />
<LineId Id="66" Count="0" />
<LineId Id="68" Count="1" />
<LineId Id="71" Count="0" />
<LineId Id="70" Count="0" />
<LineId Id="72" Count="0" />
<LineId Id="3" Count="27" />
<LineId Id="2" Count="0" />
</LineIds>
<LineIds Name="FB_String.Name.Get">
<LineId Id="2" Count="0" />
<LineId Id="1" Count="0" />
</LineIds>
<LineIds Name="FB_String.Name.Set">
<LineId Id="2" Count="0" />
<LineId Id="9" Count="0" />
<LineId Id="6" Count="2" />
<LineId Id="5" Count="0" />
<LineId Id="13" Count="0" />
<LineId Id="11" Count="0" />
<LineId Id="10" Count="0" />
<LineId Id="12" Count="0" />
<LineId Id="1" Count="9" />
</LineIds>
</POU>
</TcPlcObject>