From c30f4b96c8c483c55a6da55f3c47581c44bc334a Mon Sep 17 00:00:00 2001
From: carlos <carlos@atom.ca>
Date: Wed, 4 Mar 2026 07:04:31 -0700
Subject: [PATCH] Pulled in modbus lib

---
 ...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                 |  93 ++++++++++++++++--
 rbf_water.project                             |   4 +-
 rbf_water_project.precompilecache             |   4 +-
 6 files changed, 91 insertions(+), 18 deletions(-)

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 4fa0216..59c3d8b 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:116ac83d652713694c96fce03b73ad62dc8af774cb0d3b40c08c91656dc6107f
-size 9521543
+oid sha256:0caa31ce7431c394701c5253e3b1fb59309ea337bc343e2e1af10c4bee6bc040
+size 9689381
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 00913930014e898b912dbb6241d16d75669d1336..67aeb4a32a95fd89f7c1d71b3ec318ca88b6c2fd 100644
GIT binary patch
literal 32
UcmXq42|2@n1Pod-qLH`^06|*<^8f$<

literal 32
VcmXr$3Vp(W1WXUkJdVU=003LK1WEt^

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 4fa0216..59c3d8b 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:116ac83d652713694c96fce03b73ad62dc8af774cb0d3b40c08c91656dc6107f
-size 9521543
+oid sha256:0caa31ce7431c394701c5253e3b1fb59309ea337bc343e2e1af10c4bee6bc040
+size 9689381
diff --git a/rbf_water.Device.RBFWater.xml b/rbf_water.Device.RBFWater.xml
index 37e5400..d631dfb 100644
--- a/rbf_water.Device.RBFWater.xml
+++ b/rbf_water.Device.RBFWater.xml
@@ -6,24 +6,49 @@
     <ProjectInfo name="rbf_water" devicename="Device" appname="RBFWater" />
   </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" />
+    <TypeUserDef name="T_atOdotB64" size="0" nativesize="9472" 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_20_" size="21" swapsize="0" typeclass="String" iecname="STRING(20)" />
     <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__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_DINT" size="32" nativesize="32" typeclass="Array" iecname="ARRAY [0..7] OF DINT" basetype="T_DINT">
       <ArrayDim minrange="0" maxrange="7" />
     </TypeArray>
+    <TypeUserDef name="T_Error" size="2" nativesize="2" swapsize="2" typeclass="Enum" iecname="Error" basetype="T_INT">
+      <UserDefElement type="T_Error" iecname="OK" enumvalue="0" />
+      <UserDefElement type="T_Error" iecname="LicenseMissing" enumvalue="1" />
+      <UserDefElement type="T_Error" iecname="InvalidDataModel" enumvalue="2" />
+      <UserDefElement type="T_Error" iecname="IllegalFunction" enumvalue="3" />
+      <UserDefElement type="T_Error" iecname="InvalidUnitId" enumvalue="4" />
+      <UserDefElement type="T_Error" iecname="NoMemory" enumvalue="21" />
+      <UserDefElement type="T_Error" iecname="InternalError" enumvalue="22" />
+      <UserDefElement type="T_Error" iecname="RequestNotProcessed" enumvalue="50" />
+      <UserDefElement type="T_Error" iecname="RequestException" enumvalue="51" />
+      <UserDefElement type="T_Error" iecname="RequestParameterError" enumvalue="52" />
+      <UserDefElement type="T_Error" iecname="RequestError" enumvalue="53" />
+      <UserDefElement type="T_Error" iecname="RequestCancelled" enumvalue="54" />
+      <UserDefElement type="T_Error" iecname="ReplyError" enumvalue="55" />
+      <UserDefElement type="T_Error" iecname="ReplyTimeout" enumvalue="56" />
+      <UserDefElement type="T_Error" iecname="InvalidReply" enumvalue="57" />
+      <UserDefElement type="T_Error" iecname="TcpSocketError" enumvalue="101" />
+      <UserDefElement type="T_Error" iecname="TcpInvalidInterface" enumvalue="102" />
+      <UserDefElement type="T_Error" iecname="TcpConnectTimeout" enumvalue="103" />
+      <UserDefElement type="T_Error" iecname="SerialInvalidComPort" enumvalue="201" />
+      <UserDefElement type="T_Error" iecname="SerialComPortUserInconsistentPortSetting" enumvalue="202" />
+      <UserDefElement type="T_Error" iecname="SerialComPortUserClientExclusiveError" enumvalue="203" />
+      <UserDefElement type="T_Error" iecname="SerialComPortError" enumvalue="204" />
+      <UserDefElement type="T_Error" iecname="SerialInternalError" enumvalue="205" />
+    </TypeUserDef>
     <TypeSimple name="T_POINTER_TO_atBTXXXX" size="8" swapsize="8" typeclass="Pointer" iecname="POINTER TO atBTXXXX" />
+    <TypeSimple name="T_POINTER_TO_atMbRequestStats" size="8" swapsize="8" typeclass="Pointer" iecname="POINTER TO atMbRequestStats" />
     <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" />
@@ -74,6 +99,19 @@
       <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_atMBExceptionCodes" size="2" nativesize="2" swapsize="2" typeclass="Enum" iecname="atMBExceptionCodes" basetype="T_INT">
+      <UserDefElement type="T_atMBExceptionCodes" iecname="TIMEOUT" enumvalue="-1" />
+      <UserDefElement type="T_atMBExceptionCodes" iecname="RESPONSE_SUCCESS" enumvalue="0" />
+      <UserDefElement type="T_atMBExceptionCodes" iecname="ILLEGAL_FUNCTION" enumvalue="1" />
+      <UserDefElement type="T_atMBExceptionCodes" iecname="ILLEGAL_DATA_ADDRESS" enumvalue="2" />
+      <UserDefElement type="T_atMBExceptionCodes" iecname="ILLEGAL_DATA_VALUE" enumvalue="3" />
+      <UserDefElement type="T_atMBExceptionCodes" iecname="SLAVE_DEVICE_FAILURE" enumvalue="4" />
+      <UserDefElement type="T_atMBExceptionCodes" iecname="ACKNOWLEDGE" enumvalue="5" />
+      <UserDefElement type="T_atMBExceptionCodes" iecname="SLAVE_DEVICE_BUSY" enumvalue="6" />
+      <UserDefElement type="T_atMBExceptionCodes" iecname="MEMORY_PARITY_ERROR" enumvalue="8" />
+      <UserDefElement type="T_atMBExceptionCodes" iecname="GATEWAY_PATH_UNAVAILABLE" enumvalue="10" />
+      <UserDefElement type="T_atMBExceptionCodes" iecname="GATEWAY_TARGET_DEVICE_FAILED_TO_RESPOND" enumvalue="11" />
+    </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" />
@@ -152,6 +190,9 @@
     <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__99__OF_POINTER_TO_atMbRequestStats" size="800" nativesize="800" typeclass="Array" iecname="ARRAY [0..99] OF POINTER TO atMbRequestStats" basetype="T_POINTER_TO_atMbRequestStats">
+      <ArrayDim minrange="0" maxrange="99" />
+    </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" />
@@ -192,6 +233,32 @@
       <UserDefElement iecname="out" type="T_BOOL" byteoffset="28" vartype="VAR_OUTPUT" inherited_from="T_atLimitBase" access="ReadWrite" />
       <UserDefElement iecname="alm" type="T_atAlarm" byteoffset="32" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
+    <TypeUserDef name="T_atMbRequestStats" size="81" nativesize="4624" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbRequestStats">
+      <UserDefElement iecname="reqDone" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="reqBusy" type="T_BOOL" byteoffset="1" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="reqError" type="T_BOOL" byteoffset="2" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="lastErrorId" type="T_Error" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="lastExceptionCode" type="T_atMBExceptionCodes" byteoffset="6" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="lastValidDuration" type="T_UDINT" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="longestValidDuration" type="T_UDINT" byteoffset="12" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="interval" type="T_UDINT" byteoffset="16" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="offlineCnt" type="T_UINT" byteoffset="20" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="doneCnt" type="T_UDINT" byteoffset="24" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="errorCnt" type="T_UDINT" byteoffset="28" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="doneCntRst" type="T_UDINT" byteoffset="32" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="errorCntRst" type="T_UDINT" byteoffset="36" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="sinceLastExec" type="T_UDINT" byteoffset="40" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="execute" type="T_BOOL" byteoffset="44" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="timeoutCnt" type="T_UDINT" byteoffset="48" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="reqLength" type="T_UINT" byteoffset="52" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="executeLight" type="T_BOOL" byteoffset="54" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="reqDoneLight" type="T_BOOL" byteoffset="55" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="reqErrorLight" type="T_BOOL" byteoffset="56" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="reqBusyLight" type="T_BOOL" byteoffset="57" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="online" type="T_BOOL" byteoffset="58" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="active" type="T_BOOL" byteoffset="59" vartype="VAR_OUTPUT" access="ReadWrite" />
+      <UserDefElement iecname="toString" type="T_STRING_20_" byteoffset="60" vartype="VAR" 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" />
@@ -222,13 +289,8 @@
       <UserDefElement iecname="lo" type="T_atLimit" byteoffset="96" vartype="VAR_INPUT" access="ReadWrite" />
       <UserDefElement iecname="lolo" type="T_atLimit" byteoffset="144" vartype="VAR_INPUT" access="ReadWrite" />
     </TypeUserDef>
-    <TypeUserDef name="T_atOdotB32" size="34" nativesize="470976" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atOdotB32">
-      <UserDefElement iecname="in_timeout" type="T_TIME" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="in_ipAddress" type="T_ARRAY__0__3__OF_BYTE" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="cards" type="T_ARRAY__0__2__OF_POINTER_TO_atBTXXXX" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
-      <UserDefElement iecname="in_reset" type="T_BOOL" byteoffset="32" vartype="VAR_IN_OUT" access="ReadWrite" />
-      <UserDefElement iecname="in_simEn" type="T_BOOL" byteoffset="33" vartype="VAR_IN_OUT" access="ReadWrite" />
-      <UserDefElement iecname="client" type="T_atMbClientTCP" byteoffset="34" vartype="VAR" access="ReadWrite" />
+    <TypeUserDef name="T_atMbClient" size="800" nativesize="4072" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbClient">
+      <UserDefElement iecname="reqStats" type="T_ARRAY__0__99__OF_POINTER_TO_atMbRequestStats" byteoffset="0" vartype="VAR_OUTPUT" access="ReadWrite" />
     </TypeUserDef>
     <TypeUserDef name="T_atWellHistory" size="348" nativesize="2608" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atWellHistory">
       <UserDefElement iecname="in_runStat" type="T_BOOL" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
@@ -250,6 +312,9 @@
       <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_atMbClientTCP" size="800" nativesize="8280" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atMbClientTCP" basetype="T_atMbClient">
+      <UserDefElement iecname="reqStats" type="T_ARRAY__0__99__OF_POINTER_TO_atMbRequestStats" byteoffset="0" vartype="VAR_OUTPUT" inherited_from="T_atMbClient" 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" />
@@ -282,6 +347,14 @@
       <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_atOdotB32" size="840" nativesize="9376" typeclass="Userdef" pouclass="FUNCTION_BLOCK" iecname="atOdotB32">
+      <UserDefElement iecname="in_timeout" type="T_TIME" byteoffset="0" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_ipAddress" type="T_ARRAY__0__3__OF_BYTE" byteoffset="4" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="cards" type="T_ARRAY__0__2__OF_POINTER_TO_atBTXXXX" byteoffset="8" vartype="VAR_INPUT" access="ReadWrite" />
+      <UserDefElement iecname="in_reset" type="T_BOOL" byteoffset="32" vartype="VAR_IN_OUT" access="ReadWrite" />
+      <UserDefElement iecname="in_simEn" type="T_BOOL" byteoffset="33" vartype="VAR_IN_OUT" access="ReadWrite" />
+      <UserDefElement iecname="client" type="T_atMbClientTCP" byteoffset="40" vartype="VAR" access="ReadWrite" />
+    </TypeUserDef>
     <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" />
diff --git a/rbf_water.project b/rbf_water.project
index 11c6f9a..4585e0f 100644
--- a/rbf_water.project
+++ b/rbf_water.project
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09a8190ed73d04a49c18385d69f5808a5bb8495281f0fc027681d345ea9417ec
-size 5820786
+oid sha256:20d9a23023bd268591cec419385611e65ce774210a101b6ac9a3065402f28d73
+size 5836235
diff --git a/rbf_water_project.precompilecache b/rbf_water_project.precompilecache
index e4a75cf..5c098ee 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:4a8f38eb11635a1d9703d6aaf4a7f001b9c8382ef955e20c30255e5c3b0be943
-size 1036852
+oid sha256:7cd7e3b71494f157f2161266556e7f8fc1be370d864527f0d3743ba5d28bb95f
+size 1038745