latest updates to alarms and valve ctl

atSite/RRF-MainWater.Device.Application.xml

@@ -6,6 +6,7 @@
     <ProjectInfo name="RRF-MainWater" devicename="Device" appname="Application" />
   </Header>
   <TypeList>
+    <TypeUserDef name="T_atDebounce" size="0" nativesize="1120" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDebounce" />
     <TypeSimple name="T_BOOL" size="1" swapsize="0" typeclass="Bool" iecname="BOOL" />
     <TypeSimple name="T_DINT" size="4" swapsize="4" typeclass="DInt" iecname="DINT" />
     <TypeSimple name="T_INT" size="2" swapsize="2" typeclass="Int" iecname="INT" />
@@ -26,9 +27,6 @@
       <UserDefElement iecname="in_delOff" type="T_TIME" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="out_default" type="T_BOOL" byteoffset="12" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atDI" size="1" nativesize="11312" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDI">
-      <UserDefElement iecname="out_val" type="T_BOOL" byteoffset="0" vartype="VAR_OUTPUT" access="ReadWrite" />
-    </TypeUserDef>
     <TypeUserDef name="T_atDQ" size="1" nativesize="1120" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDQ">
       <UserDefElement iecname="out_val" type="T_BOOL" byteoffset="0" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
@@ -91,6 +89,11 @@
       <UserDefElement type="T_atVFDFaultCode" iecname="localCtl" enumvalue="13" />
       <UserDefElement type="T_atVFDFaultCode" iecname="unknown" enumvalue="99" />
     </TypeUserDef>
+    <TypeUserDef name="T_atDI" size="14" nativesize="11312" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDI">
+      <UserDefElement iecname="alm" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="debounce" type="T_atDebounce" byteoffset="13" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_val" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" access="ReadWrite" />
+    </TypeUserDef>
     <TypeUserDef name="T_atDevice" size="20" nativesize="5880" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atDevice">
       <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
@@ -248,6 +251,9 @@
       <Node name="g" nodeflags="NodeTypeBranchNode SigTypeGvl">
         <Node name="cisternHHL" nodeflags="SigTypeGvl ExportedVariable" type="T_atDI" access="ReadWrite" />
         <Node name="cisternLvl" nodeflags="SigTypeGvl ExportedVariable" type="T_atAI" access="ReadWrite" />
+        <Node name="cistFillAuto" nodeflags="SigTypeGvl ExportedVariable" type="T_BOOL" access="ReadWrite" />
+        <Node name="cistFillHand" nodeflags="SigTypeGvl ExportedVariable" type="T_BOOL" access="ReadWrite" />
+        <Node name="cistFillVlv" nodeflags="SigTypeGvl ExportedVariable" type="T_atDQ" access="ReadWrite" />
         <Node name="floodDct" nodeflags="SigTypeGvl ExportedVariable" type="T_atDI" access="ReadWrite" />
         <Node name="hoseMode" nodeflags="SigTypeGvl ExportedVariable" type="T_BOOL" access="ReadWrite" />
         <Node name="outflow1Flow" nodeflags="SigTypeGvl ExportedVariable" type="T_atAI" access="ReadWrite">

atSite/RRF-MainWater.~u

@@ -1,4 +0,0 @@
-User
-ATOM-CRDESKTOP
-28136
-639135844727547734