Added some fixed during pre safety check

- Fixed bug that SafetyIntlkTimeout could not be acknowledged
- Pumps now dont shut off during error in unit (except over- or underpressure), setpoint is now set to discharge power
- Fixed bug not able to restart safety-check when not all strings where off
- Adjusted Safetyparameters to match safetycheck protocol

PLC/POUs/FB_String.TcPOU

@@ -228,10 +228,7 @@ VAR PERSISTENT
 END_VAR
 ]]></Declaration>
     <Implementation>
-      <ST><![CDATA[// Reset error flag
-xError := FALSE;
-
-// Reset all modules in automatic mode
+      <ST><![CDATA[// Reset all modules in automatic mode
 xAllModulesInAutoMode := TRUE;
 
 // Reset Safety
@@ -420,6 +417,10 @@ CASE _iState OF
 			_iState := 7;
 		END_IF
 		
+		IF _xErrorInternal THEN
+			_iState := 1000;
+		END_IF
+		
 		
 	1: // Wait for ready in safety check mode
 		IF _xAllModulesReady THEN
@@ -838,7 +839,7 @@ END_IF
 
 // Reset safetyinterlock timeout alarm
 IF _fbSafetyIntlkTimeoutAlarm.bRaised AND xConfirmAlarms THEN
-	_fbInverterStartupTimeoutAlarm.Clear(0, TRUE);
+	_fbSafetyIntlkTimeoutAlarm.Clear(0, TRUE);
 END_IF
 
 // Copy status to hmi interface

PLC/POUs/FB_Unit.TcPOU

@@ -1258,8 +1258,10 @@ CASE _iState OF
 		stHMIInterface.eStatus := E_COMPONENT_STATUS.ERROR;
 		_fbNegolytValveTankOutlet.ReqAutomaticClose();
 		_fbPosolytValveTankOutlet.ReqAutomaticClose();
-		_fbPosolytPumpInlet.ReqAutomaticStop();
-		_fbNegolytPumpInlet.ReqAutomaticStop();
+		_rSetpointNegolytPumpInlet := GVL_CONFIG.rPumpNegolytDisChrgPower;
+		_rSetpointPosolytPumpInlet := GVL_CONFIG.rPumpPosolytDisChrgPower;
+		//_fbPosolytPumpInlet.ReqAutomaticStop();
+		//_fbNegolytPumpInlet.ReqAutomaticStop();
 		_xEnableVoltageLimitChecks := FALSE;
 		xShutdownDischargeAllowed := FALSE;
 		xInShutdownDischargeMode := FALSE;

PLC/POUs/MAIN.TcPOU

@@ -1113,6 +1113,10 @@ CASE _iStateSafetyCheck OF
 		IF _xStringsOff THEN
 			_iStateSafetyCheck := 0;
 		END_IF
+		
+		IF _xStartSafetyCheck THEN
+			_iStateSafetyCheck := 0;
+		END_IF
 	
 		// Check for errors
 		IF _xStringsErrorActive THEN