From 539d6f7fab4c0b987ff006e6f96d80c74a36215b Mon Sep 17 00:00:00 2001
From: carlos <carlos@atom.ca>
Date: Tue, 3 Mar 2026 17:59:59 -0700
Subject: [PATCH] moved molasses ctl to water

---
 Archive.prj                                   |   4 +-
 new_rbf_water.project                         |   3 +
 new_rbf_water_project.precompilecache         |   3 +
 ...cca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo |   4 +-
 ...50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids | Bin 32 -> 32 bytes
 ...2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo |   4 +-
 rbf_water.Device.RBFWater.xml                 | 198 +++++++++++++++---
 rbf_water.project                             |   4 +-
 rbf_water_project.precompilecache             |   4 +-
 9 files changed, 181 insertions(+), 43 deletions(-)
 create mode 100644 new_rbf_water.project
 create mode 100644 new_rbf_water_project.precompilecache

diff --git a/Archive.prj b/Archive.prj
index db7e393..05977ec 100644
--- a/Archive.prj
+++ b/Archive.prj
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c1a8de2f342ebffd8c1d2bd5a48882d21361f68f242f9800564bdb40a68a0ed
-size 3590147
+oid sha256:6a6a2c9f750134f1482996fecb03155e2cd5d7f0dde4b721aea7c397ffec32f1
+size 3789548
diff --git a/new_rbf_water.project b/new_rbf_water.project
new file mode 100644
index 0000000..f2a8e91
--- /dev/null
+++ b/new_rbf_water.project
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bae4209be299e8827ed0bfc4422047c559c5f50cd7edf18a339b7d3e76e8c38b
+size 6032673
diff --git a/new_rbf_water_project.precompilecache b/new_rbf_water_project.precompilecache
new file mode 100644
index 0000000..9b19445
--- /dev/null
+++ b/new_rbf_water_project.precompilecache
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2828c9934384234a813a28710f61285841d6dd967fd049941ed885dc3a694c3c
+size 1038873
diff --git a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo
index b14b524..4fa0216 100644
--- a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo
+++ b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9590feae3ad2ac7bc0478d5b2b4cd382a5df6790a6c5511166d5bc24ee6eaed6
-size 8443047
+oid sha256:116ac83d652713694c96fce03b73ad62dc8af774cb0d3b40c08c91656dc6107f
+size 9521543
diff --git a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids
index d3fd3cef80e8602060ae74d3ddf0096ca2bf6528..00913930014e898b912dbb6241d16d75669d1336 100644
GIT binary patch
literal 32
VcmXr$3Vp(W1WXUkJdVU=003LK1WEt^

literal 32
VcmY$Llzy5432gZHM*xY-003e61f&1}

diff --git a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo
index b14b524..4fa0216 100644
--- a/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo
+++ b/rbf_water.Device.RBFWater.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9590feae3ad2ac7bc0478d5b2b4cd382a5df6790a6c5511166d5bc24ee6eaed6
-size 8443047
+oid sha256:116ac83d652713694c96fce03b73ad62dc8af774cb0d3b40c08c91656dc6107f
+size 9521543
diff --git a/rbf_water.Device.RBFWater.xml b/rbf_water.Device.RBFWater.xml
index 0b8dd3f..37e5400 100644
--- a/rbf_water.Device.RBFWater.xml
+++ b/rbf_water.Device.RBFWater.xml
@@ -7,32 +7,23 @@
   </Header>
   <TypeList>
     <TypeUserDef name="T_atMbClient" size="0" nativesize="465672" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbClient" />
+    <TypeUserDef name="T_atOdotB64" size="0" nativesize="471072" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atOdotB64" />
     <TypeSimple name="T_BOOL" size="1" swapsize="0" typeclass="Bool" iecname="BOOL" />
     <TypeSimple name="T_BYTE" size="1" swapsize="1" typeclass="Byte" iecname="BYTE" />
     <TypeSimple name="T_DINT" size="4" swapsize="4" typeclass="DInt" iecname="DINT" />
     <TypeSimple name="T_INT" size="2" swapsize="2" typeclass="Int" iecname="INT" />
     <TypeSimple name="T_REAL" size="4" swapsize="4" typeclass="Real" iecname="REAL" />
-    <TypeSimple name="T_STRING" size="81" swapsize="0" typeclass="String" iecname="STRING" />
     <TypeSimple name="T_TIME" size="4" swapsize="4" typeclass="Time" iecname="TIME" />
     <TypeSimple name="T_UDINT" size="4" swapsize="4" typeclass="UDInt" iecname="UDINT" />
     <TypeSimple name="T_UINT" size="2" swapsize="2" typeclass="UInt" iecname="UINT" />
     <TypeUserDef name="T_atMbClientTCP" size="0" nativesize="469880" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbClientTCP" basetype="T_atMbClient" />
-    <TypeArray name="T_ARRAY__0__15__OF_UINT" size="32" nativesize="32" typeclass="Array" iecname="ARRAY [0..15] OF UINT" basetype="T_UINT">
-      <ArrayDim minrange="0" maxrange="15" />
-    </TypeArray>
     <TypeArray name="T_ARRAY__0__3__OF_BYTE" size="4" nativesize="4" typeclass="Array" iecname="ARRAY [0..3] OF BYTE" basetype="T_BYTE">
       <ArrayDim minrange="0" maxrange="3" />
     </TypeArray>
-    <TypeArray name="T_ARRAY__0__7__OF_BOOL" size="8" nativesize="8" typeclass="Array" iecname="ARRAY [0..7] OF BOOL" basetype="T_BOOL">
-      <ArrayDim minrange="0" maxrange="7" />
-    </TypeArray>
     <TypeArray name="T_ARRAY__0__7__OF_DINT" size="32" nativesize="32" typeclass="Array" iecname="ARRAY [0..7] OF DINT" basetype="T_DINT">
       <ArrayDim minrange="0" maxrange="7" />
     </TypeArray>
     <TypeSimple name="T_POINTER_TO_atBTXXXX" size="8" swapsize="8" typeclass="Pointer" iecname="POINTER TO atBTXXXX" />
-    <TypeSimple name="T_POINTER_TO_atDQ" size="8" swapsize="8" typeclass="Pointer" iecname="POINTER TO atDQ" />
-    <TypeSimple name="T_POINTER_TO_atDi" size="8" swapsize="8" typeclass="Pointer" iecname="POINTER TO atDi" />
-    <TypeSimple name="T_POINTER_TO_atHSC" size="8" swapsize="8" typeclass="Pointer" iecname="POINTER TO atHSC" />
     <TypeSimple name="T_REFERENCE_TO_BOOL_REF" size="1" swapsize="0" typeclass="Reference" iecname="REFERENCE TO BOOL_REF" basetype="T_BOOL" />
     <TypeUserDef name="T_atAlarm" size="13" nativesize="2672" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atAlarm">
       <UserDefElement iecname="in_en" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
@@ -83,6 +74,20 @@
       <UserDefElement iecname="in_procDelOff" type="T_TIME" byteoffset="24" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="out" type="T_BOOL" byteoffset="28" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
+    <TypeUserDef name="T_atSStStatusCode" size="2" nativesize="2" swapsize="2" typeclass="Enum" iecname="atSStStatusCode" basetype="T_INT">
+      <UserDefElement type="T_atSStStatusCode" iecname="noAlm" enumvalue="0" />
+      <UserDefElement type="T_atSStStatusCode" iecname="starting" enumvalue="1" />
+      <UserDefElement type="T_atSStStatusCode" iecname="fireMode" enumvalue="2" />
+      <UserDefElement type="T_atSStStatusCode" iecname="limitStart" enumvalue="3" />
+      <UserDefElement type="T_atSStStatusCode" iecname="limitStop" enumvalue="4" />
+      <UserDefElement type="T_atSStStatusCode" iecname="stopping" enumvalue="5" />
+      <UserDefElement type="T_atSStStatusCode" iecname="running" enumvalue="6" />
+      <UserDefElement type="T_atSStStatusCode" iecname="ready" enumvalue="7" />
+      <UserDefElement type="T_atSStStatusCode" iecname="tripped" enumvalue="8" />
+      <UserDefElement type="T_atSStStatusCode" iecname="disabled" enumvalue="9" />
+      <UserDefElement type="T_atSStStatusCode" iecname="initialization" enumvalue="10" />
+      <UserDefElement type="T_atSStStatusCode" iecname="unknown" enumvalue="11" />
+    </TypeUserDef>
     <TypeUserDef name="T_atScaling" size="4" nativesize="1152" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atScaling">
       <UserDefElement iecname="out_eu" type="T_REAL" byteoffset="0" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
@@ -99,6 +104,33 @@
       <UserDefElement iecname="in_startDly" type="T_TIME" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_stopDly" type="T_TIME" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
+    <TypeUserDef name="T_atTrkPumpCtl" size="22" nativesize="1536" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atTrkPumpCtl">
+      <UserDefElement iecname="in_fillMultiplierSP" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_fillOffsetSP" type="T_REAL" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_revOnTmrSP" type="T_DINT" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_valveTmrSP" type="T_DINT" byteoffset="12" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_fillAmount" type="T_INT" byteoffset="16" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_start" type="T_BOOL" byteoffset="18" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_stop" type="T_BOOL" byteoffset="19" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_fillRem" type="T_INT" byteoffset="20" vartype="VAR_OUTPUT" access="ReadWrite" />
+    </TypeUserDef>
+    <TypeUserDef name="T_atVFDFaultCode" size="2" nativesize="2" swapsize="2" typeclass="Enum" iecname="atVFDFaultCode" basetype="T_INT">
+      <UserDefElement type="T_atVFDFaultCode" iecname="noAlm" enumvalue="0" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="commFlt" enumvalue="1" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="internalFlt" enumvalue="2" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="externalFlt" enumvalue="3" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="mtrOvld" enumvalue="4" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="invOvld" enumvalue="5" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="underVolt" enumvalue="6" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="overVolt" enumvalue="7" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="overCur" enumvalue="8" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="gndFlt" enumvalue="9" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="powerLoss" enumvalue="10" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="outPhaseLoss" enumvalue="11" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="overHeat" enumvalue="12" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="localCtl" enumvalue="13" />
+      <UserDefElement type="T_atVFDFaultCode" iecname="unknown" enumvalue="99" />
+    </TypeUserDef>
     <TypeUserDef name="T_atWellHistoryItem" size="12" nativesize="12" typeclass="Userdef" pouclass="STRUCTURE" iecname="atWellHistoryItem">
       <UserDefElement iecname="rt" type="T_DINT" byteoffset="0" vartype="VAR" access="ReadWrite" />
       <UserDefElement iecname="vol" type="T_DINT" byteoffset="4" vartype="VAR" access="ReadWrite" />
@@ -120,15 +152,6 @@
     <TypeArray name="T_ARRAY__0__2__OF_POINTER_TO_atBTXXXX" size="24" nativesize="24" typeclass="Array" iecname="ARRAY [0..2] OF POINTER TO atBTXXXX" basetype="T_POINTER_TO_atBTXXXX">
       <ArrayDim minrange="0" maxrange="2" />
     </TypeArray>
-    <TypeArray name="T_ARRAY__0__7__OF_POINTER_TO_atDQ" size="64" nativesize="64" typeclass="Array" iecname="ARRAY [0..7] OF POINTER TO atDQ" basetype="T_POINTER_TO_atDQ">
-      <ArrayDim minrange="0" maxrange="7" />
-    </TypeArray>
-    <TypeArray name="T_ARRAY__0__7__OF_POINTER_TO_atDi" size="64" nativesize="64" typeclass="Array" iecname="ARRAY [0..7] OF POINTER TO atDi" basetype="T_POINTER_TO_atDi">
-      <ArrayDim minrange="0" maxrange="7" />
-    </TypeArray>
-    <TypeArray name="T_ARRAY__0__7__OF_POINTER_TO_atHSC" size="64" nativesize="64" typeclass="Array" iecname="ARRAY [0..7] OF POINTER TO atHSC" basetype="T_POINTER_TO_atHSC">
-      <ArrayDim minrange="0" maxrange="7" />
-    </TypeArray>
     <TypeSimple name="T_REFERENCE_TO_atHSC_REF" size="24" swapsize="0" typeclass="Reference" iecname="REFERENCE TO atHSC_REF" basetype="T_atHSC" />
     <TypeUserDef name="T_atAiFault" size="56" nativesize="9072" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atAiFault">
       <UserDefElement iecname="under" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
@@ -170,24 +193,28 @@
       <UserDefElement iecname="alm" type="T_atAlarm" byteoffset="32" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
     <TypeSimple name="T_REFERENCE_TO_atDevice_REF" size="28" swapsize="0" typeclass="Reference" iecname="REFERENCE TO atDevice_REF" basetype="T_atDevice" />
+    <TypeUserDef name="T_atBT124F" size="13" nativesize="19648" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT124F" basetype="T_atBTXXXX">
+      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atBTXXXX" access="ReadWrite" />
+    </TypeUserDef>
+    <TypeUserDef name="T_atBT222F" size="13" nativesize="12240" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT222F" basetype="T_atBTXXXX">
+      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atBTXXXX" access="ReadWrite" />
+    </TypeUserDef>
     <TypeUserDef name="T_atBT3238" size="13" nativesize="12184" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT3238" basetype="T_atBTXXXX">
       <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atBTXXXX" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atBT623F" size="350" nativesize="26792" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT623F" basetype="T_atBTXXXX">
+    <TypeUserDef name="T_atBT623F" size="16" nativesize="26792" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atBT623F" basetype="T_atBTXXXX">
       <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atBTXXXX" access="ReadWrite" />
-      <UserDefElement iecname="di" type="T_ARRAY__0__7__OF_POINTER_TO_atDi" byteoffset="16" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="counter" type="T_ARRAY__0__7__OF_POINTER_TO_atHSC" byteoffset="80" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="dq" type="T_ARRAY__0__7__OF_POINTER_TO_atDQ" byteoffset="144" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="in_name" type="T_STRING" byteoffset="208" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="dataDI" type="T_ARRAY__0__7__OF_BOOL" byteoffset="289" vartype="VAR" access="ReadWrite" />
-      <UserDefElement iecname="dataDQ" type="T_ARRAY__0__7__OF_BOOL" byteoffset="297" vartype="VAR" access="ReadWrite" />
-      <UserDefElement iecname="dataCounter" type="T_ARRAY__0__15__OF_UINT" byteoffset="306" vartype="VAR" access="ReadWrite" />
-      <UserDefElement iecname="diStartAddr" type="T_UINT" byteoffset="338" vartype="VAR" access="ReadWrite" />
-      <UserDefElement iecname="diEndAddr" type="T_UINT" byteoffset="340" vartype="VAR" access="ReadWrite" />
-      <UserDefElement iecname="cntStartAddr" type="T_UINT" byteoffset="342" vartype="VAR" access="ReadWrite" />
-      <UserDefElement iecname="cntEndAddr" type="T_UINT" byteoffset="344" vartype="VAR" access="ReadWrite" />
-      <UserDefElement iecname="dqStartAddr" type="T_UINT" byteoffset="346" vartype="VAR" access="ReadWrite" />
-      <UserDefElement iecname="dqCount" type="T_UINT" byteoffset="348" vartype="VAR" access="ReadWrite" />
+      <UserDefElement iecname="diStartAddr" type="T_UINT" byteoffset="14" vartype="VAR" access="ReadWrite" />
+    </TypeUserDef>
+    <TypeUserDef name="T_atGadget" size="32" nativesize="7080" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atGadget" basetype="T_atDevice">
+      <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="12" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_run" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_status" type="T_atDeviceStatus" byteoffset="14" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_autoMode" type="T_BOOL" byteoffset="16" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_runTime" type="T_DINT" byteoffset="20" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_tss" type="T_DINT" byteoffset="24" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_manOnMaxSP" type="T_TIME" byteoffset="28" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
     <TypeUserDef name="T_atLimits" size="189" nativesize="20432" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atLimits">
       <UserDefElement iecname="hihi" type="T_atLimit" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
@@ -223,7 +250,100 @@
       <UserDefElement iecname="in_filterTim" type="T_DINT" byteoffset="288" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="out_eu" type="T_REAL" byteoffset="292" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
+    <TypeUserDef name="T_atVFD" size="108" nativesize="12064" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atVFD" basetype="T_atGadget">
+      <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="12" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_run" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_status" type="T_atDeviceStatus" byteoffset="14" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_autoMode" type="T_BOOL" byteoffset="16" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_runTime" type="T_DINT" byteoffset="20" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_tss" type="T_DINT" byteoffset="24" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_manOnMaxSP" type="T_TIME" byteoffset="28" vartype="VAR_INPUT" inherited_from="T_atGadget" access="ReadWrite" />
+      <UserDefElement iecname="in_manFwd" type="T_BOOL" byteoffset="32" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_manRev" type="T_BOOL" byteoffset="33" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_manStop" type="T_BOOL" byteoffset="34" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_manSpeedRef" type="T_REAL" byteoffset="36" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_hzMin" type="T_REAL" byteoffset="40" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_hzMax" type="T_REAL" byteoffset="44" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_autoFixedRef" type="T_REAL" byteoffset="48" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_autoFixedEn" type="T_BOOL" byteoffset="52" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmdHz" type="T_REAL" byteoffset="56" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmd" type="T_REAL" byteoffset="60" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_speedActHz" type="T_REAL" byteoffset="64" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_speedAct" type="T_REAL" byteoffset="68" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_current" type="T_REAL" byteoffset="72" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_voltage" type="T_REAL" byteoffset="76" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_dcBus" type="T_REAL" byteoffset="80" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_fwdCmd" type="T_BOOL" byteoffset="84" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_revCmd" type="T_BOOL" byteoffset="85" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId" type="T_atVFDFaultCode" byteoffset="86" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId_last" type="T_atVFDFaultCode" byteoffset="88" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="92" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="out_statusID" type="T_atSStStatusCode" byteoffset="106" vartype="VAR_OUTPUT" access="ReadWrite" />
+    </TypeUserDef>
     <TypeSimple name="T_REFERENCE_TO_atAI_REF" size="296" swapsize="0" typeclass="Reference" iecname="REFERENCE TO atAI_REF" basetype="T_atAI" />
+    <TypeUserDef name="T_atVFDModbus" size="108" nativesize="13112" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atVFDModbus" basetype="T_atVFD">
+      <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="12" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_run" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_status" type="T_atDeviceStatus" byteoffset="14" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_autoMode" type="T_BOOL" byteoffset="16" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_runTime" type="T_DINT" byteoffset="20" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_tss" type="T_DINT" byteoffset="24" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_manOnMaxSP" type="T_TIME" byteoffset="28" vartype="VAR_INPUT" inherited_from="T_atGadget" access="ReadWrite" />
+      <UserDefElement iecname="in_manFwd" type="T_BOOL" byteoffset="32" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_manRev" type="T_BOOL" byteoffset="33" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_manStop" type="T_BOOL" byteoffset="34" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_manSpeedRef" type="T_REAL" byteoffset="36" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_hzMin" type="T_REAL" byteoffset="40" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_hzMax" type="T_REAL" byteoffset="44" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_autoFixedRef" type="T_REAL" byteoffset="48" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_autoFixedEn" type="T_BOOL" byteoffset="52" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmdHz" type="T_REAL" byteoffset="56" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmd" type="T_REAL" byteoffset="60" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedActHz" type="T_REAL" byteoffset="64" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedAct" type="T_REAL" byteoffset="68" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_current" type="T_REAL" byteoffset="72" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_voltage" type="T_REAL" byteoffset="76" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_dcBus" type="T_REAL" byteoffset="80" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_fwdCmd" type="T_BOOL" byteoffset="84" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_revCmd" type="T_BOOL" byteoffset="85" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId" type="T_atVFDFaultCode" byteoffset="86" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId_last" type="T_atVFDFaultCode" byteoffset="88" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="92" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_statusID" type="T_atSStStatusCode" byteoffset="106" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+    </TypeUserDef>
+    <TypeUserDef name="T_atVFDGS20" size="108" nativesize="28632" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atVFDGS20" basetype="T_atVFDModbus">
+      <UserDefElement iecname="seq" type="T_atSeqCtl" byteoffset="0" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_pause" type="T_BOOL" byteoffset="12" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_run" type="T_BOOL" byteoffset="13" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_status" type="T_atDeviceStatus" byteoffset="14" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_autoMode" type="T_BOOL" byteoffset="16" vartype="VAR_INPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_runTime" type="T_DINT" byteoffset="20" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="out_tss" type="T_DINT" byteoffset="24" vartype="VAR_OUTPUT" inherited_from="T_atDevice" access="ReadWrite" />
+      <UserDefElement iecname="in_manOnMaxSP" type="T_TIME" byteoffset="28" vartype="VAR_INPUT" inherited_from="T_atGadget" access="ReadWrite" />
+      <UserDefElement iecname="in_manFwd" type="T_BOOL" byteoffset="32" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_manRev" type="T_BOOL" byteoffset="33" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_manStop" type="T_BOOL" byteoffset="34" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_manSpeedRef" type="T_REAL" byteoffset="36" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_hzMin" type="T_REAL" byteoffset="40" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_hzMax" type="T_REAL" byteoffset="44" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_autoFixedRef" type="T_REAL" byteoffset="48" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="in_autoFixedEn" type="T_BOOL" byteoffset="52" vartype="VAR_INPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmdHz" type="T_REAL" byteoffset="56" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedCmd" type="T_REAL" byteoffset="60" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedActHz" type="T_REAL" byteoffset="64" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_speedAct" type="T_REAL" byteoffset="68" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_current" type="T_REAL" byteoffset="72" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_voltage" type="T_REAL" byteoffset="76" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_dcBus" type="T_REAL" byteoffset="80" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_fwdCmd" type="T_BOOL" byteoffset="84" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_revCmd" type="T_BOOL" byteoffset="85" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId" type="T_atVFDFaultCode" byteoffset="86" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_faultVFDId_last" type="T_atVFDFaultCode" byteoffset="88" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="fault" type="T_atAlarm" byteoffset="92" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+      <UserDefElement iecname="out_statusID" type="T_atSStStatusCode" byteoffset="106" vartype="VAR_OUTPUT" inherited_from="T_atVFD" access="ReadWrite" />
+    </TypeUserDef>
     <TypeUserDef name="T_atWell" size="1100" nativesize="33360" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atWell">
       <UserDefElement iecname="in_runStatFromFlowSP" type="T_REAL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="in_demandPerc" type="T_REAL" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
@@ -251,10 +371,22 @@
       <Node name="g">
         <Node name="bs1_cd1" type="T_atBT3238" access="ReadWrite" />
         <Node name="bs1_cd2" type="T_atBT623F" access="ReadWrite" />
+        <Node name="bs4_cd1" type="T_atBT124F" access="ReadWrite" />
+        <Node name="bs4_cd2" type="T_atBT222F" access="ReadWrite" />
+        <Node name="bs4_cd3" type="T_atBT3238" access="ReadWrite" />
         <Node name="cysLevel" type="T_atAI" access="ReadWrite" />
         <Node name="cysNoPress" type="T_atDI" access="ReadWrite" />
         <Node name="cysPress" type="T_atAI" access="ReadWrite" />
         <Node name="IOBase_1" type="T_atOdotB32" access="ReadWrite" />
+        <Node name="IOBase_4" type="T_atOdotB64" access="ReadWrite" />
+        <Node name="trkLdctl1" type="T_atTrkPumpCtl" access="ReadWrite" />
+        <Node name="trkLdctl2" type="T_atTrkPumpCtl" access="ReadWrite" />
+        <Node name="trkLdVFD1" type="T_atVFDGS20" access="ReadWrite" />
+        <Node name="trkLdVFD2" type="T_atVFDGS20" access="ReadWrite" />
+        <Node name="vlv1" type="T_atDQ" access="ReadWrite" />
+        <Node name="vlv1ManOpen" type="T_BOOL" access="ReadWrite" />
+        <Node name="vlv2" type="T_atDQ" access="ReadWrite" />
+        <Node name="vlv2ManOpen" type="T_BOOL" access="ReadWrite" />
         <Node name="well4" type="T_atWell" access="ReadWrite" />
         <Node name="well4_IOBase" type="T_atOdotB32" access="ReadWrite" />
         <Node name="well4IO_cd1" type="T_atBT3238" access="ReadWrite" />
diff --git a/rbf_water.project b/rbf_water.project
index adcb72f..11c6f9a 100644
--- a/rbf_water.project
+++ b/rbf_water.project
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9a8092c5b3d710b368171077bedc51810bc0a10b2d5b5fe15481338c8def709
-size 5565011
+oid sha256:09a8190ed73d04a49c18385d69f5808a5bb8495281f0fc027681d345ea9417ec
+size 5820786
diff --git a/rbf_water_project.precompilecache b/rbf_water_project.precompilecache
index f05a9d9..e4a75cf 100644
--- a/rbf_water_project.precompilecache
+++ b/rbf_water_project.precompilecache
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17b474b78799b159055e94f3bf224ae05051d1bddd1c26305a7d4362e0034b73
-size 991431
+oid sha256:4a8f38eb11635a1d9703d6aaf4a7f001b9c8382ef955e20c30255e5c3b0be943
+size 1036852