Added logic, tags, and alarms for runtime alarms

2016-02-23 10:05:51 -06:00
parent 6374e9a561
commit ea2aa032c6
30 changed files with 34 additions and 39 deletions
--- a/Controller/Controller/Compile.ic
+++ b/Controller/Controller/Compile.ic
@@ -1 +1 @@
-COMPILED
+TO RELINK
--- a/Controller/Controller/LogicalValues.csv
+++ b/Controller/Controller/LogicalValues.csv
@@ -45,6 +45,11 @@ Controller.Micro820.Micro820._IO_EM_DO_05	FALSE
 Controller.Micro820.Micro820._IO_EM_DO_06	FALSE
 Controller.Micro820.Micro820._IO_P1_AI_00	
 Controller.Micro820.Micro820._IO_P1_AI_01	
+Controller.Micro820.Micro820.ALARM_Mode	
+Controller.Micro820.Micro820.ALARM_Pressure	
+Controller.Micro820.Micro820.ALARM_Temperature	
+Controller.Micro820.Micro820.ALARM_TubingPressure	
+Controller.Micro820.Micro820.ALARM_VFD	
 Controller.Micro820.Micro820.Auto_Mode	TRUE
 Controller.Micro820.Micro820.cfg_MaxFreq	
 Controller.Micro820.Micro820.cfg_MinFreq	
--- a/Controller/Controller/Micro820/Micro820/Compile.ics
+++ b/Controller/Controller/Micro820/Micro820/Compile.ics
@@ -1 +0,0 @@
-TO RELINK
--- a/Controller/Controller/Micro820/Micro820/Compile.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_DINT_TO_USINT.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_DINT_TO_USINT.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_READ.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_READ.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_WRITE.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_WRITE.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_STS_CMD.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_STS_CMD.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_SINT_TO_USINT.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_SINT_TO_USINT.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_UDINT_TO_USINT.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_UDINT_TO_USINT.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_UINT_TO_USINT.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_UINT_TO_USINT.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_DINT.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_DINT.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_SINT.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_SINT.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UDINT.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UDINT.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UINT.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UINT.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_VFD_CONFIGMAP.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_VFD_CONFIGMAP.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_VFD_ERRORMAP.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_VFD_ERRORMAP.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Compile_VFD_MESSAGING.ict
+++ b/Controller/Controller/Micro820/Micro820/Compile_VFD_MESSAGING.ict
@@ -1 +0,0 @@
-COMPILED
--- a/Controller/Controller/Micro820/Micro820/Control.AcfMlge
+++ b/Controller/Controller/Micro820/Micro820/Control.AcfMlge
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Root Version="6">
  <LanguageContainerStyle CommentTextColor="Green" CommentFont="Courier New, 10pt" PonctuationTextColor="Black" PonctuationFont="Courier New, 10pt" IdentifierTextColor="Black" IdentifierFont="Courier New, 10pt" OperatorTextColor="Black" OperatorFont="Courier New, 10pt" ReservedWordTextColor="Fuchsia" ReservedWordFont="Courier New, 10pt" PouTextColor="BlueViolet" PouFont="Courier New, 10pt" NumberTextColor="Firebrick" NumberFont="Courier New, 10pt" StringTextColor="Gray" StringFont="Courier New, 10pt" EditorTextAreaBackgroundColor="White" EditorFont="Courier New, 10pt" Index="0" />
 </Root>
--- a/Controller/Controller/Micro820/Micro820/Control.stf
+++ b/Controller/Controller/Micro820/Micro820/Control.stf
@@ -205,7 +205,28 @@ END_IF;
 IF (NOT Run_Permissive AND VFD_Run_Cmd) THEN
 	Device_Status := 'Lost Run Permissive';
 	Shutdown_Time := __SYSVA_CYCLEDATE;
+	
+	IF NOT RP_Mode THEN
+		ALARM_Mode := TRUE;
+	ELSIF NOT RP_Pressure THEN
+		ALARM_Pressure := TRUE;
+	ELSIF NOT RP_Temperature THEN
+		ALARM_Temperature := TRUE;
+	ELSIF NOT RP_TubingPressure THEN
+		ALARM_TubingPressure := TRUE;
+	ELSIF NOT RP_VFD THEN
+		ALARM_VFD := TRUE;
+	END_IF;
+	
 	VFD_Start := FALSE;
+	
+END_IF;
+
+IF Run_Permissive THEN
+	ALARM_Mode := FALSE;
+	ALARM_Pressure := FALSE;
+	ALARM_Temperature := FALSE;
+	ALARM_VFD := FALSE;
 END_IF;

 (*  Run only if commanded to start and start permissive is met or already running and not being told to stop *)
--- a/Controller/Controller/Micro820/Micro820/MICRO820.icp
+++ b/Controller/Controller/Micro820/Micro820/MICRO820.icp
@@ -1,17 +0,0 @@
-RA_PFX_ENET_PAR_WRITE(168):FB,MSG_CIPGENERIC();FB,R_TRIG();
-USINT_TO_UDINT(149):
-VFD_MESSAGING(163):FB,RA_PFX_ENET_STS_CMD(164);
-DINT_TO_USINT(154):
-UINT_TO_USINT(155):
-VFD_CONFIGMAP(167):FB,RA_PFX_ENET_PAR_READ(166);FB,RA_PFX_ENET_PAR_WRITE(168);
-VFD_ERRORMAP(169):
-USINT_TO_UINT(151):
-RA_PFX_ENET_STS_CMD(164):FB,MSG_CIPGENERIC();FB,R_TRIG();FB,COP();
-CONTROL(161):FB,LINEARSCALE(159);
-USINT_TO_SINT(152):
-LINEARSCALE(159):
-SINT_TO_USINT(156):
-UDINT_TO_USINT(153):
-RA_PFX_ENET_PAR_READ(166):FB,MSG_CIPGENERIC();FB,R_TRIG();
-USINT_TO_DINT(150):
-READDOWNHOLEDATA(160):
--- a/Controller/Controller/PrjLibrary.mdb
+++ b/Controller/Controller/PrjLibrary.mdb
--- a/Controller/Controller/RMD.info
+++ b/Controller/Controller/RMD.info
@@ -1,2 +1,2 @@
 [RMDManager]
-TASK=BUILD
+TASK=REBUILD
--- a/Controller/Controller/RmcVariables
+++ b/Controller/Controller/RmcVariables
@@ -0,0 +1,5 @@
+Controller.Micro820.Micro820.ALARM_Mode
+Controller.Micro820.Micro820.ALARM_Pressure
+Controller.Micro820.Micro820.ALARM_Temperature
+Controller.Micro820.Micro820.ALARM_TubingPressure
+Controller.Micro820.Micro820.ALARM_VFD
--- a/Controller/Controller/persist.ccwx
+++ b/Controller/Controller/persist.ccwx
--- a/IntelligentPumpPanel_VFD.v12.ccwsuo
+++ b/IntelligentPumpPanel_VFD.v12.ccwsuo
--- a/Project/PV_IPP_VFD.cha
+++ b/Project/PV_IPP_VFD.cha