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
 	

Uniper.tsproj

@@ -269,7 +269,7 @@
 		</System>
 		<Plc>
 			<Project GUID="{9AE64910-5EB2-4866-93FD-EFE059C38C36}" Name="PLC" PrjFilePath="PLC\PLC.plcproj" TmcFilePath="PLC\PLC.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" CopyTmcToTarget="true" CopyTpyToTarget="false" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{64CB4C75-7104-EEA4-3FBC-05991E35D8D7}" TmcPath="PLC\PLC.tmc">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{07E9B518-2512-A373-B429-1E1430A84C16}" TmcPath="PLC\PLC.tmc">
 					<Name>PLC Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="2" AreaNo="1">