diff --git a/Built/Modbus Master/Custom Device Modbus Master.xml b/Built/Modbus Master/Custom Device Modbus Master.xml index f8f0bf6..a26a808 100644 --- a/Built/Modbus Master/Custom Device Modbus Master.xml +++ b/Built/Modbus Master/Custom Device Modbus Master.xml @@ -1,4 +1,4 @@ - + @@ -110,47 +110,47 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -209,7 +209,6 @@ Custom Devices\Modbus Master\Modbus Master Configuration.llb\ActionVIOnCompile.vi - Interface UI @@ -288,22 +287,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -371,22 +370,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -454,22 +453,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -537,22 +536,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -581,22 +580,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -625,22 +624,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -686,22 +685,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -729,22 +728,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -772,22 +771,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -839,6 +838,6 @@ - + \ No newline at end of file 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 index 582df13..a5200eb 100644 Binary files a/Built/Modbus Master/Linux_32_ARM/Modbus Master Engine LinuxARM.llb and b/Built/Modbus Master/Linux_32_ARM/Modbus Master Engine LinuxARM.llb differ diff --git a/Built/Modbus Master/Linux_x64/Modbus Master Engine Linux64.llb b/Built/Modbus Master/Linux_x64/Modbus Master Engine Linux64.llb index 761cb4e..a5f7ac9 100644 Binary files a/Built/Modbus Master/Linux_x64/Modbus Master Engine Linux64.llb and b/Built/Modbus Master/Linux_x64/Modbus Master Engine Linux64.llb differ diff --git a/Built/Modbus Master/Modbus Master Configuration.llb b/Built/Modbus Master/Modbus Master Configuration.llb index 5fdeba2..87ba3fc 100644 Binary files a/Built/Modbus Master/Modbus Master Configuration.llb and b/Built/Modbus Master/Modbus Master Configuration.llb differ diff --git a/Built/Modbus Master/Pharlap/Modbus Master Engine Pharlap.llb b/Built/Modbus Master/Pharlap/Modbus Master Engine Pharlap.llb index 8c02f74..48eaf0f 100644 Binary files a/Built/Modbus Master/Pharlap/Modbus Master Engine Pharlap.llb and b/Built/Modbus Master/Pharlap/Modbus Master Engine Pharlap.llb differ diff --git a/Built/Modbus Master/Windows/Modbus Master Engine Windows.llb b/Built/Modbus Master/Windows/Modbus Master Engine Windows.llb index d1cfba2..75a624e 100644 Binary files a/Built/Modbus Master/Windows/Modbus Master Engine Windows.llb and b/Built/Modbus Master/Windows/Modbus Master Engine Windows.llb differ diff --git a/Source/Custom Device Modbus Master.xml b/Source/Custom Device Modbus Master.xml index f8f0bf6..a26a808 100644 --- a/Source/Custom Device Modbus Master.xml +++ b/Source/Custom Device Modbus Master.xml @@ -1,4 +1,4 @@ - + @@ -110,47 +110,47 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -209,7 +209,6 @@ Custom Devices\Modbus Master\Modbus Master Configuration.llb\ActionVIOnCompile.vi - Interface UI @@ -288,22 +287,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -371,22 +370,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -454,22 +453,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -537,22 +536,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -581,22 +580,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -625,22 +624,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -686,22 +685,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -729,22 +728,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -772,22 +771,22 @@ System Explorer\Glyphs\RM Information Channels.png Notification - + Help Help - - + + - - + + - - + + @@ -839,6 +838,6 @@ - + \ No newline at end of file diff --git a/Source/Engine/Modbus Async.vi b/Source/Engine/Modbus Async.vi index d459ae7..6ba7e89 100644 Binary files a/Source/Engine/Modbus Async.vi and b/Source/Engine/Modbus Async.vi differ diff --git a/Source/Engine/RT Driver VI.vi b/Source/Engine/RT Driver VI.vi index ad238c8..c6bfee7 100644 Binary files a/Source/Engine/RT Driver VI.vi and b/Source/Engine/RT Driver VI.vi differ diff --git a/Source/Engine/SubVIs/Create Input Groups.vi b/Source/Engine/SubVIs/Create Input Groups.vi index 8fbb1cf..45c41d0 100644 Binary files a/Source/Engine/SubVIs/Create Input Groups.vi and b/Source/Engine/SubVIs/Create Input Groups.vi differ diff --git a/Source/Engine/SubVIs/From Modbus To Veristand.vi b/Source/Engine/SubVIs/From Modbus To Veristand.vi index e66542d..9c645f6 100644 Binary files a/Source/Engine/SubVIs/From Modbus To Veristand.vi and b/Source/Engine/SubVIs/From Modbus To Veristand.vi differ diff --git a/Source/Engine/SubVIs/From U16.vi b/Source/Engine/SubVIs/From U16.vi index e34c740..2d7a0cf 100644 Binary files a/Source/Engine/SubVIs/From U16.vi and b/Source/Engine/SubVIs/From U16.vi differ diff --git a/Source/Engine/SubVIs/From Veristand Master To Modbus.vi b/Source/Engine/SubVIs/From Veristand Master To Modbus.vi index 55a82b4..bab561b 100644 Binary files a/Source/Engine/SubVIs/From Veristand Master To Modbus.vi and b/Source/Engine/SubVIs/From Veristand Master To Modbus.vi differ diff --git a/Source/Engine/SubVIs/Initialize Data Buffer.vi b/Source/Engine/SubVIs/Initialize Data Buffer.vi index 37c304b..7836e67 100644 Binary files a/Source/Engine/SubVIs/Initialize Data Buffer.vi and b/Source/Engine/SubVIs/Initialize Data Buffer.vi differ diff --git a/Source/Engine/SubVIs/Initialize Engine Output.vi b/Source/Engine/SubVIs/Initialize Engine Output.vi index e1bb98f..f368e81 100644 Binary files a/Source/Engine/SubVIs/Initialize Engine Output.vi and b/Source/Engine/SubVIs/Initialize Engine Output.vi differ diff --git a/Source/Engine/SubVIs/Initialize Modbus Master Connection.vi b/Source/Engine/SubVIs/Initialize Modbus Master Connection.vi index 922c4ab..c60de1e 100644 Binary files a/Source/Engine/SubVIs/Initialize Modbus Master Connection.vi and b/Source/Engine/SubVIs/Initialize Modbus Master Connection.vi differ diff --git a/Source/Engine/SubVIs/Initialize Modbus Slave Connection.vi b/Source/Engine/SubVIs/Initialize Modbus Slave Connection.vi index b7d8797..3bf01e4 100644 Binary files a/Source/Engine/SubVIs/Initialize Modbus Slave Connection.vi and b/Source/Engine/SubVIs/Initialize Modbus Slave Connection.vi differ diff --git a/Source/Engine/SubVIs/Map Channels to Doubles.vi b/Source/Engine/SubVIs/Map Channels to Doubles.vi index d311c37..cdf737b 100644 Binary files a/Source/Engine/SubVIs/Map Channels to Doubles.vi and b/Source/Engine/SubVIs/Map Channels to Doubles.vi differ diff --git a/Source/Engine/SubVIs/Print Error to Console.vi b/Source/Engine/SubVIs/Print Error to Console.vi index fe28a23..cb42a85 100644 Binary files a/Source/Engine/SubVIs/Print Error to Console.vi and b/Source/Engine/SubVIs/Print Error to Console.vi differ diff --git a/Source/Engine/SubVIs/Print Initialization Message.vi b/Source/Engine/SubVIs/Print Initialization Message.vi index 7b88a75..705527b 100644 Binary files a/Source/Engine/SubVIs/Print Initialization Message.vi and b/Source/Engine/SubVIs/Print Initialization Message.vi differ diff --git a/Source/Engine/SubVIs/To U16s.vi b/Source/Engine/SubVIs/To U16s.vi index 684760c..8806271 100644 Binary files a/Source/Engine/SubVIs/To U16s.vi and b/Source/Engine/SubVIs/To U16s.vi differ diff --git a/Source/Engine/SubVIs/Track Loop Rate.vi b/Source/Engine/SubVIs/Track Loop Rate.vi index 7cd391d..42541a3 100644 Binary files a/Source/Engine/SubVIs/Track Loop Rate.vi and b/Source/Engine/SubVIs/Track Loop Rate.vi differ diff --git a/Source/Engine/SubVIs/Write Data.vi b/Source/Engine/SubVIs/Write Data.vi index 5eb1cfc..171448d 100644 Binary files a/Source/Engine/SubVIs/Write Data.vi and b/Source/Engine/SubVIs/Write Data.vi differ diff --git a/Source/Engine/SubVIs/Write Errors.vi b/Source/Engine/SubVIs/Write Errors.vi index 357a9ac..5bb349f 100644 Binary files a/Source/Engine/SubVIs/Write Errors.vi and b/Source/Engine/SubVIs/Write Errors.vi differ diff --git a/Source/Engine/SubVIs/Write Holding Registers.vi b/Source/Engine/SubVIs/Write Holding Registers.vi index 75e20de..35201eb 100644 Binary files a/Source/Engine/SubVIs/Write Holding Registers.vi and b/Source/Engine/SubVIs/Write Holding Registers.vi differ diff --git a/Source/Engine/SubVIs/write coils.vi b/Source/Engine/SubVIs/write coils.vi index fecc9c5..1c6d274 100644 Binary files a/Source/Engine/SubVIs/write coils.vi and b/Source/Engine/SubVIs/write coils.vi differ diff --git a/Source/Engine/check for timeout.vi b/Source/Engine/check for timeout.vi index 1cfdf46..8afc55c 100644 Binary files a/Source/Engine/check for timeout.vi and b/Source/Engine/check for timeout.vi differ diff --git a/Source/Help/Main.html b/Source/Help/Main.html index 99680a2..aa35fc0 100644 --- a/Source/Help/Main.html +++ b/Source/Help/Main.html @@ -5,7 +5,7 @@ -Modbus Master to Slave Custom Device +bloop @@ -14,7 +14,7 @@

Modbus Master Custom Device

+

bloop

This Custom Device allows for communication between VeriStand a Modbus slave.

Configuring a new Modbus Master

Common Settings

diff --git a/Source/Help/Modbus Custom Device.hhp b/Source/Help/Modbus Custom Device.hhp index 61b085d..4e17f2a 100644 --- a/Source/Help/Modbus Custom Device.hhp +++ b/Source/Help/Modbus Custom Device.hhp @@ -1,38 +1,42 @@ [OPTIONS] Compatibility=1.1 or later -Compiled file=Modbus CD Help.chm -Contents file=Table of Contents.hhc -Default topic=Main.html +Compiled File=Modbus Custom Device Help.chm +Contents File=Modbus Custom Device Help_toc.hcc +Default Topic=Main.html Display compile progress=No Language=0x409 English (United States) Title=Modbus Custom Device Help - [FILES] -common.js -feedbacklink.js -variables.js -objectnames.js -domtools.js +expandable_tree.css +VSsystemexplorer.css arraytools.js -osbrowser.js -initpagedyn.js checkinstalled.js +common.js +cssframes.js +domtools.js dynamiccontent.js +dynamicjumps.js dynamiclinks.js -linking.js +expandable_tree.js +feedbacklink.js +Globals.js +initpagedyn.js launchhelp.js +linking.js +objectnames.js +osbrowser.js +pdf.js +polyviselect.js stylesheets.js +variables.js web.js -pdf.js -Main.html -Modbus IO Types.htm Coils.htm +Diagnostics.htm Discrete Inputs.htm -Input Registers.htm -Holding Registers.htm Error.htm -Diagnostics.htm - -[INFOTYPES] - +Holding Registers.htm +Input Registers.htm +Main.html +Modbus IO Types.htm +test.htm diff --git a/Source/Modbus Master Custom Device - Linux ARM.aliases b/Source/Modbus Master Custom Device - Linux ARM.aliases index 9f7c112..40c0304 100644 --- a/Source/Modbus Master Custom Device - Linux ARM.aliases +++ b/Source/Modbus Master Custom Device - Linux ARM.aliases @@ -1,5 +1,5 @@ [My Computer] -My Computer = "169.254.172.116" +My Computer = "130.164.32.94" [RT CompactRIO Target] RT CompactRIO Target = "0.0.0.0" diff --git a/Source/Modbus Master Custom Device - Linux x64.aliases b/Source/Modbus Master Custom Device - Linux x64.aliases index 9f7c112..40c0304 100644 --- a/Source/Modbus Master Custom Device - Linux x64.aliases +++ b/Source/Modbus Master Custom Device - Linux x64.aliases @@ -1,5 +1,5 @@ [My Computer] -My Computer = "169.254.172.116" +My Computer = "130.164.32.94" [RT CompactRIO Target] RT CompactRIO Target = "0.0.0.0" diff --git a/Source/Modbus Master Custom Device - RT PXI.aliases b/Source/Modbus Master Custom Device - RT PXI.aliases index 9f7c112..40c0304 100644 --- a/Source/Modbus Master Custom Device - RT PXI.aliases +++ b/Source/Modbus Master Custom Device - RT PXI.aliases @@ -1,5 +1,5 @@ [My Computer] -My Computer = "169.254.172.116" +My Computer = "130.164.32.94" [RT CompactRIO Target] RT CompactRIO Target = "0.0.0.0" diff --git a/Source/Modbus Master Custom Device - RT PXI.lvlps b/Source/Modbus Master Custom Device - RT PXI.lvlps index 47ee1ec..6bdeb32 100644 --- a/Source/Modbus Master Custom Device - RT PXI.lvlps +++ b/Source/Modbus Master Custom Device - RT PXI.lvlps @@ -1,5 +1,5 @@ [ProjectWindow_Data] -ProjectExplorer.ClassicPosition[String] = "84,-1342,727,-874" +ProjectExplorer.ClassicPosition[String] = "120,1333,763,1801" [AB_Cache_{1C5E1E67-9451-441D-846C-27770C0D4D34}] Cache_Path[Path] Line0001 = "/C/Users/tblair/AppData/Local/Temp/AB_Cache_{1C5E1" diff --git a/Source/Modbus Master Custom Device - RT PXI.lvproj b/Source/Modbus Master Custom Device - RT PXI.lvproj index 6ffb45d..55d7632 100644 --- a/Source/Modbus Master Custom Device - RT PXI.lvproj +++ b/Source/Modbus Master Custom Device - RT PXI.lvproj @@ -92,8 +92,8 @@ PqVr/ifkAQh+lVrdPIykXlFvg12GhhQFR8H9cUhphgg=:pTe9HRlQuMfJxAG6QCGq7UvoUpJzAzWGKy5SbZ+roSU= 15 - - + + @@ -192,7 +192,7 @@ - + @@ -222,9 +222,10 @@ - + + true diff --git a/Source/Modbus Master Custom Device - Windows.aliases b/Source/Modbus Master Custom Device - Windows.aliases index 9f7c112..40c0304 100644 --- a/Source/Modbus Master Custom Device - Windows.aliases +++ b/Source/Modbus Master Custom Device - Windows.aliases @@ -1,5 +1,5 @@ [My Computer] -My Computer = "169.254.172.116" +My Computer = "130.164.32.94" [RT CompactRIO Target] RT CompactRIO Target = "0.0.0.0" diff --git a/Source/Modbus Master Custom Device - Windows.lvlps b/Source/Modbus Master Custom Device - Windows.lvlps index 40b714d..baa9dc8 100644 --- 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] = "116,1242,660,1658" +ProjectExplorer.ClassicPosition[String] = "128,1459,672,1875" [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 index 9666c01..f4c996a 100644 --- a/Source/Modbus Master Custom Device - Windows.lvproj +++ b/Source/Modbus Master Custom Device - Windows.lvproj @@ -29,13 +29,19 @@ true false - - + + - - - + + 0 + + + 0 + + + 0 + @@ -48,7 +54,9 @@ - + + 0 + @@ -60,14 +68,20 @@ - - + + 0 + + + 0 + - + + 0 + @@ -90,7 +104,9 @@ - + + 0 + @@ -120,16 +136,35 @@ - - - - - + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + 0 + + + + 0 + + + 0 + + + 0 - - - -