Merge branch 'develop' of gitlab.cmblu.net:sps-allgemein/uniblu into develop

# Conflicts:
#	PLC/PLC.tmc
#	Uniper.tsproj
This commit is contained in:
Markus Neukirch
2025-08-04 18:15:08 +02:00
4 changed files with 31 additions and 30 deletions

View File

@@ -996,7 +996,7 @@ CASE _iState OF
_iState := 1000;
END_IF
IF (NOT xEnable) THEN
IF (NOT xEnable) AND NOT xStartBalancing THEN
_iState := 51;
END_IF