commit v 2.2.0

BloomyControls · Jul 12, 2024 · c01537b · c01537b
1 parent 5b1aff5
commit c01537b
Show file tree

Hide file tree

Showing 115 changed files with 927 additions and 334 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ LabVIEW 2021
 ## Dependencies
 - [NI LabVIEW 2021 64-bit or later](https://www.ni.com/en/support/downloads/software-products/download.labview.html)
 - [LabVIEW Real-Time Module](https://www.ni.com/en/support/downloads/software-products/download.labview-real-time-module.html)
-- [NI VeriStand and LabVIEW API](https://www.ni.com/en/support/downloads/software-products/download.veristand.html)
+- [NI VeriStand and VeriStand LabVIEW API](https://www.ni.com/en/support/downloads/software-products/download.veristand.html)
 - [VeriStand Custom Device Development Tools](https://github.com/ni/niveristand-custom-device-development-tools)
 
 
diff --git a/src/Custom Device Software Multi-Plex.xml b/src/Custom Device Software Multi-Plex.xml
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<CustomDevice xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Custom Device.xsd">
-	<XSDVersion Major="2010" Minor="0" Fix="0" Build="0" />
+<?xml version="1.0" encoding="utf-8" standalone="no" ?><CustomDevice xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Custom Device.xsd">
+	<XSDVersion Build="0" Fix="0" Major="2010" Minor="0"/>
 	<AddMenu>
 		<eng>Software Multi-Plex</eng>
 		<loc>Software Multi-Plex</loc>
 	</AddMenu>
-	<Version>2.1.0</Version>
+	<Version>2.2.0</Version>
 	<Type>Inline HW Interface</Type>
 	<MaxOccurrence>100</MaxOccurrence>
 	<MainPageGUID>8413aea8-b960-4338-8def-49dbabb5ab11</MainPageGUID>
 	<InitializationVI>
 		<Type>Action</Type>
 		<Item2Launch>
 			<Type>To Common Doc Dir</Type>
-			<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.llb\Initialization VI.vi</Path>
+			<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.lvlibp\System Explorer\Initialization VI.vi</Path>
 		</Item2Launch>
 	</InitializationVI>
 	<CustomDeviceVI>
@@ -22,21 +21,21 @@
 				<SupportedTarget>Windows</SupportedTarget>
 				<Source>
 					<Type>To Common Doc Dir</Type>
-					<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Engine Windows.llb\RT Driver VI.vi</Path>
+					<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Engine Windows.lvlibp\Engine\RT Driver VI.vi</Path>
 				</Source>
-				<RealTimeSystemDestination>c:\ni-rt\VeriStand\Custom Devices\Software Multi-Plex\Software Multi-Plex Engine Windows.llb\RT Driver VI.vi</RealTimeSystemDestination>
+				<RealTimeSystemDestination>c:\ni-rt\VeriStand\Custom Devices\Software Multi-Plex\Software Multi-Plex Engine Windows.lvlibp\Engine\RT Driver VI.vi</RealTimeSystemDestination>
 			</Source>
 			<Source>
 				<SupportedTarget>Linux_x64</SupportedTarget>
 				<Source>
 					<Type>To Common Doc Dir</Type>
-					<Path>Custom Devices\Software Multi-Plex\Linux_x64\Software Multi-Plex Engine Linux64.llb\RT Driver VI.vi</Path>
+					<Path>Custom Devices\Software Multi-Plex\Linux_x64\Software Multi-Plex Engine Linux64.lvlibp\Engine\RT Driver VI.vi</Path>
 				</Source>
-				<RealTimeSystemDestination>c:\ni-rt\VeriStand\Custom Devices\Software Multi-Plex\Software Multi-Plex Engine Linux64.llb\RT Driver VI.vi</RealTimeSystemDestination>
+				<RealTimeSystemDestination>c:\ni-rt\VeriStand\Custom Devices\Software Multi-Plex\Software Multi-Plex Engine Linux64.lvlibp\Engine\RT Driver VI.vi</RealTimeSystemDestination>
 			</Source>
 		</SourceDistribution>
 	</CustomDeviceVI>
-	<Dependencies />
+	<Dependencies/>
 	<Pages>
 		<Page>
 			<Name>
@@ -50,7 +49,7 @@
 			</Glyph>
 			<Item2Launch>
 				<Type>To Common Doc Dir</Type>
-				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.llb\Main Page.vi</Path>
+				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.lvlibp\System Explorer\Main Page.vi</Path>
 			</Item2Launch>
 			<RunTimeMenu>
 				<MenuItem>
@@ -63,7 +62,7 @@
 					</Name>
 					<Item2Launch>
 						<Type>To Common Doc Dir</Type>
-						<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.llb\Export Configuration RTM.vi</Path>
+						<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.lvlibp\System Explorer\Export Configuration RTM.vi</Path>
 					</Item2Launch>
 				</MenuItem>
 			</RunTimeMenu>
@@ -96,7 +95,7 @@
 			</ButtonList>
 			<ActionVIOnCompile>
 				<Type>To Common Doc Dir</Type>
-				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.llb\ActionVIOnCompile.vi</Path>
+				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.lvlibp\System Explorer\ActionVIOnCompile.vi</Path>
 			</ActionVIOnCompile>
 		</Page>
 		<Page>
@@ -111,7 +110,7 @@
 			</Glyph>
 			<Item2Launch>
 				<Type>To Common Doc Dir</Type>
-				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.llb\Channel.vi</Path>
+				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.lvlibp\System Explorer\Channel.vi</Path>
 			</Item2Launch>
 		</Page>
 		<Page>
@@ -128,7 +127,7 @@
 			</Glyph>
 			<Item2Launch>
 				<Type>To Common Doc Dir</Type>
-				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.llb\Selector.vi</Path>
+				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.lvlibp\System Explorer\Selector.vi</Path>
 			</Item2Launch>
 		</Page>
 		<Page>
@@ -145,7 +144,7 @@
 			</Glyph>
 			<Item2Launch>
 				<Type>To Common Doc Dir</Type>
-				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.llb\Input.vi</Path>
+				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.lvlibp\System Explorer\Input.vi</Path>
 			</Item2Launch>
 		</Page>
 		<Page>
@@ -162,11 +161,11 @@
 			</Glyph>
 			<Item2Launch>
 				<Type>To Common Doc Dir</Type>
-				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.llb\Output.vi</Path>
+				<Path>Custom Devices\Software Multi-Plex\Windows\Software Multi-Plex Configuration.lvlibp\System Explorer\Output.vi</Path>
 			</Item2Launch>
 		</Page>
 	</Pages>
 	<CustomXML>
-		<Dummy></Dummy>
+		<Dummy/>
 	</CustomXML>
 </CustomDevice>
diff --git a/src/Engine/Initialize VeriStand Globals.vi b/src/Engine/Initialize VeriStand Globals.vi
diff --git a/src/Engine/Mult-Plex Switch POC.Async.vi b/src/Engine/Mult-Plex Switch POC.Async.vi
diff --git a/src/Engine/Multi-Plex.vi b/src/Engine/Multi-Plex.vi
diff --git a/src/Engine/RT Driver VI.vi b/src/Engine/RT Driver VI.vi
diff --git a/src/Engine/RTStateVariables.ctl b/src/Engine/RTStateVariables.ctl
diff --git a/src/Engine/Software Multi-Plex Engine.lvlib b/src/Engine/Software Multi-Plex Engine.lvlib
@@ -6,6 +6,7 @@
 	<Item Name="Engine" Type="Folder">
 		<Item Name="Init" Type="Folder"/>
 		<Item Name="Run" Type="Folder">
+			<Item Name="Initialize VeriStand Globals.vi" Type="VI" URL="../Initialize VeriStand Globals.vi"/>
 			<Item Name="Mult-Plex Switch POC.Async.vi" Type="VI" URL="../Mult-Plex Switch POC.Async.vi"/>
 			<Item Name="Multi-Plex.vi" Type="VI" URL="../Multi-Plex.vi"/>
 		</Item>

diff --git a/src/Help/Build CHM.cfg b/src/Help/Build CHM.cfg
diff --git a/src/Help/Build CHM.log b/src/Help/Build CHM.log
diff --git a/src/Help/Build CHM.vi b/src/Help/Build CHM.vi
diff --git a/src/Help/HTML Help Source/Main.htm b/src/Help/HTML Help Source/Main.htm
@@ -78,6 +78,11 @@ <h2>Version History</h2>
 					<td>March 2024</td>
 					<td>Update build for VeriStand 2021+ support, removed unsupported targets.</td>
 				</tr>
+				<tr>
+					<td><strong>2.2.0</strong></td>
+					<td>July 2024</td>
+					<td>Update for PPL build and to replace CHM help file.</td>
+				</tr>
 			</table>
 		</p>
 

diff --git a/src/Help/HTML Help Source/Page1.htm b/src/Help/HTML Help Source/Page1.htm
diff --git a/src/Help/HTML Help Source/Page2.htm b/src/Help/HTML Help Source/Page2.htm
diff --git a/src/Help/HTML Help Source/Page3.htm b/src/Help/HTML Help Source/Page3.htm
diff --git a/src/Help/Software Multi-Plex.chm b/src/Help/Software Multi-Plex.chm
diff --git a/src/Help/Software Multi-Plex.hhp b/src/Help/Software Multi-Plex.hhp
diff --git a/src/Help/html_template.htm b/src/Help/html_template.htm
diff --git a/src/Shared/Compiled.Settings.ctl b/src/Shared/Compiled.Settings.ctl