diff --git a/Main_IDD_Pad_Print_V_3_1.vi b/Main_IDD_Pad_Print_V_3_1.vi index f465c4703f47dcaf8b9d0a89af333c8b36d71109..e57de4a4750dd5e7c9484dcae92ee421174718ed 100644 Binary files a/Main_IDD_Pad_Print_V_3_1.vi and b/Main_IDD_Pad_Print_V_3_1.vi differ diff --git a/Pad_Print_v3_1.lvlib b/Pad_Print_v3_1.lvlib index a88a3f24e9967b0a29150533f96abae482e31f90..f2d727b6ed79f5cb3eeb854d6c5cec35009344e6 100644 --- a/Pad_Print_v3_1.lvlib +++ b/Pad_Print_v3_1.lvlib @@ -105,6 +105,7 @@ <Item Name="variables.ctl" Type="VI" URL="../variables.ctl"/> </Item> <Item Name="VIs" Type="Folder"> + <Item Name="actor_state_machine.vi" Type="VI" URL="../actor_state_machine.vi"/> <Item Name="axis_activate.vi" Type="VI" URL="../axis_activate.vi"/> <Item Name="build_measurement_cluster.vi" Type="VI" URL="../build_measurement_cluster.vi"/> <Item Name="calibrate force sensor.vi" Type="VI" URL="../calibrate force sensor.vi"/> @@ -112,6 +113,9 @@ <Item Name="create_actual_internal_values_array.vi" Type="VI" URL="../create_actual_internal_values_array.vi"/> <Item Name="create_FileName.vi" Type="VI" URL="../create_FileName.vi"/> <Item Name="enqueue_command.vi" Type="VI" URL="../enqueue_command.vi"/> + <Item Name="find_systems.vi" Type="VI" URL="../find_systems.vi"/> + <Item Name="FPGA_loadCell_Host_example.vi" Type="VI" URL="../FPGA_loadCell_Host_example.vi"/> + <Item Name="loadCell_init.vi" Type="VI" URL="../loadCell_init.vi"/> <Item Name="loadCell_measurement.vi" Type="VI" URL="../loadCell_measurement.vi"/> <Item Name="read_axis_errors.vi" Type="VI" URL="../read_axis_errors.vi"/> <Item Name="read_boolean_sensors.vi" Type="VI" URL="../read_boolean_sensors.vi"/> diff --git a/find_systems.vi b/find_systems.vi index 3afc013820dc7d50ba7c6e97efa22e30e23529bf..beb46c00e38f380d4694a46d49856ca8602225f2 100644 Binary files a/find_systems.vi and b/find_systems.vi differ diff --git a/loadCell_init.vi b/loadCell_init.vi index 624f3687f0b4cf946ebabe7d83ac9e60e7dad433..86719ba22bd617b0a64877746fb7b7db5a927578 100644 Binary files a/loadCell_init.vi and b/loadCell_init.vi differ diff --git a/pad_print_v3_1.lvproj b/pad_print_v3_1.lvproj index daa591637e3b8176f5de898c79257f37c33cf57d..420ec07a03261bb37f3c3f8d0dc7b91a961deebe 100644 --- a/pad_print_v3_1.lvproj +++ b/pad_print_v3_1.lvproj @@ -152,7 +152,6 @@ <Property Name="server.viscripting.showScriptingOperationsInEditor" Type="Bool">false</Property> <Property Name="specify.custom.address" Type="Bool">false</Property> <Item Name="UI_IDD_Pad_Print_V_3.1.vi" Type="VI" URL="../UI_IDD_Pad_Print_V_3.1.vi"/> - <Item Name="Pad_Print_PC_v3.lvlib" Type="Library" URL="../Pad_Print_PC_v3.lvlib"/> <Item Name="test_hdf_2.vi" Type="VI" URL="../test_hdf_2.vi"/> <Item Name="Pad_Print_v3_1.lvlib" Type="Library" URL="../Pad_Print_v3_1.lvlib"/> <Item Name="Dependencies" Type="Dependencies"> @@ -225,6 +224,10 @@ <Item Name="Shunt Calibration and Offset Nulling Measurements.ctl" Type="VI" URL="../../../../Program Files (x86)/National Instruments/LabVIEW 2020/examples/CompactRIO/Module Specific/NI 9237/NI 9237 Getting Started/Shunt Calibration and Offset Nulling Measurements.ctl"/> <Item Name="Module Configurations.ctl" Type="VI" URL="../../../../Program Files (x86)/National Instruments/LabVIEW 2020/examples/CompactRIO/Module Specific/NI 9237/NI 9237 Getting Started/Module Configurations.ctl"/> <Item Name="Ratio to Microstrain (SubVI).vi" Type="VI" URL="../../../../Program Files (x86)/National Instruments/LabVIEW 2020/examples/CompactRIO/Module Specific/NI 9237/NI 9237 Getting Started/Ratio to Microstrain (SubVI).vi"/> + <Item Name="Calculate Measurements (SubVI).vi" Type="VI" URL="../../../../Program Files (x86)/National Instruments/LabVIEW 2020/examples/CompactRIO/Module Specific/NI 9237/NI 9237 Getting Started/Calculate Measurements (SubVI).vi"/> + <Item Name="ShuntCalibrationOutputCalculation (SubVI).vi" Type="VI" URL="../../../../Program Files (x86)/National Instruments/LabVIEW 2020/examples/CompactRIO/Module Specific/NI 9237/NI 9237 Getting Started/ShuntCalibrationOutputCalculation (SubVI).vi"/> + <Item Name="padprintv31_FPGATarget_FPGAloadCellexam_StK4biHTQmA.lvbitx" Type="Document" URL="//130.83.101.248/post/LabVIEW_Pruefstand/pad_print_v3_2020/Version_Real_Working/pad_print_AJ_V0-7_change ip/FPGA Bitfiles/padprintv31_FPGATarget_FPGAloadCellexam_StK4biHTQmA.lvbitx"/> + <Item Name="Pad_Print_PC_v3.lvlib" Type="Library" URL="../Pad_Print_PC_v3.lvlib"/> </Item> <Item Name="Build Specifications" Type="Build"/> </Item> @@ -240,6 +243,7 @@ <Property Name="host.TargetOSID" Type="UInt">19</Property> <Property Name="host.TargetUIEnabled" Type="Bool">false</Property> <Property Name="mathScriptPath" Type="Str">C:\Users\Fabian Post\Documents\LabVIEW Data</Property> + <Property Name="NI.SortType" Type="Int">3</Property> <Property Name="target.cleanupVisa" Type="Bool">false</Property> <Property Name="target.Deployment_DownloadInstallerPath" Type="Path"></Property> <Property Name="target.Deployment_SilentInstallation" Type="Bool">false</Property> @@ -3028,12 +3032,9 @@ DirectoryIndex index.htm </Item> </Item> </Item> - <Item Name="find_systems.vi" Type="VI" URL="../find_systems.vi"/> - <Item Name="FPGA_loadCell_Host_example.vi" Type="VI" URL="../FPGA_loadCell_Host_example.vi"/> - <Item Name="loadCell_init.vi" Type="VI" URL="../loadCell_init.vi"/> <Item Name="Main_IDD_Pad_Print_V_3_1.vi" Type="VI" URL="../Main_IDD_Pad_Print_V_3_1.vi"/> - <Item Name="Pad_Print_v3_1.lvlib" Type="Library" URL="../Pad_Print_v3_1.lvlib"/> <Item Name="Reinitialize with FPGA_self.vi" Type="VI" URL="../Reinitialize with FPGA_self.vi"/> + <Item Name="Pad_Print_v3_1.lvlib" Type="Library" URL="../Pad_Print_v3_1.lvlib"/> <Item Name="test_v3_1.lvlib" Type="Library" URL="../test_v3_1.lvlib"/> <Item Name="Dependencies" Type="Dependencies"> <Item Name="vi.lib" Type="Folder"> @@ -3128,11 +3129,9 @@ DirectoryIndex index.htm <Item Name="whitespace.ctl" Type="VI" URL="/<vilib>/Utility/error.llb/whitespace.ctl"/> </Item> <Item Name="actor_dequeue_state.vi" Type="VI" URL="../actor_dequeue_state.vi"/> - <Item Name="actor_state_machine.vi" Type="VI" URL="../actor_state_machine.vi"/> <Item Name="Calculate Measurements (SubVI).vi" Type="VI" URL="../../../../Program Files (x86)/National Instruments/LabVIEW 2020/examples/CompactRIO/Module Specific/NI 9237/NI 9237 Getting Started/Calculate Measurements (SubVI).vi"/> <Item Name="Global.vi" Type="VI" URL="../C/Program Files (x86)/National Instruments/LabVIEW 2013/examples/Motion/PropertyNodes/Axis Line Move State Machine/Global.vi"/> <Item Name="lvanlys.dll" Type="Document" URL="/<resource>/lvanlys.dll"/> - <Item Name="main prog cont switch.ctl" Type="VI" URL="../../../extra/pad_print_test2/main prog cont switch.ctl"/> <Item Name="Module Configurations.ctl" Type="VI" URL="../../../../Program Files (x86)/National Instruments/LabVIEW 2020/examples/CompactRIO/Module Specific/NI 9237/NI 9237 Getting Started/Module Configurations.ctl"/> <Item Name="Module Configurations_self.ctl" Type="VI" URL="../Module Configurations_self.ctl"/> <Item Name="NiFpgaLv.dll" Type="Document" URL="NiFpgaLv.dll"> @@ -3150,7 +3149,7 @@ DirectoryIndex index.htm <Item Name="ShuntCalibrationOutputCalculation (SubVI).vi" Type="VI" URL="../../../../Program Files (x86)/National Instruments/LabVIEW 2020/examples/CompactRIO/Module Specific/NI 9237/NI 9237 Getting Started/ShuntCalibrationOutputCalculation (SubVI).vi"/> <Item Name="Take Avg Measurement (SubVI)_self.vi" Type="VI" URL="../Take Avg Measurement (SubVI)_self.vi"/> <Item Name="Timer (SubVI).vi" Type="VI" URL="../Timer (SubVI).vi"/> - <Item Name="variables.ctl" Type="VI" URL="../../../extra/pad_print_test2/variables.ctl"/> + <Item Name="Hidden Library 3" Type="Document"/> </Item> <Item Name="Build Specifications" Type="Build"/> </Item>