Added Write Mode and Write Rate to allow for interval writes instead …

…of on value change. Rebuilt all engines.
NPowl · Jan 13, 2017 · 12632a8 · 12632a8
1 parent 33934fe
commit 12632a8
Show file tree

Hide file tree

Showing 73 changed files with 14 additions and 25 deletions.
diff --git a/Built/Modbus Master/Custom Device Modbus Master.xml b/Built/Modbus Master/Custom Device Modbus Master.xml
@@ -7,7 +7,7 @@
 	</AddMenu>
 	<Version>1.0.0</Version>
 	<Type>Inline HW Interface</Type>
-	<MaxOccurrence>5</MaxOccurrence>
+	<MaxOccurrence>255</MaxOccurrence>
 	<MainPageGUID>1199cc90-62ea-4be2-b123-96c31660e707</MainPageGUID>
 	<InitializationVI>
 		<Type>Action</Type>

diff --git a/Built/Modbus Master/Linux_32_ARM/Modbus Master Engine LinuxARM.llb b/Built/Modbus Master/Linux_32_ARM/Modbus Master Engine LinuxARM.llb
diff --git a/Built/Modbus Master/Linux_32_ARM/NIVeriStand_DataServices.dll b/Built/Modbus Master/Linux_32_ARM/NIVeriStand_DataServices.dll
diff --git a/Built/Modbus Master/Linux_x64/Modbus Master Engine Linux64.llb b/Built/Modbus Master/Linux_x64/Modbus Master Engine Linux64.llb
diff --git a/Built/Modbus Master/Linux_x64/NIVeriStand_DataServices.dll b/Built/Modbus Master/Linux_x64/NIVeriStand_DataServices.dll
diff --git a/Built/Modbus Master/Modbus Master Configuration.llb b/Built/Modbus Master/Modbus Master Configuration.llb
diff --git a/Built/Modbus Master/Pharlap/Modbus Master Engine Pharlap.llb b/Built/Modbus Master/Pharlap/Modbus Master Engine Pharlap.llb
diff --git a/Built/Modbus Master/Pharlap/NIVeriStand_DataServices.dll b/Built/Modbus Master/Pharlap/NIVeriStand_DataServices.dll
diff --git a/Built/Modbus Master/Windows/Modbus Master Engine Windows.llb b/Built/Modbus Master/Windows/Modbus Master Engine Windows.llb
diff --git a/Source/Engine/Modbus API.lvlibp b/Source/Engine/Modbus API.lvlibp
diff --git a/Source/Engine/Modbus Async.vi b/Source/Engine/Modbus Async.vi
diff --git a/Source/Engine/RT Driver VI.vi b/Source/Engine/RT Driver VI.vi
diff --git a/Source/Engine/RTStateData.ctl b/Source/Engine/RTStateData.ctl
diff --git a/Source/Engine/SubVIs/From Modbus To Veristand.vi b/Source/Engine/SubVIs/From Modbus To Veristand.vi
diff --git a/Source/Engine/SubVIs/From Veristand Master To Modbus.vi b/Source/Engine/SubVIs/From Veristand Master To Modbus.vi
diff --git a/Source/Engine/SubVIs/Initialize Engine Output.vi b/Source/Engine/SubVIs/Initialize Engine Output.vi
diff --git a/Source/Engine/SubVIs/Initialize Modbus Master Connection.vi b/Source/Engine/SubVIs/Initialize Modbus Master Connection.vi
diff --git a/Source/Engine/SubVIs/Initialize Modbus Slave Connection.vi b/Source/Engine/SubVIs/Initialize Modbus Slave Connection.vi
diff --git a/Source/Engine/SubVIs/Print Initialization Message.vi b/Source/Engine/SubVIs/Print Initialization Message.vi
diff --git a/Source/Modbus Master Custom Device - Linux ARM.lvlps b/Source/Modbus Master Custom Device - Linux ARM.lvlps
@@ -34,10 +34,10 @@ Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{32214"
 Cache_Path[Path] Line0002 = "451-43E2-4D3E-92C8-CE819321FAC4}.txt"
 
 [AB_Cache_{8BD177DF-882F-4506-BE35-A5DF5F673C18}]
-Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{8BD17"
+Cache_Path[Path] Line0001 = "/C/Users/tblair/AppData/Local/Temp/AB_Cache_{8BD17"
 Cache_Path[Path] Line0002 = "7DF-882F-4506-BE35-A5DF5F673C18}.txt"
 
 [AB_Cache_{F7A753CB-5AA6-49B3-83A7-C0336FA31893}]
-Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{F7A75"
+Cache_Path[Path] Line0001 = "/C/Users/tblair/AppData/Local/Temp/AB_Cache_{F7A75"
 Cache_Path[Path] Line0002 = "3CB-5AA6-49B3-83A7-C0336FA31893}.txt"
 
diff --git a/Source/Modbus Master Custom Device - Linux x64.lvlps b/Source/Modbus Master Custom Device - Linux x64.lvlps
@@ -42,10 +42,10 @@ Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{32214"
 Cache_Path[Path] Line0002 = "451-43E2-4D3E-92C8-CE819321FAC4}.txt"
 
 [AB_Cache_{0FFE989D-B571-426F-BFD1-1B015D4319A2}]
-Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{0FFE9"
+Cache_Path[Path] Line0001 = "/C/Users/tblair/AppData/Local/Temp/AB_Cache_{0FFE9"
 Cache_Path[Path] Line0002 = "89D-B571-426F-BFD1-1B015D4319A2}.txt"
 
 [AB_Cache_{E24CF77A-EDD5-435E-91DE-CAC6522BEA2A}]
-Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{E24CF"
+Cache_Path[Path] Line0001 = "/C/Users/tblair/AppData/Local/Temp/AB_Cache_{E24CF"
 Cache_Path[Path] Line0002 = "77A-EDD5-435E-91DE-CAC6522BEA2A}.txt"
 
diff --git a/Source/Modbus Master Custom Device - RT PXI.lvlps b/Source/Modbus Master Custom Device - RT PXI.lvlps
@@ -2,10 +2,10 @@
 ProjectExplorer.ClassicPosition[String] = "84,-1342,727,-874"
 
 [AB_Cache_{1C5E1E67-9451-441D-846C-27770C0D4D34}]
-Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{1C5E1"
+Cache_Path[Path] Line0001 = "/C/Users/tblair/AppData/Local/Temp/AB_Cache_{1C5E1"
 Cache_Path[Path] Line0002 = "E67-9451-441D-846C-27770C0D4D34}.txt"
 
 [AB_Cache_{4DDC7D17-96A1-4AE7-BF29-EC0FD60BE89D}]
-Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{4DDC7"
+Cache_Path[Path] Line0001 = "/C/Users/tblair/AppData/Local/Temp/AB_Cache_{4DDC7"
 Cache_Path[Path] Line0002 = "D17-96A1-4AE7-BF29-EC0FD60BE89D}.txt"
 
diff --git a/Source/Modbus Master Custom Device - Windows.lvlps b/Source/Modbus Master Custom Device - Windows.lvlps
@@ -1,5 +1,5 @@
 [ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "201,1285,745,1701"
+ProjectExplorer.ClassicPosition[String] = "138,-798,682,-382"
 
 [AB_Cache_{C67C1B30-A649-4BB4-8780-C96741B30EB4}]
 Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{C67C1"

diff --git a/Source/Modbus Master Custom Device - Windows.lvproj b/Source/Modbus Master Custom Device - Windows.lvproj
@@ -187,7 +187,6 @@
 				<Item Name="GetTargetBuildSpecs.vi" Type="VI" URL="/&lt;vilib&gt;/AppBuilder/GetTargetBuildSpecs.vi"/>
 				<Item Name="Process.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/Process/Process.lvclass"/>
 				<Item Name="Process.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/Process/Process.lvclass/Process.ctl"/>
-				<Item Name="Write.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Access Type Classes/Write/Write.lvclass/Write.ctl"/>
 				<Item Name="Data.Processes.Execute.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Data Access Engine/Methods/Data.Processes.Execute.vi"/>
 				<Item Name="Async.Processes.Report.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/Process/Methods/Async.Processes.Report.vi"/>
 				<Item Name="Read Data Access.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/Process/Data Member Access/Read Data Access.vi"/>
@@ -197,28 +196,13 @@
 				<Item Name="Read.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Access Type Classes/Read/Read.lvclass/Read.ctl"/>
 				<Item Name="Read.Data.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Data Access Engine/Methods/Read.Data.vi"/>
 				<Item Name="Read.ProcessData.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Access Type Classes/Read/Read.ProcessData.vi"/>
-				<Item Name="VS Inline Async API.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/VS Inline Async API/VS Inline Async API.lvclass"/>
-				<Item Name="VS Inline Async API.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/VS Inline Async API/VS Inline Async API.lvclass/VS Inline Async API.ctl"/>
-				<Item Name="Data Access Engine.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Data Access Engine/Data Access Engine.lvclass/Data Access Engine.ctl"/>
-				<Item Name="ReadWrite.ctl" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Access Type Classes/ReadWrite/ReadWrite.lvclass/ReadWrite.ctl"/>
-				<Item Name="Async.Engine.Read Data from HW.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/VS Inline Async API/Methods/Async.Engine.Read Data from HW.vi"/>
-				<Item Name="Async.Engine.Write Data to HW.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/VS Inline Async API/Methods/Async.Engine.Write Data to HW.vi"/>
-				<Item Name="Data.Engine.Read Data from HW.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Data Access Engine/Methods/Data.Engine.Read Data from HW.vi"/>
-				<Item Name="Data.Engine.Write Data to HW.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Data Access Engine/Methods/Data.Engine.Write Data to HW.vi"/>
-				<Item Name="ReadWrite.EngineData.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Access Type Classes/ReadWrite/ReadWrite.EngineData.vi"/>
-				<Item Name="Write.EngineData.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Access Type Classes/Write/Write.EngineData.vi"/>
-				<Item Name="Read.EngineData.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access Engine/Access Type Classes/Read/Read.EngineData.vi"/>
-				<Item Name="Async.Engine.Initialize.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/VS Inline Async API/Methods/Async.Engine.Initialize.vi"/>
-				<Item Name="Async.Engine.Start.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/VS Inline Async API/Methods/Async.Engine.Start.vi"/>
-				<Item Name="Async.Engine.Close.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_VS Inline Async API/VS Inline Async API/Methods/Async.Engine.Close.vi"/>
-				<Item Name="Data.OnCompile.Execute.vi" Type="VI" URL="/&lt;vilib&gt;/addons/Inline Async API/_Data Access System Explorer/Methods/Data.OnCompile.Execute.vi"/>
 				<Item Name="Data Access Engine.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/NIVS Inline Async API/_Data Access Engine/Data Access Engine.lvlib"/>
 				<Item Name="VS Inline Async API.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/NIVS Inline Async API/_VS Inline Async API/VS Inline Async API.lvlib"/>
+				<Item Name="Data Access System Explorer.lvlib" Type="Library" URL="/&lt;vilib&gt;/NI/NIVS Inline Async API/_Data Access System Explorer/Data Access System Explorer.lvlib"/>
 			</Item>
 			<Item Name="NationalInstruments.VeriStand.SystemStorage" Type="Document" URL="NationalInstruments.VeriStand.SystemStorage">
 				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
 			</Item>
-			<Item Name="Validate Discrete Input Mapping.vi" Type="VI" URL="../System Explorer/SubVIs/Validate Discrete Input Mapping.vi"/>
 			<Item Name="provcom_StringGlobals.vi" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/Common/provcom_StringGlobals.vi"/>
 			<Item Name="Export to Kepware Server.vi" Type="VI" URL="../System Explorer/SubVIs/Kepware/Export to Kepware Server.vi"/>
 			<Item Name="To Standard Name.vi" Type="VI" URL="../System Explorer/SubVIs/Kepware/To Standard Name.vi"/>

diff --git a/Source/Shared/Constants.vi b/Source/Shared/Constants.vi
diff --git a/Source/Shared/Device Info.ctl b/Source/Shared/Device Info.ctl
diff --git a/Source/Shared/Modbus Master Shared.lvlib b/Source/Shared/Modbus Master Shared.lvlib
@@ -26,6 +26,7 @@
 				<Item Name="Serial Settings.ctl" Type="VI" URL="../Controls/Data Model/Serial Settings.ctl"/>
 				<Item Name="Serial Type.ctl" Type="VI" URL="../Controls/Serial Type.ctl"/>
 				<Item Name="TCP Settings.ctl" Type="VI" URL="../Controls/Data Model/TCP Settings.ctl"/>
+				<Item Name="Write Mode.ctl" Type="VI" URL="../Write Mode.ctl"/>
 			</Item>
 		</Item>
 		<Item Name="Constants.vi" Type="VI" URL="../Constants.vi"/>

diff --git a/Source/Shared/Write Mode.ctl b/Source/Shared/Write Mode.ctl
diff --git a/Source/System Explorer/DI Coil UI.vi b/Source/System Explorer/DI Coil UI.vi
diff --git a/Source/System Explorer/Get Write Mode.vi b/Source/System Explorer/Get Write Mode.vi
diff --git a/Source/System Explorer/Get Write Rate.vi b/Source/System Explorer/Get Write Rate.vi
diff --git a/Source/System Explorer/Initialization VI.vi b/Source/System Explorer/Initialization VI.vi
diff --git a/Source/System Explorer/Main Page.vi b/Source/System Explorer/Main Page.vi
diff --git a/Source/System Explorer/Modbus Master System Explorer.lvlib b/Source/System Explorer/Modbus Master System Explorer.lvlib
@@ -136,6 +136,10 @@
 			<Item Name="Get Interface Info.vi" Type="VI" URL="../SubVIs/Get Interface Info.vi"/>
 			<Item Name="Get Max Group Size.vi" Type="VI" URL="../SubVIs/Get Max Group Size.vi"/>
 			<Item Name="Set Max Group Size.vi" Type="VI" URL="../Set Max Group Size.vi"/>
+			<Item Name="Set Write Mode.vi" Type="VI" URL="../Set Write Mode.vi"/>
+			<Item Name="Get Write Mode.vi" Type="VI" URL="../Get Write Mode.vi"/>
+			<Item Name="Set Write Rate.vi" Type="VI" URL="../Set Write Rate.vi"/>
+			<Item Name="Get Write Rate.vi" Type="VI" URL="../Get Write Rate.vi"/>
 		</Item>
 		<Item Name="Templates" Type="Folder">
 			<Item Name="Node In VI.vit" Type="VI" URL="../SubVIs/Node In VI.vit"/>

diff --git a/Source/System Explorer/Set Max Group Size.vi b/Source/System Explorer/Set Max Group Size.vi
diff --git a/Source/System Explorer/Set Radix Selection.vi b/Source/System Explorer/Set Radix Selection.vi
diff --git a/Source/System Explorer/Set Write Mode.vi b/Source/System Explorer/Set Write Mode.vi
diff --git a/Source/System Explorer/Set Write Rate.vi b/Source/System Explorer/Set Write Rate.vi
diff --git a/Source/System Explorer/SubVIs/ActionVIOnCompile.vi b/Source/System Explorer/SubVIs/ActionVIOnCompile.vi
diff --git a/Source/System Explorer/SubVIs/Add AI Register.vi b/Source/System Explorer/SubVIs/Add AI Register.vi
diff --git a/Source/System Explorer/SubVIs/Add AO Register.vi b/Source/System Explorer/SubVIs/Add AO Register.vi
diff --git a/Source/System Explorer/SubVIs/Add DI Coil.vi b/Source/System Explorer/SubVIs/Add DI Coil.vi
diff --git a/Source/System Explorer/SubVIs/Add DO Coil.vi b/Source/System Explorer/SubVIs/Add DO Coil.vi
diff --git a/Source/System Explorer/SubVIs/Add Error Group.vi b/Source/System Explorer/SubVIs/Add Error Group.vi
diff --git a/Source/System Explorer/SubVIs/Add Groups.vi b/Source/System Explorer/SubVIs/Add Groups.vi
diff --git a/Source/System Explorer/SubVIs/CSV/Config Read Interface.vi b/Source/System Explorer/SubVIs/CSV/Config Read Interface.vi
diff --git a/Source/System Explorer/SubVIs/CSV/Config Write Interface.vi b/Source/System Explorer/SubVIs/CSV/Config Write Interface.vi
diff --git a/Source/System Explorer/SubVIs/CSV/Import From Config.vi b/Source/System Explorer/SubVIs/CSV/Import From Config.vi
diff --git a/Source/System Explorer/SubVIs/CSV/SubVIs/Read Interface Configs.vi b/Source/System Explorer/SubVIs/CSV/SubVIs/Read Interface Configs.vi
diff --git a/Source/System Explorer/SubVIs/CSV/SubVIs/Write Interface Configs.vi b/Source/System Explorer/SubVIs/CSV/SubVIs/Write Interface Configs.vi
diff --git a/Source/System Explorer/SubVIs/Check All Groups for Conflicts.vi b/Source/System Explorer/SubVIs/Check All Groups for Conflicts.vi
diff --git a/Source/System Explorer/SubVIs/Export to Config.vi b/Source/System Explorer/SubVIs/Export to Config.vi
diff --git a/Source/System Explorer/SubVIs/Get CHM Path.vi b/Source/System Explorer/SubVIs/Get CHM Path.vi
diff --git a/Source/System Explorer/SubVIs/Get Interface Info.vi b/Source/System Explorer/SubVIs/Get Interface Info.vi
diff --git a/Source/System Explorer/SubVIs/Get Max Group Size.vi b/Source/System Explorer/SubVIs/Get Max Group Size.vi
diff --git a/Source/System Explorer/SubVIs/Get Radix Selection.vi b/Source/System Explorer/SubVIs/Get Radix Selection.vi
diff --git a/Source/System Explorer/SubVIs/Get Refresh Rate.vi b/Source/System Explorer/SubVIs/Get Refresh Rate.vi
diff --git a/Source/System Explorer/SubVIs/Get Serial Settings.vi b/Source/System Explorer/SubVIs/Get Serial Settings.vi
diff --git a/Source/System Explorer/SubVIs/Get TCP Settings.vi b/Source/System Explorer/SubVIs/Get TCP Settings.vi
diff --git a/Source/System Explorer/SubVIs/Load Help File.vi b/Source/System Explorer/SubVIs/Load Help File.vi
diff --git a/Source/System Explorer/SubVIs/Set Refresh Rate.vi b/Source/System Explorer/SubVIs/Set Refresh Rate.vi
diff --git a/Source/System Explorer/SubVIs/Set Serial Settings.vi b/Source/System Explorer/SubVIs/Set Serial Settings.vi
diff --git a/Source/System Explorer/SubVIs/Set TCP Settings.vi b/Source/System Explorer/SubVIs/Set TCP Settings.vi
diff --git a/Source/System Explorer/SubVIs/Shared Methods/Channel Get Data Type.vi b/Source/System Explorer/SubVIs/Shared Methods/Channel Get Data Type.vi
diff --git a/Source/System Explorer/SubVIs/Shared Methods/Channel Get Modbus Type.vi b/Source/System Explorer/SubVIs/Shared Methods/Channel Get Modbus Type.vi
diff --git a/Source/System Explorer/SubVIs/Shared Methods/Channel Get Starting Address.vi b/Source/System Explorer/SubVIs/Shared Methods/Channel Get Starting Address.vi
diff --git a/Source/System Explorer/SubVIs/Shared Methods/Channel Get Sub Address.vi b/Source/System Explorer/SubVIs/Shared Methods/Channel Get Sub Address.vi
diff --git a/Source/System Explorer/SubVIs/Shared Methods/Channel Set DataType.vi b/Source/System Explorer/SubVIs/Shared Methods/Channel Set DataType.vi
diff --git a/Source/System Explorer/SubVIs/Shared Methods/Channel Set Modbus Type.vi b/Source/System Explorer/SubVIs/Shared Methods/Channel Set Modbus Type.vi
diff --git a/Source/System Explorer/SubVIs/Shared Methods/Channel Set Starting Address.vi b/Source/System Explorer/SubVIs/Shared Methods/Channel Set Starting Address.vi
diff --git a/Source/System Explorer/SubVIs/Shared Methods/Channel Set Sub Address.vi b/Source/System Explorer/SubVIs/Shared Methods/Channel Set Sub Address.vi
diff --git a/Source/System Explorer/SubVIs/add diagnostics.vi b/Source/System Explorer/SubVIs/add diagnostics.vi
diff --git a/Source/System Explorer/SubVIs/get device interface info.vi b/Source/System Explorer/SubVIs/get device interface info.vi