Merge pull request #4 from jancumps/feature-set-2

merge Feature set 2
jancumps · Aug 11, 2023 · 1fd503e · 1fd503e
2 parents f69d27e + d890dfd
commit 1fd503e
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # pico_scpi_labtool_labview_driver
 Virtual Instrument driver for the [Pico SCPI labTool](https://github.com/jancumps/pico_scpi_usbtmc_labtool).  
-This repository contains the driver and examples. Check the [Release page](https://github.com/jancumps/pico_scpi_labtool_labview_driver/releases) for a version that mathes the labTool firmware version.  
+This repository contains the driver and examples. Check the [Release page](https://github.com/jancumps/pico_scpi_labtool_labview_driver/releases) for a version that matches the labTool firmware version.  
 Made with NI LabVIEW Community Edition.  
 [NI Community Edition Software Usage Details](https://www.ni.com/en/support/documentation/supplemental/20/labview-community-edition-usage-details.html)
diff --git a/scpi_driver/Example.vi b/scpi_driver/Example.vi
diff --git a/scpi_driver/Example_analog_read.vi b/scpi_driver/Example_analog_read.vi
diff --git a/scpi_driver/Example_blinky.vi b/scpi_driver/Example_blinky.vi
diff --git a/scpi_driver/Example_digital_out_control.vi b/scpi_driver/Example_digital_out_control.vi
diff --git a/scpi_driver/VI Tree.vi b/scpi_driver/VI Tree.vi
diff --git a/...er/public/Action-Status/Switch Control.vi → ...blic/Action-Status/Digital Out Control.vi b/...er/public/Action-Status/Switch Control.vi → ...blic/Action-Status/Digital Out Control.vi
diff --git a/scpi_driver/public/Data/Read Analog Hires.vi b/scpi_driver/public/Data/Read Analog Hires.vi
diff --git a/scpi_driver/public/Data/Read Analog.vi b/scpi_driver/public/Data/Read Analog.vi
diff --git a/scpi_driver/public/Data/Read Digital Out.vi b/scpi_driver/public/Data/Read Digital Out.vi
diff --git a/scpi_driver/usbtmc_scpi_labtool.lvlib b/scpi_driver/usbtmc_scpi_labtool.lvlib
@@ -10,10 +10,15 @@
 	<Item Name="Public" Type="Folder">
 		<Property Name="NI.LibItem.Scope" Type="Int">1</Property>
 		<Item Name="Action-Status" Type="Folder">
-			<Item Name="Switch Control.vi" Type="VI" URL="../public/Action-Status/Switch Control.vi"/>
+			<Item Name="Digital Out Control.vi" Type="VI" URL="../public/Action-Status/Digital Out Control.vi"/>
+		</Item>
+		<Item Name="Data" Type="Folder">
+			<Item Name="Read Analog Hires.vi" Type="VI" URL="../public/Data/Read Analog Hires.vi"/>
+			<Item Name="Read Analog.vi" Type="VI" URL="../public/Data/Read Analog.vi"/>
+			<Item Name="Read Digital Out.vi" Type="VI" URL="../public/Data/Read Digital Out.vi"/>
 		</Item>
-		<Item Name="Data" Type="Folder"/>
 		<Item Name="Close.vi" Type="VI" URL="../public/Close.vi"/>
 		<Item Name="Initialize.vi" Type="VI" URL="../public/Initialize.vi"/>
+		<Item Name="VI Tree.vi" Type="VI" URL="../VI Tree.vi"/>
 	</Item>
 </Library>
diff --git a/scpi_driver/usbtmc_scpi_labtool.lvproj b/scpi_driver/usbtmc_scpi_labtool.lvproj
@@ -12,8 +12,8 @@
 		<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
 		<Property Name="specify.custom.address" Type="Bool">false</Property>
 		<Item Name="scpi_driver" Type="Folder">
-			<Item Name="Example.vi" Type="VI" URL="../Example.vi"/>
-			<Item Name="Example_blinky.vi" Type="VI" URL="../Example_blinky.vi"/>
+			<Item Name="Example_analog_read.vi" Type="VI" URL="../Example_analog_read.vi"/>
+			<Item Name="Example_digital_out_control.vi" Type="VI" URL="../Example_digital_out_control.vi"/>
 			<Item Name="usbtmc_scpi_labswitch.lvlps" Type="Document" URL="../usbtmc_scpi_labswitch.lvlps"/>
 			<Item Name="usbtmc_scpi_labtool.lvlib" Type="Library" URL="../usbtmc_scpi_labtool.lvlib"/>
 		</Item>
@@ -53,7 +53,6 @@
 				<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
 				<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
 			</Item>
-			<Item Name="increment_generator.vi" Type="VI" URL="../../../../../../ni/labview_common_utilities/building blocks/generic/increment_generator.vi"/>
 		</Item>
 		<Item Name="Build Specifications" Type="Build"/>
 	</Item>