Minor bugfixes and future addons

This commit is contained in:
Matthias Heisig
2025-04-06 10:21:01 +02:00
parent 84e0e174a1
commit 2221f6bab3
22 changed files with 795 additions and 509 deletions

View File

@@ -180,75 +180,21 @@ VAR_GLOBAL PERSISTENT
stEWLSCSCurrent : ST_ANALOG_EW_LEVELS;
stEWDSCSCurrent : ST_ANALOG_EW_DELAYS;
// ===========================
// Part shortage workaround
// ===========================
stConfigVoltageSegment1500 : ST_ANALOG_IO_CONFIG := (iAIMax := 32767, iAIMin := 0, rPVMax := 1500, rPVMin := 0, sUnit := 'V');
stString1VoltageConfig : ST_STRING_VOLT_CONFIG :=
(
stModule1VoltConfig :=
(
xUnit1Is1500V := FALSE,
xUnit2Is1500V := TRUE,
xUnit3Is1500V := TRUE,
xUnit4Is1500V := TRUE
),
stModule2VoltConfig :=
(
xUnit1Is1500V := FALSE,
xUnit2Is1500V := FALSE,
xUnit3Is1500V := FALSE,
xUnit4Is1500V := FALSE
),
stModule3VoltConfig :=
(
xUnit1Is1500V := FALSE,
xUnit2Is1500V := TRUE,
xUnit3Is1500V := TRUE,
xUnit4Is1500V := TRUE
)
);
stString2VoltageConfig : ST_STRING_VOLT_CONFIG :=
(
stModule1VoltConfig :=
(
xUnit1Is1500V := FALSE,
xUnit2Is1500V := TRUE,
xUnit3Is1500V := TRUE,
xUnit4Is1500V := TRUE
),
stModule2VoltConfig :=
(
xUnit1Is1500V := FALSE,
xUnit2Is1500V := TRUE,
xUnit3Is1500V := TRUE,
xUnit4Is1500V := TRUE
),
stModule3VoltConfig :=
(
xUnit1Is1500V := FALSE,
xUnit2Is1500V := TRUE,
xUnit3Is1500V := TRUE,
xUnit4Is1500V := TRUE
)
);
// ===========================
// General settings
// ===========================
// Pump on power (%)
// Pump posolyt on power in %
rPumpPosolytOnPower : REAL := 65.0;
// Pump negolyt on power in %
rPumpNegolytOnPower : REAL := 65.0;
// Pump discharge segment without inverter power (%)
// Pump posolyt discharge segment without inverter power in %
rPumpPosolytDisChrgPower : REAL := 45.0;
// Pump posolyt discharge segment without inverter power in %
rPumpNegolytDisChrgPower : REAL := 45.0;
// Unit voltage pumps shutoff threshold (Volt)
@@ -315,6 +261,7 @@ VAR_GLOBAL PERSISTENT
timIsoErrorTimeout : TIME := T#20s;
// Dummy to deactivate functions
{attribute 'analysis' := '-33'}
xDummy : BOOL := FALSE;
END_VAR]]></Declaration>

View File

@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.7">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.8">
<GVL Name="GVL_SCADA" Id="{8186ff04-764f-4b24-8a6b-d0a44d528e6f}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
// Array for string HMI
stHMIInterface : ARRAY [0..1] OF ST_STRING_HMI_INTERFACE;
// Acknowledge alarm button
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;
// HMI interface to control the battery throught the HMI
stAutomaticModeHMI : ST_AUTO_HMI_INTERFACE;
// Requested control mode by HMI
@@ -27,6 +24,18 @@ VAR_GLOBAL
// Current battery power
diCurrentBatteryPower : DINT;
// Last power charged value
lrChargedPowerValueWH : LREAL;
// Last power discharged value
lrDischargedPowerValueWH : LREAL;
// Last discharged utility power value
lrLastCycleUtilityPowerValueWh : LREAL;
// Cycle status
eCycleStatus : E_CYCLE_STATUS;
xDummy : BOOL := FALSE;
END_VAR]]></Declaration>
</GVL>