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

# Conflicts:
#	PLC/PLC.tmc
#	Uniper.tsproj

PLC/POUs/FB_String.TcPOU

@@ -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

PLC/POUs/FB_Unit.TcPOU

@@ -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