Merge pull request #2 from rfporter/Transaction-ID-Fix

v1.3.2
rfporter · Jul 9, 2018 · 6aab190 · 6aab190
2 parents fda3bac + 1f2c9cd
commit 6aab190
Show file tree

Hide file tree

Showing 58 changed files with 281 additions and 147 deletions.
diff --git a/Documentation/ReadMe.txt b/Documentation/ReadMe.txt
@@ -1,4 +1,4 @@
-Plasmionique Modbus Master v1.3.1
+Plasmionique Modbus Master v1.3.2
 
 Copyright � 2016, Plasmionique Inc.
 All rights reserved.
@@ -46,7 +46,6 @@ Documentation:
 "<LabVIEW>\help\Plasmionique\MB_Master - User Guide.pdf"
 
 Known Issues:
-- Modbus TCP mode does not make use of Transaction ID. Transaction ID is expected to be 1 for all transactions.
 - Only MEI type 14 is properly supported in RTU mode.
 
 Acknowledgements:
@@ -81,6 +80,9 @@ v1.2.1: Re-worked VISA locking behavior for MB_Master_Serial
 v1.3.1: Re-Added accessor for VISA resource. Some might find this useful for dealing with certain USB to serial adapters.
 	Added Modbus Comm Tester to tools menu.
 	Added MB VISA lock functions to palette.
+v1.3.2: Added support for transaction IDs to TCP mode.
+	ADU contains PDU request and PDU response, which are available via property nodes.
+	Added device ID objects to Modbus Comm Tester
 
 License:
 Distributed under the BSD 2-Clause (http://opensource.org/licenses/BSD-2-Clause)

diff --git a/Examples/MB_Master Comm Tester.vi b/Examples/MB_Master Comm Tester.vi
diff --git a/MB Master.aliases b/MB Master.aliases
@@ -1,3 +1,3 @@
 [My Computer]
-My Computer = "127.0.0.1"
+My Computer = "192.168.8.168"
 
diff --git a/MB Master.lvlps b/MB Master.lvlps
@@ -1,3 +1,6 @@
+[ProjectWindow_Data]
+ProjectExplorer.ClassicPosition[String] = "186,931,932,1738"
+
 [AB_Cache_{33FBB182-B4EC-40E3-8491-5D5665F5BBE9}]
 Cache_Path[Path] Line0001 = "/C/Users/porter/AppData/Local/Temp/AB_Cache_{33FBB"
 Cache_Path[Path] Line0002 = "182-B4EC-40E3-8491-5D5665F5BBE9}.txt"
@@ -6,6 +9,3 @@ Cache_Path[Path] Line0002 = "182-B4EC-40E3-8491-5D5665F5BBE9}.txt"
 Cache_Path[Path] Line0001 = "/C/Users/porter/AppData/Local/Temp/AB_Cache_{CA7CA"
 Cache_Path[Path] Line0002 = "EBA-20D5-4ABE-9A00-7FE38DF00416}.txt"
 
-[ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "75,394,702,1014"
-
diff --git a/MB Master.lvproj b/MB Master.lvproj
@@ -24,6 +24,7 @@
 		</Item>
 		<Item Name="Tools" Type="Folder">
 			<Item Name="Modbus Comm Tester.vi" Type="VI" URL="../Tools/Modbus Comm Tester.vi"/>
+			<Item Name="Transaction ID Test.vi" Type="VI" URL="../Tools/Transaction ID Test.vi"/>
 		</Item>
 		<Item Name="MB Master.lvlib" Type="Library" URL="../MB Master.lvlib"/>
 		<Item Name="MB Master.vipb" Type="Document" URL="../MB Master.vipb"/>
@@ -35,6 +36,36 @@
 				<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
 				<Item Name="Find First Error.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Find First Error.vi"/>
 				<Item Name="Open Acrobat Document.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/browser.llb/Open Acrobat Document.vi"/>
+				<Item Name="Serial Data Unit.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Transmission Data Unit/Serial Interface/Serial Data Unit.lvclass"/>
+				<Item Name="Transmission Data Unit.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Transmission Data Unit/Transmission Data Unit.lvclass"/>
+				<Item Name="Serial Master.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Network Protocol/Network Master/Serial/Serial Master.lvclass"/>
+				<Item Name="Network Master.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Network Protocol/Network Master/Network Master.lvclass"/>
+				<Item Name="Network Protocol.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Network Protocol/Network Protocol.lvclass"/>
+				<Item Name="Modbus Data Unit.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Modbus Data Unit/Modbus Data Unit.lvclass"/>
+				<Item Name="VISA Flush IO Buffer Mask.ctl" Type="VI" URL="/&lt;vilib&gt;/Instr/_visa.llb/VISA Flush IO Buffer Mask.ctl"/>
+				<Item Name="Serial Shared Components.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/Modbus Library/Serial Shared Components/Serial Shared Components.lvlib"/>
+				<Item Name="Modbus API.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/API/Modbus API.lvclass"/>
+				<Item Name="Device Data Model.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Data Model/Device Data Model.lvclass"/>
+				<Item Name="Master Function Definition.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Master Function Definition/Master Function Definition.lvclass"/>
+				<Item Name="Modbus Master.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/API/Master/Modbus Master.lvclass"/>
+				<Item Name="Bits to Bytes.vi" Type="VI" URL="/&lt;vilib&gt;/NI/Modbus Library/Utility/Bits to Bytes.vi"/>
+				<Item Name="U16s to Bytes.vi" Type="VI" URL="/&lt;vilib&gt;/NI/Modbus Library/Utility/U16s to Bytes.vi"/>
+				<Item Name="Bytes to Bits.vi" Type="VI" URL="/&lt;vilib&gt;/NI/Modbus Library/Utility/Bytes to Bits.vi"/>
+				<Item Name="Bytes to U16s.vi" Type="VI" URL="/&lt;vilib&gt;/NI/Modbus Library/Utility/Bytes to U16s.vi"/>
+				<Item Name="RTU Data Unit.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Transmission Data Unit/RTU/RTU Data Unit.lvclass"/>
+				<Item Name="Serial Slave.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Network Protocol/Network Slave/Serial/Serial Slave.lvclass"/>
+				<Item Name="Network Slave.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Network Protocol/Network Slave/Network Slave.lvclass"/>
+				<Item Name="Generate UUID.vi" Type="VI" URL="/&lt;vilib&gt;/NI/Modbus Library/Utility/Generate UUID.vi"/>
+				<Item Name="ASCII Data Unit.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Transmission Data Unit/ASCII/ASCII Data Unit.lvclass"/>
+				<Item Name="API Main.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/Modbus Library/API/Wrapper/API Main.lvlib"/>
+				<Item Name="Modbus Slave.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/API/Slave/Modbus Slave.lvclass"/>
+				<Item Name="TCP Slave.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Network Protocol/Network Slave/TCP/TCP Slave.lvclass"/>
+				<Item Name="TCP Shared Components.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/Modbus Library/TCP Shared Components/TCP Shared Components.lvlib"/>
+				<Item Name="Standard Data Model.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Standard Data Model/Standard Data Model.lvclass"/>
+				<Item Name="IP Data Unit.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Transmission Data Unit/IP/IP Data Unit.lvclass"/>
+				<Item Name="TCP Master.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/NI/Modbus Library/Network Protocol/Network Master/TCP/TCP Master.lvclass"/>
+				<Item Name="Open a Document on Disk.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/browser.llb/Open a Document on Disk.vi"/>
+				<Item Name="Open URL in Default Browser core.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/browser.llb/Open URL in Default Browser core.vi"/>
 			</Item>
 		</Item>
 		<Item Name="Build Specifications" Type="Build">

diff --git a/MB Master.vipb b/MB Master.vipb
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="0.6" Created_Date="2014-11-11 02:31:37" Modified_Date="2018-03-05 06:56:25" Creator="leonidas" Comments="" ID="58733660fd19311d416fc1ab73080241">
+<VI_Package_Builder_Settings Version="0.6" Created_Date="2014-11-11 02:31:37" Modified_Date="2018-07-09 13:06:45" Creator="leonidas" Comments="" ID="40ce9cc5f2dbb327e12ee941ceefe435">
   <Library_General_Settings>
     <Package_File_Name>MB_Master</Package_File_Name>
-    <Library_Version>1.3.1.4</Library_Version>
+    <Library_Version>1.3.2.10</Library_Version>
     <Auto_Increment_Version>false</Auto_Increment_Version>
     <Library_Source_Folder>..\builds\MB Master\Source Distribution</Library_Source_Folder>
     <Library_Output_Folder>..\builds\MB Master</Library_Output_Folder>
@@ -47,13 +47,13 @@ It supports RTU, ASCII and TCP modes with the following function codes:
 0x2B/0x0E - Read Device Identification
 
 Supports sharing a COM port across multiple Modbus sessions using VISA locks (10 second timeout).
-Supports sharing a Modbus session across multiple communication loops using a DVR as a mutex.</Description>
+Supports sharing a Modbus session across multiple communication loops.</Description>
       <Copyright/>
       <Packager>Ryan Porter</Packager>
       <URL>https://lavag.org/files/file/286-plasmionique-modbus-master/</URL>
-      <Release_Notes>Re-Added accessor for VISA resource. Some might find this useful for dealing with certain USB to serial adapters.
-Added Modbus Comm Tester to tools menu.
-Added MB VISA lock functions to palette.</Release_Notes>
+      <Release_Notes>Added Device ID Objects to Modbus Comm Tester
+Implemented transaction IDs for Modbus TCP
+Added PDU request and PDU response to ADU class</Release_Notes>
     </Description>
     <Destinations>
       <Toolkit_VIs>
@@ -504,7 +504,7 @@ Added MB VISA lock functions to palette.</Release_Notes>
         <Path>..\builds\MB Master\Source Distribution\MB_Master\Read Device Identification.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>F468BF886A5F747AE6E7A7BD6B7C1A94</GUID>
+      <GUID>F92C64D0B7863D611A40F955589E2FC2</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -581,7 +581,7 @@ Added MB VISA lock functions to palette.</Release_Notes>
         <Path>..\builds\MB Master\Source Distribution\MB_VISA_Lock\Dispose VISA Lock Ref.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>3A6F122368350D9497D02D9184D23672</GUID>
+      <GUID>C3BDB1A638B2C60C4A82B464A262AC30</GUID>
     </Functions_Palette_Data>
   </Library_Palette_Definition>
 </VI_Package_Builder_Settings>
diff --git a/MB_ADU/Build ADU.vi b/MB_ADU/Build ADU.vi
diff --git a/MB_ADU/MB_ADU.lvclass b/MB_ADU/MB_ADU.lvclass
diff --git a/MB_ADU/Read PDU Req.vi b/MB_ADU/Read PDU Req.vi
diff --git a/MB_ADU/Read PDU Resp.vi b/MB_ADU/Read PDU Resp.vi
diff --git a/MB_ADU/Read RX Data.vi b/MB_ADU/Read RX Data.vi
diff --git a/MB_ADU/Read RX Timestamp.vi b/MB_ADU/Read RX Timestamp.vi
diff --git a/MB_ADU/Read Slave ID.vi b/MB_ADU/Read Slave ID.vi
diff --git a/MB_ADU/Read TX Data.vi b/MB_ADU/Read TX Data.vi
diff --git a/MB_ADU/Read TX Timestamp.vi b/MB_ADU/Read TX Timestamp.vi
diff --git a/MB_ADU/Write PDU Req.vi b/MB_ADU/Write PDU Req.vi
diff --git a/MB_ADU/Write PDU Resp.vi b/MB_ADU/Write PDU Resp.vi
diff --git a/MB_ADU/Write RX Data.vi b/MB_ADU/Write RX Data.vi
diff --git a/MB_ADU/Write RX Timestamp.vi b/MB_ADU/Write RX Timestamp.vi
diff --git a/MB_ADU/Write Slave ID.vi b/MB_ADU/Write Slave ID.vi
diff --git a/MB_ADU/Write TX Data.vi b/MB_ADU/Write TX Data.vi
diff --git a/MB_ADU/Write TX Timestamp.vi b/MB_ADU/Write TX Timestamp.vi
diff --git a/MB_ADU_ASCII/Build ADU_ASCII.vi b/MB_ADU_ASCII/Build ADU_ASCII.vi
diff --git a/MB_ADU_ASCII/RX ADU.vi b/MB_ADU_ASCII/RX ADU.vi
diff --git a/MB_ADU_ASCII/TX ADU.vi b/MB_ADU_ASCII/TX ADU.vi
diff --git a/MB_ADU_RTU/Build ADU_RTU.vi b/MB_ADU_RTU/Build ADU_RTU.vi
diff --git a/MB_ADU_RTU/RX ADU.vi b/MB_ADU_RTU/RX ADU.vi
diff --git a/MB_ADU_RTU/TX ADU.vi b/MB_ADU_RTU/TX ADU.vi
diff --git a/MB_ADU_TCP/Build ADU_TCP.vi b/MB_ADU_TCP/Build ADU_TCP.vi
diff --git a/MB_ADU_TCP/MB_ADU_TCP.lvclass b/MB_ADU_TCP/MB_ADU_TCP.lvclass
diff --git a/MB_ADU_TCP/RX ADU.vi b/MB_ADU_TCP/RX ADU.vi
diff --git a/MB_ADU_TCP/Read Protocol ID.vi b/MB_ADU_TCP/Read Protocol ID.vi
diff --git a/MB_ADU_TCP/Read Transaction ID.vi b/MB_ADU_TCP/Read Transaction ID.vi
diff --git a/MB_ADU_TCP/TX ADU.vi b/MB_ADU_TCP/TX ADU.vi
diff --git a/MB_ADU_TCP/Write Protocol ID.vi b/MB_ADU_TCP/Write Protocol ID.vi
diff --git a/MB_ADU_TCP/Write Transaction ID.vi b/MB_ADU_TCP/Write Transaction ID.vi
diff --git a/MB_Master/Read ADU.vi b/MB_Master/Read ADU.vi
diff --git a/MB_Master_Serial/Open Serial Session.vi b/MB_Master_Serial/Open Serial Session.vi
diff --git a/MB_Master_Serial/Read ADU.vi b/MB_Master_Serial/Read ADU.vi
diff --git a/MB_Master_Serial/Read Slave ID.vi b/MB_Master_Serial/Read Slave ID.vi
diff --git a/MB_Master_Serial/Set Slave ID.vi b/MB_Master_Serial/Set Slave ID.vi
diff --git a/MB_Master_TCP/Close Session.vi b/MB_Master_TCP/Close Session.vi
diff --git a/MB_Master_TCP/Core.vi b/MB_Master_TCP/Core.vi
diff --git a/MB_Master_TCP/MB_Master_TCP.lvclass b/MB_Master_TCP/MB_Master_TCP.lvclass
diff --git a/MB_Master_TCP/Open TCP Session.vi b/MB_Master_TCP/Open TCP Session.vi
diff --git a/MB_Master_TCP/QMgr_Construct.vi b/MB_Master_TCP/QMgr_Construct.vi
diff --git a/MB_Master_TCP/QMgr_DeQueue.vi b/MB_Master_TCP/QMgr_DeQueue.vi
diff --git a/MB_Master_TCP/QMgr_EnQueue.vi b/MB_Master_TCP/QMgr_EnQueue.vi
diff --git a/MB_Master_TCP/Querry.vi b/MB_Master_TCP/Querry.vi
diff --git a/MB_Master_TCP/RX.vi b/MB_Master_TCP/RX.vi
diff --git a/MB_Master_TCP/Read ADU.vi b/MB_Master_TCP/Read ADU.vi
diff --git a/MB_Master_TCP/Read Session Valid.vi b/MB_Master_TCP/Read Session Valid.vi
diff --git a/MB_Master_TCP/Read Slave ID.vi b/MB_Master_TCP/Read Slave ID.vi
diff --git a/MB_Master_TCP/Set Slave ID.vi b/MB_Master_TCP/Set Slave ID.vi
diff --git a/MB_Master_TCP/TX.vi b/MB_Master_TCP/TX.vi
diff --git a/MB_Master_TCP/Tester.vi b/MB_Master_TCP/Tester.vi
diff --git a/Tools/Modbus Comm Tester.vi b/Tools/Modbus Comm Tester.vi
diff --git a/Tools/Transaction ID Test.vi b/Tools/Transaction ID Test.vi