Skip to content

Commit

Permalink
made channels scalable
Browse files Browse the repository at this point in the history 
1.0.4.0
  • Loading branch information
@diegotheairwolf
diegotheairwolf committed Feb 24, 2023
1 parent 2801771 commit 05220dc
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 33 deletions.
4 changes: 2 additions & 2 deletions Modbus-Custom-Device-PPL/Source/Modbus PPL.lvproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
<Property Name="Bld_previewCacheID" Type="Str">{CDF6F47D-99A6-43A4-BD48-1CDD43904363}</Property>
<Property Name="Bld_version.build" Type="Int">9</Property>
<Property Name="Bld_version.build" Type="Int">10</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">Modbus API.lvlibp</Property>
<Property Name="Destination[0].path" Type="Path">../builds/Windows/Modbus API.lvlibp</Property>
Expand Down Expand Up @@ -147,7 +147,7 @@
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
<Property Name="Bld_previewCacheID" Type="Str">{823CDD02-342D-4B60-8AEF-CA16F276E36C}</Property>
<Property Name="Bld_targetDestDir" Type="Path">/Linux_x64</Property>
<Property Name="Bld_version.build" Type="Int">3</Property>
<Property Name="Bld_version.build" Type="Int">4</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">Modbus API.lvlibp</Property>
<Property Name="Destination[0].path" Type="Path">/NI_AB_TARGETNAME/Modbus API.lvlibp</Property>
Expand Down
Binary file modified Modbus-Custom-Device-PPL/builds/Linux_x64/Modbus API.lvlibp
View file
Binary file not shown.
Binary file modified Modbus-Custom-Device-PPL/builds/Windows/Modbus API.lvlibp
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Source/Custom Device Modbus Master.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<eng>National Instruments::Modbus Master to Slave</eng>
<loc>National Instruments::Modbus Master to Slave</loc>
</AddMenu>
<Version>1.0.3</Version>
<Version>1.0.4.0</Version>
<Type>Inline HW Interface</Type>
<MaxOccurrence>255</MaxOccurrence>
<MainPageGUID>1199cc90-62ea-4be2-b123-96c31660e707</MainPageGUID>
Expand Down
Binary file modified Source/Engine/Modbus API.lvlibp
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Source/Modbus Master Custom Device - Linux x64.aliases
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[My Computer]
My Computer = "172.25.0.1"
My Computer = "172.25.16.1"

[RT CompactRIO Target]
RT CompactRIO Target = "0.0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion Source/Modbus Master Custom Device - Linux x64.lvlps
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ProjectWindow_Data]
ProjectExplorer.ClassicPosition[String] = "-1104,830,-461,1298"
ProjectExplorer.ClassicPosition[String] = "37,830,680,1298"

[AB_Cache_{C72B7E85-C986-4628-A4AF-93FE5FFE5918}]
Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{C72B7"
Expand Down
9 changes: 2 additions & 7 deletions Source/Modbus Master Custom Device - Linux x64.lvproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,6 @@
<Item Name="systemLogging.dll" Type="Document" URL="systemLogging.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="wsock32.dll" Type="Document" URL="wsock32.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
</Item>
<Item Name="Build Specifications" Type="Build">
<Item Name="Engine Debug" Type="Source Distribution">
Expand Down Expand Up @@ -477,7 +474,6 @@
<Property Name="SourceCount" Type="Int">2</Property>
</Item>
<Item Name="Engine Release" Type="Source Distribution">
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
<Property Name="Bld_buildCacheID" Type="Str">{0FFE989D-B571-426F-BFD1-1B015D4319A2}</Property>
<Property Name="Bld_buildSpecName" Type="Str">Engine Release</Property>
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
Expand All @@ -488,9 +484,8 @@
<Property Name="Bld_preActionVIID" Type="Ref">/My Computer/Copy PPL for Target Type.vi</Property>
<Property Name="Bld_previewCacheID" Type="Str">{E24CF77A-EDD5-435E-91DE-CAC6522BEA2A}</Property>
<Property Name="Bld_targetDestDir" Type="Path">Linux_x64/Modbus Master Engine Linux64.llb</Property>
<Property Name="Bld_version.build" Type="Int">1</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Bld_version.patch" Type="Int">2</Property>
<Property Name="Bld_version.patch" Type="Int">4</Property>
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
<Property Name="Destination[0].path" Type="Path">Linux_x64/Modbus Master Engine Linux64.llb</Property>
<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
Expand All @@ -501,7 +496,7 @@
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Source[0].Container.applyDestination" Type="Bool">true</Property>
<Property Name="Source[0].destinationIndex" Type="Int">0</Property>
<Property Name="Source[0].itemID" Type="Str">{EA471882-2C74-4693-A974-81C07CB898AA}</Property>
<Property Name="Source[0].itemID" Type="Str">{4B2C1FF5-58F4-4719-AA31-9A6C3DFA8330}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/RT CompactRIO Target - Linux x64/Modbus Master Engine.lvlib/RT Driver VI.vi</Property>
Expand Down
2 changes: 1 addition & 1 deletion Source/Modbus Master Custom Device - Windows.aliases
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[My Computer]
My Computer = "172.31.144.1"
My Computer = "172.25.16.1"

[RT CompactRIO Target]
RT CompactRIO Target = "0.0.0.0"
Expand Down
18 changes: 9 additions & 9 deletions Source/Modbus Master Custom Device - Windows.lvlps
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ProjectWindow_Data]
ProjectExplorer.ClassicPosition[String] = "192,780,811,1196"
ProjectExplorer.ClassicPosition[String] = "120,747,929,1163"

[AB_Cache_{C67C1B30-A649-4BB4-8780-C96741B30EB4}]
Cache_Path[Path] Line0001 = "/C/Users/Tanner/AppData/Local/Temp/AB_Cache_{C67C1"
Expand All @@ -17,18 +17,18 @@ Cache_Path[Path] Line0002 = "E85-C986-4628-A4AF-93FE5FFE5918}.txt"
Cache_Path[Path] Line0001 = "/C/Users/DiegoMoreno/AppData/Local/Temp/AB_Cache_{"
Cache_Path[Path] Line0002 = "ABE103FD-8E06-4287-92FA-28F9CAA41336}.txt"

[AB_Cache_{F7E936A1-C50B-4217-AC2B-A4DA3629CD4B}]
Cache_Path[Path] Line0001 = "/C/Users/DiegoMoreno/AppData/Local/Temp/AB_Cache_{"
Cache_Path[Path] Line0002 = "F7E936A1-C50B-4217-AC2B-A4DA3629CD4B}.txt"

[AB_Cache_{E8035317-FDF9-4FC1-9EF0-1450E8CAE472}]
Cache_Path[Path] Line0001 = "/C/Users/DiegoMoreno/AppData/Local/Temp/AB_Cache_{"
Cache_Path[Path] Line0002 = "E8035317-FDF9-4FC1-9EF0-1450E8CAE472}.txt"

[AB_Cache_{BDB37E78-1B48-4DD8-B51B-9DFE56743A02}]
Cache_Path[Path] Line0001 = "/C/Users/DiegoMoreno/AppData/Local/Temp/AB_Cache_{"
Cache_Path[Path] Line0002 = "BDB37E78-1B48-4DD8-B51B-9DFE56743A02}.txt"

[AB_Cache_{32214451-43E2-4D3E-92C8-CE819321FAC4}]
Cache_Path[Path] Line0001 = "/C/Users/DiegoMoreno/AppData/Local/Temp/AB_Cache_{"
Cache_Path[Path] Line0002 = "32214451-43E2-4D3E-92C8-CE819321FAC4}.txt"

[AB_Cache_{F7E936A1-C50B-4217-AC2B-A4DA3629CD4B}]
Cache_Path[Path] Line0001 = "/C/Users/DiegoMoreno/AppData/Local/Temp/AB_Cache_{"
Cache_Path[Path] Line0002 = "F7E936A1-C50B-4217-AC2B-A4DA3629CD4B}.txt"

[AB_Cache_{E8035317-FDF9-4FC1-9EF0-1450E8CAE472}]
Cache_Path[Path] Line0001 = "/C/Users/DiegoMoreno/AppData/Local/Temp/AB_Cache_{"
Cache_Path[Path] Line0002 = "E8035317-FDF9-4FC1-9EF0-1450E8CAE472}.txt"
15 changes: 4 additions & 11 deletions Source/Modbus Master Custom Device - Windows.lvproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,6 @@
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="LV Config Read String.vi" Type="VI" URL="/&lt;resource&gt;/dialog/lvconfig.llb/LV Config Read String.vi"/>
<Item Name="wsock32.dll" Type="Document" URL="wsock32.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
</Item>
<Item Name="Build Specifications" Type="Build">
<Item Name="Configuration Debug" Type="Source Distribution">
Expand Down Expand Up @@ -273,7 +270,6 @@
<Property Name="SourceCount" Type="Int">3</Property>
</Item>
<Item Name="Configuration Release" Type="Source Distribution">
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
<Property Name="Bld_buildCacheID" Type="Str">{F7E936A1-C50B-4217-AC2B-A4DA3629CD4B}</Property>
<Property Name="Bld_buildSpecName" Type="Str">Configuration Release</Property>
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
Expand All @@ -283,9 +279,8 @@
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_postActionVIID" Type="Ref">/My Computer/Utility/Copy .LLB to NI VeriStand dir.vi</Property>
<Property Name="Bld_previewCacheID" Type="Str">{E8035317-FDF9-4FC1-9EF0-1450E8CAE472}</Property>
<Property Name="Bld_version.build" Type="Int">1</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Bld_version.patch" Type="Int">2</Property>
<Property Name="Bld_version.patch" Type="Int">4</Property>
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
<Property Name="Destination[0].path" Type="Path">../Built/Modbus Master</Property>
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
Expand All @@ -294,7 +289,7 @@
<Property Name="Destination[2].path" Type="Path">../Built/Modbus Master/Modbus Master Configuration.llb</Property>
<Property Name="Destination[2].type" Type="Str">LLB</Property>
<Property Name="DestinationCount" Type="Int">3</Property>
<Property Name="Source[0].itemID" Type="Str">{062AE1AA-3147-477B-A639-11359F1A27EA}</Property>
<Property Name="Source[0].itemID" Type="Str">{52476E00-23A4-4B57-887C-8178AEA79F36}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/Custom Device Modbus Master.xml</Property>
Expand Down Expand Up @@ -377,7 +372,6 @@
<Property Name="SourceCount" Type="Int">2</Property>
</Item>
<Item Name="Engine Release" Type="Source Distribution">
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
<Property Name="Bld_buildCacheID" Type="Str">{BDB37E78-1B48-4DD8-B51B-9DFE56743A02}</Property>
<Property Name="Bld_buildSpecName" Type="Str">Engine Release</Property>
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
Expand All @@ -387,16 +381,15 @@
<Property Name="Bld_postActionVIID" Type="Ref">/My Computer/Utility/Copy .LLB to NI VeriStand dir.vi</Property>
<Property Name="Bld_preActionVIID" Type="Ref">/My Computer/Utility/Copy PPL for Target Type.vi</Property>
<Property Name="Bld_previewCacheID" Type="Str">{32214451-43E2-4D3E-92C8-CE819321FAC4}</Property>
<Property Name="Bld_version.build" Type="Int">1</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Bld_version.patch" Type="Int">2</Property>
<Property Name="Bld_version.patch" Type="Int">4</Property>
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
<Property Name="Destination[0].path" Type="Path">../Built/Modbus Master/Windows/Modbus Master Engine Windows.llb</Property>
<Property Name="Destination[0].type" Type="Str">LLB</Property>
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
<Property Name="Destination[1].path" Type="Path">../Built/Modbus Master/Windows</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Source[0].itemID" Type="Str">{062AE1AA-3147-477B-A639-11359F1A27EA}</Property>
<Property Name="Source[0].itemID" Type="Str">{52476E00-23A4-4B57-887C-8178AEA79F36}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/Modbus Master Engine.lvlib/RT Driver VI.vi</Property>
Expand Down
Binary file modified Source/System Explorer/Initialization VI.vi
View file
Binary file not shown.
Binary file modified Source/System Explorer/SubVIs/Add AI Register.vi
View file
Binary file not shown.
Binary file modified Source/System Explorer/SubVIs/Add AO Register.vi
View file
Binary file not shown.
Binary file modified Source/System Explorer/SubVIs/Add DI Coil.vi
View file
Binary file not shown.
Binary file modified Source/System Explorer/SubVIs/Add DO Coil - Right Click.vi
View file
Binary file not shown.
Binary file modified Source/System Explorer/SubVIs/Add DO Coil.vi
View file
Binary file not shown.
Binary file modified Source/System Explorer/SubVIs/Add Groups.vi
View file
Binary file not shown.
Binary file modified Source/System Explorer/SubVIs/CSV/Import From Config.vi
View file
Binary file not shown.
Binary file modified Source/System Explorer/SubVIs/CSV/SubVIs/Read Interface Configs.vi
View file
Binary file not shown.

0 comments on commit 05220dc

Please sign in to comment.