Adds handling of imaqdx timeouts and new support for variable address…

… syntax
CUASAS · Apr 4, 2023 · 06d0b84 · 06d0b84
1 parent 5010401
commit 06d0b84
Show file tree

Hide file tree

Showing 29 changed files with 8 additions and 7 deletions.
diff --git a/Gantry/Gantry.lvproj b/Gantry/Gantry.lvproj
@@ -460,7 +460,7 @@
 				<Property Name="INST_defaultDir" Type="Str">{B12F01E5-4A2E-4EE3-886B-8C8FC28D575C}</Property>
 				<Property Name="INST_installerName" Type="Str">setup.exe</Property>
 				<Property Name="INST_productName" Type="Str">gScript Installer</Property>
-				<Property Name="INST_productVersion" Type="Str">1.0.41</Property>
+				<Property Name="INST_productVersion" Type="Str">1.0.42</Property>
 				<Property Name="InstSpecBitness" Type="Str">64-bit</Property>
 				<Property Name="InstSpecVersion" Type="Str">22318008</Property>
 				<Property Name="MSI_arpCompany" Type="Str">Univ. of Nebraska-Lincoln</Property>
@@ -554,7 +554,7 @@
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{E3967936-BB90-4A8B-B1DB-B1EF1C9DC66C}</Property>
-				<Property Name="Bld_version.build" Type="Int">12</Property>
+				<Property Name="Bld_version.build" Type="Int">13</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">gScript Camera Helper.exe</Property>
 				<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/gScript Camera Helper/gScript Camera Helper.exe</Property>
@@ -595,7 +595,7 @@
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
 				<Property Name="Bld_postActionVIID" Type="Ref">/My Computer/Post-Build Action.vi</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{45EEE2F0-5F8B-4AB5-A3E3-6D0FA7413227}</Property>
-				<Property Name="Bld_version.build" Type="Int">40</Property>
+				<Property Name="Bld_version.build" Type="Int">41</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">gScript Interpreter.exe</Property>
 				<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/gScript Interpreter/gScript Interpreter.exe</Property>
@@ -681,7 +681,7 @@
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{6DF3558C-9506-46AF-8F13-01812F5AB42C}</Property>
-				<Property Name="Bld_version.build" Type="Int">14</Property>
+				<Property Name="Bld_version.build" Type="Int">15</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">gScript Path Visualizer.exe</Property>
 				<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/gScript Path Visualizer/gScript Path Visualizer.exe</Property>
@@ -721,7 +721,7 @@
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{CDAF973B-90B9-40CD-B56C-EE97CF390EAA}</Property>
-				<Property Name="Bld_version.build" Type="Int">13</Property>
+				<Property Name="Bld_version.build" Type="Int">14</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">gScript Pattern Recognition Tuner.exe</Property>
 				<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/gScript Pattern Recognition Tuner/gScript Pattern Recognition Tuner.exe</Property>
@@ -761,7 +761,7 @@
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{5D18E17D-CBC4-46AB-A4CA-0D2437EE6AE2}</Property>
-				<Property Name="Bld_version.build" Type="Int">16</Property>
+				<Property Name="Bld_version.build" Type="Int">17</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">Post-Install Action.exe</Property>
 				<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/Post-Install Action/Post-Install Action.exe</Property>

diff --git a/Gantry/Shared Components/Vision/grab image.vi b/Gantry/Shared Components/Vision/grab image.vi
diff --git a/Gantry/gScript Application/gScript Documentation.md b/Gantry/gScript Application/gScript Documentation.md
@@ -806,10 +806,11 @@ Creates a composite image centered at `loc` with size `x-size` by `y-size`.
 
 #### `FINDFID`
 
-*Format:* `FINDFID loc fidtype`
+*Format:* `FINDFID loc fidtype verbose`
 
   - `loc`: Location of the fiducial in gantry coordinates. If no fiducial was found, the result will be {-1,0,0,0} and an error will be thrown.
   - `fidtype`: Specify the type of fiducial you want to find. Needs to correspond to a section in the `vision.*` namespace in `flex_config.txt`.
+  - `verbose`: **Optional**, supply the literal string "verbose" to output debug information to the console.
 
 ### Vacuum Commands
 

diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_AUTOFOCUS.vi b/Gantry/gScript Application/gScript Interpreter/CMD_AUTOFOCUS.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_CALL.vi b/Gantry/gScript Application/gScript Interpreter/CMD_CALL.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_FINDFID.vi b/Gantry/gScript Application/gScript Interpreter/CMD_FINDFID.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_FIT.vi b/Gantry/gScript Application/gScript Interpreter/CMD_FIT.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_FITCIRCLE.vi b/Gantry/gScript Application/gScript Interpreter/CMD_FITCIRCLE.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_FITLINE.vi b/Gantry/gScript Application/gScript Interpreter/CMD_FITLINE.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_FLEXWRITE.vi b/Gantry/gScript Application/gScript Interpreter/CMD_FLEXWRITE.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_LOADSTAMP.vi b/Gantry/gScript Application/gScript Interpreter/CMD_LOADSTAMP.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_MOVENAME.vi b/Gantry/gScript Application/gScript Interpreter/CMD_MOVENAME.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_MOVEREL.vi b/Gantry/gScript Application/gScript Interpreter/CMD_MOVEREL.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_MOVESAFE.vi b/Gantry/gScript Application/gScript Interpreter/CMD_MOVESAFE.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_MOVETO.vi b/Gantry/gScript Application/gScript Interpreter/CMD_MOVETO.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_PICKPART.vi b/Gantry/gScript Application/gScript Interpreter/CMD_PICKPART.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_PLACEPART.vi b/Gantry/gScript Application/gScript Interpreter/CMD_PLACEPART.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_POTDOT.vi b/Gantry/gScript Application/gScript Interpreter/CMD_POTDOT.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_POTLINE.vi b/Gantry/gScript Application/gScript Interpreter/CMD_POTLINE.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_RETURN.vi b/Gantry/gScript Application/gScript Interpreter/CMD_RETURN.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_ROTATE.vi b/Gantry/gScript Application/gScript Interpreter/CMD_ROTATE.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_ROTATETO.vi b/Gantry/gScript Application/gScript Interpreter/CMD_ROTATETO.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_SETLIGHT.vi b/Gantry/gScript Application/gScript Interpreter/CMD_SETLIGHT.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_SETVAC.vi b/Gantry/gScript Application/gScript Interpreter/CMD_SETVAC.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_SURVEY.vi b/Gantry/gScript Application/gScript Interpreter/CMD_SURVEY.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_TRANSFORMG2L.vi b/Gantry/gScript Application/gScript Interpreter/CMD_TRANSFORMG2L.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/CMD_TRANSFORML2G.vi b/Gantry/gScript Application/gScript Interpreter/CMD_TRANSFORML2G.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/Read Value.vi b/Gantry/gScript Application/gScript Interpreter/Read Value.vi
diff --git a/Gantry/gScript Application/gScript Interpreter/Write Value.vi b/Gantry/gScript Application/gScript Interpreter/Write Value.vi