Merge remote-tracking branch 'origin/master'

# Conflicts:
#	WaterWellPanel.v12.ccwsuo
This commit is contained in:
Patrick McDonagh
2016-02-22 08:55:32 -06:00

View File

@@ -91,27 +91,78 @@ ELSE
Pressure_OK := TRUE;
END_IF;
(* Start Permissive Status *)
IF Pressure_Startup_Enabled THEN
IF (DH_IntakePressure > Pressure_Startup) THEN
SP_Pressure := TRUE;
ELSE
SP_Pressure := FALSE;
END_IF;
ELSE
SP_Pressure := TRUE;
END_IF;
IF Temp_Startup_Enabled THEN
IF DH_IntakeTemperature < Temp_Startup THEN
SP_Temperature := TRUE;
ELSE
SP_Temperature := FALSE;
END_IF;
ELSE
SP_Temperature := TRUE;
END_IF;
IF Hand_Mode OR Auto_Mode OR Test_Mode THEN
SP_Mode := TRUE;
ELSE
SP_Mode := FALSE;
END_IF;
SP_Trip := NOT TripStatus;
SP_Voltage := VoltageOK;
(* Pressure should be above the startup pressure setpoint and temperature should be below the startup temp setpoint to begin*)
IF ((((DH_IntakePressure > Pressure_Startup) AND Pressure_Startup_Enabled) OR NOT Pressure_Startup_Enabled) AND
(((DH_IntakeTemperature < Temp_Startup) AND Temp_Startup_Enabled) OR NOT Temp_Startup_Enabled) AND
(Hand_Mode OR Auto_Mode OR Test_Mode) AND
(NOT TripStatus) AND
VoltageOK
) THEN
IF (SP_Pressure AND SP_Temperature AND SP_Mode AND SP_Trip AND SP_Voltage) THEN
Start_Permissive := TRUE;
ELSE
Start_Permissive := FALSE;
Device_Status := 'Not ready to start';
END_IF;
(* Run Permissive Status *)
IF Pressure_Shutdown_Enabled THEN
IF DH_IntakePressure > Pressure_Shutdown THEN
RP_Pressure := TRUE;
ELSE
RP_Pressure := FALSE;
END_IF;
ELSE
RP_Pressure := TRUE;
END_IF;
IF Temp_Shutdown_Enabled THEN
IF DH_IntakeTemperature < Temp_Shutdown THEN
RP_Temperature := TRUE;
ELSE
RP_Temperature := FALSE;
END_IF;
ELSE
RP_Temperature := TRUE;
END_IF;
IF Hand_Mode OR Auto_Mode OR Test_Mode THEN
RP_Mode := TRUE;
ELSE
RP_Mode := FALSE;
END_IF;
RP_Trip := NOT TripStatus;
RP_TubingPressure := Pressure_OK;
(* Pressure should be be above the shutdown pressure and temperature should be below shutdown temp setpoint to continue to run *)
IF ((((DH_IntakePressure > Pressure_Shutdown) AND Pressure_Shutdown_Enabled) OR NOT Pressure_Shutdown_Enabled) AND
(((DH_IntakeTemperature < Temp_Shutdown) AND Temp_Shutdown_Enabled) OR NOT Temp_Shutdown_Enabled) AND
(Hand_Mode OR Auto_Mode OR Test_Mode)
AND (NOT TripStatus)
AND Pressure_OK
) THEN
IF (RP_Pressure AND RP_Temperature AND RP_Mode AND RP_Trip AND RP_TubingPressure) THEN
Run_Permissive := TRUE;
ELSE
Run_Permissive := FALSE;
@@ -216,65 +267,7 @@ IF NOT Contactor_Status THEN
END_IF;
(* Start Permissive Status *)
IF Pressure_Startup_Enabled THEN
IF (DH_IntakePressure > Pressure_Startup) THEN
SP_Pressure := TRUE;
ELSE
SP_Pressure := FALSE;
END_IF;
ELSE
SP_Pressure := TRUE;
END_IF;
IF Temp_Startup_Enabled THEN
IF DH_IntakeTemperature < Temp_Startup THEN
SP_Temperature := TRUE;
ELSE
SP_Temperature := FALSE;
END_IF;
ELSE
SP_Temperature := TRUE;
END_IF;
IF Hand_Mode OR Auto_Mode OR Test_Mode THEN
SP_Mode := TRUE;
ELSE
SP_Mode := FALSE;
END_IF;
SP_Trip := NOT TripStatus;
SP_Voltage := VoltageOK;
(* Run Permissive Status *)
IF Pressure_Shutdown_Enabled THEN
IF DH_IntakePressure > Pressure_Shutdown THEN
RP_Pressure := TRUE;
ELSE
RP_Pressure := FALSE;
END_IF;
ELSE
RP_Pressure := TRUE;
END_IF;
IF Temp_Shutdown_Enabled THEN
IF DH_IntakeTemperature < Temp_Shutdown THEN
RP_Temperature := TRUE;
ELSE
RP_Temperature := FALSE;
END_IF;
ELSE
RP_Temperature := TRUE;
END_IF;
IF Hand_Mode OR Auto_Mode OR Test_Mode THEN
RP_Mode := TRUE;
ELSE
RP_Mode := FALSE;
END_IF;
RP_Trip := NOT TripStatus;
RP_TubingPressure := Pressure_OK;
END_PROGRAM