Merge branch 'feature/ManualModeSwitch' into develop

# 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
8 changed files with 686 additions and 1367 deletions

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.12">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.7">
<GVL Name="GVL_SCADA" Id="{8186ff04-764f-4b24-8a6b-d0a44d528e6f}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
@@ -7,6 +7,12 @@ VAR_GLOBAL
stAckAlarmsButton : ST_HMI_CONTROL_BUTTON := (xRelease := TRUE);
// Butotn to switch all components into manual mode
stAllToManualModeButton : ST_HMI_CONTROL_BUTTON;
// Button to switch all components in to automatic mode
stAllToAutoModeButton : ST_HMI_CONTROL_BUTTON;
stAutomaticModeHMI : ST_AUTO_HMI_INTERFACE;
// Requested control mode by HMI
@@ -20,6 +26,8 @@ VAR_GLOBAL
// Current battery power
diCurrentBatteryPower : DINT;
xDummy : BOOL := FALSE;
END_VAR]]></Declaration>
</GVL>
</TcPlcObject>