Merge branch 'develop' of gitlab.cmblu.net:sps-allgemein/uniblu into develop
# Conflicts: # PLC/PLC.tmc # Uniper.tsproj
This commit is contained in:
@@ -412,7 +412,7 @@ HandleErrors();
|
||||
CASE _iState OF
|
||||
0: // Idle
|
||||
// Start in normal mode
|
||||
IF xEnable AND xAllModulesInAutoMode AND xRepairSwitchOk AND (NOT _xErrorInternal) THEN
|
||||
IF (xEnable OR xStartBalancing) AND xAllModulesInAutoMode AND xRepairSwitchOk AND (NOT _xErrorInternal) THEN
|
||||
_xEnable := TRUE;
|
||||
|
||||
CASE eOperationMode OF
|
||||
@@ -424,6 +424,7 @@ CASE _iState OF
|
||||
E_STRING_OPERATING_MODE.BALANCING:
|
||||
_xStartBalancing := TRUE;
|
||||
_xReleaseLimitErrorsInternal := FALSE;
|
||||
_xEnable := FALSE;
|
||||
_iState := 7;
|
||||
|
||||
// Safety check mode
|
||||
|
||||
Reference in New Issue
Block a user