diff --git a/Controller/Controller/Compile.ic b/Controller/Controller/Compile.ic index 7e6cc76..34c4e94 100644 --- a/Controller/Controller/Compile.ic +++ b/Controller/Controller/Compile.ic @@ -1 +1 @@ -COMPILED +TO RELINK \ No newline at end of file diff --git a/Controller/Controller/LogicalValues.csv b/Controller/Controller/LogicalValues.csv index 06e0d31..b8b59c4 100644 --- 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 diff --git a/Controller/Controller/Micro820/Micro820/Compile.ics b/Controller/Controller/Micro820/Micro820/Compile.ics deleted file mode 100644 index 679cef0..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile.ics +++ /dev/null @@ -1 +0,0 @@ -TO RELINK diff --git a/Controller/Controller/Micro820/Micro820/Compile.ict b/Controller/Controller/Micro820/Micro820/Compile.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict b/Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_CONTROL.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_DINT_TO_USINT.ict b/Controller/Controller/Micro820/Micro820/Compile_DINT_TO_USINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_DINT_TO_USINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict b/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_READ.ict b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_READ.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_READ.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_WRITE.ict b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_WRITE.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_PAR_WRITE.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_STS_CMD.ict b/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_STS_CMD.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_RA_PFX_ENET_STS_CMD.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict b/Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_READDOWNHOLEDATA.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_SINT_TO_USINT.ict b/Controller/Controller/Micro820/Micro820/Compile_SINT_TO_USINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_SINT_TO_USINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_UDINT_TO_USINT.ict b/Controller/Controller/Micro820/Micro820/Compile_UDINT_TO_USINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_UDINT_TO_USINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_UINT_TO_USINT.ict b/Controller/Controller/Micro820/Micro820/Compile_UINT_TO_USINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_UINT_TO_USINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_DINT.ict b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_DINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_DINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_SINT.ict b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_SINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_SINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UDINT.ict b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UDINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UDINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UINT.ict b/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UINT.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_USINT_TO_UINT.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_VFD_CONFIGMAP.ict b/Controller/Controller/Micro820/Micro820/Compile_VFD_CONFIGMAP.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_VFD_CONFIGMAP.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_VFD_ERRORMAP.ict b/Controller/Controller/Micro820/Micro820/Compile_VFD_ERRORMAP.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_VFD_ERRORMAP.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Compile_VFD_MESSAGING.ict b/Controller/Controller/Micro820/Micro820/Compile_VFD_MESSAGING.ict deleted file mode 100644 index 7e6cc76..0000000 --- a/Controller/Controller/Micro820/Micro820/Compile_VFD_MESSAGING.ict +++ /dev/null @@ -1 +0,0 @@ -COMPILED diff --git a/Controller/Controller/Micro820/Micro820/Control.AcfMlge b/Controller/Controller/Micro820/Micro820/Control.AcfMlge index 0cd9ea9..6c09cd5 100644 --- a/Controller/Controller/Micro820/Micro820/Control.AcfMlge +++ b/Controller/Controller/Micro820/Micro820/Control.AcfMlge @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/Controller/Controller/Micro820/Micro820/Control.stf b/Controller/Controller/Micro820/Micro820/Control.stf index a55fa36..eb9ffe2 100644 --- 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 *) diff --git a/Controller/Controller/Micro820/Micro820/MICRO820.icp b/Controller/Controller/Micro820/Micro820/MICRO820.icp deleted file mode 100644 index f43c25d..0000000 --- a/Controller/Controller/Micro820/Micro820/MICRO820.icp +++ /dev/null @@ -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): diff --git a/Controller/Controller/PrjLibrary.mdb b/Controller/Controller/PrjLibrary.mdb index d2186b1..d8a047c 100644 Binary files a/Controller/Controller/PrjLibrary.mdb and b/Controller/Controller/PrjLibrary.mdb differ diff --git a/Controller/Controller/RMD.info b/Controller/Controller/RMD.info index 3a98e98..6572d3c 100644 --- a/Controller/Controller/RMD.info +++ b/Controller/Controller/RMD.info @@ -1,2 +1,2 @@ [RMDManager] -TASK=BUILD +TASK=REBUILD diff --git a/Controller/Controller/RmcVariables b/Controller/Controller/RmcVariables new file mode 100644 index 0000000..551e4ef --- /dev/null +++ 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 diff --git a/Controller/Controller/persist.ccwx b/Controller/Controller/persist.ccwx index 2a39eb9..413c061 100644 Binary files a/Controller/Controller/persist.ccwx and b/Controller/Controller/persist.ccwx differ diff --git a/IntelligentPumpPanel_VFD.v12.ccwsuo b/IntelligentPumpPanel_VFD.v12.ccwsuo index 60d77c6..f83128e 100644 Binary files a/IntelligentPumpPanel_VFD.v12.ccwsuo and b/IntelligentPumpPanel_VFD.v12.ccwsuo differ diff --git a/PVc Project/PV_IPP_VFD.cha b/PVc Project/PV_IPP_VFD.cha index 1030543..6596109 100644 Binary files a/PVc Project/PV_IPP_VFD.cha and b/PVc Project/PV_IPP_VFD.cha differ