Spinnaker: update to 4.0.0.116

Note: 4.0.0.116 dropped support for windows-x86

.github/actions/deploy-centos/action.yml

@@ -156,8 +156,8 @@ runs:
 
         if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "spinnaker" ]]; then
           echo Installing Spinnaker amd64
-          python3 -m gdown.cli https://drive.google.com/uc?id=1B91OxuFgT-T29fNlBc2gsgr-K2l2LNtw
-          tar -xzvf spinnaker-3.0.0.118-amd64-pkg.tar.gz
+          python3 -m gdown.cli https://drive.google.com/file/d/1Xapzvxrgx1w3RCbAOFILaNCZwpusB_VA
+          tar -xzvf spinnaker-4.0.0.116-amd64-pkg-22.04.tar.gz
           find -name *.deb | while read f; do ar -xv $f; tar --totals -xvf data.tar.xz -C /; done;
         fi
 

.github/actions/deploy-ubuntu/action.yml

@@ -272,8 +272,8 @@ runs:
 
         if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "spinnaker" ]]; then
           echo Installing Spinnaker amd64
-          python3 -m gdown.cli https://drive.google.com/uc?id=1B91OxuFgT-T29fNlBc2gsgr-K2l2LNtw
-          tar -xzvf spinnaker-3.0.0.118-amd64-pkg.tar.gz
+          python3 -m gdown.cli https://drive.google.com/file/d/1Xapzvxrgx1w3RCbAOFILaNCZwpusB_VA
+          tar -xzvf spinnaker-4.0.0.116-amd64-pkg-22.04.tar.gz
           find -name *.deb | while read f; do ar -xv $f; $SUDO tar --totals -xvf data.tar.xz -C /; done;
         fi
 

.github/actions/deploy-windows/action.yml

@@ -180,17 +180,17 @@ runs:
           python -m gdown.cli https://drive.google.com/uc?id=17GagcVjj2Gv6WswJR86_DKw9jLEfHHdo
           python -m gdown.cli https://drive.google.com/uc?id=1i93o2rFPtRKrCGBH2bUL5FQZchrDzrDe
           rem We can get these msi files by starting the installation from the exe file
-          cmd.exe /c "msiexec /quiet /i Spinnaker-3.0.0.118_Binaries_v140_x86.msi ADDLOCAL=ALL"
-          cmd.exe /c "msiexec /quiet /i Spinnaker-3.0.0.118_SourceCode_v140_x86.msi ADDLOCAL=ALL"
+          cmd.exe /c "msiexec /quiet /i Spinnaker-4.0.0.116_Binaries_v140_x86.msi ADDLOCAL=ALL"
+          cmd.exe /c "msiexec /quiet /i Spinnaker-4.0.0.116_SourceCode_v140_x86.msi ADDLOCAL=ALL"
         )
 
         if "%CI_DEPLOY_PLATFORM%"=="windows-x86_64" if "%CI_DEPLOY_MODULE%"=="spinnaker" (
           echo Installing Spinnaker x64
-          python -m gdown.cli https://drive.google.com/uc?id=12AkFMckbDqxFudYGWwaSLT7omOTtuRJt
-          python -m gdown.cli https://drive.google.com/uc?id=1_SUnBQnv4czISJWVFnbxxWRZM6d2yzZK
+          python -m gdown.cli https://drive.google.com/file/d/1d0HHDHsPcgs-Pnw0u8KeeFlK79T1DQhf
+          python -m gdown.cli https://drive.google.com/file/d/18cWXUhL6aFs57Q73aVWT1BF_--pzoMha
           rem We can get these msi files by starting the installation from the exe file
-          cmd.exe /c "msiexec /quiet /i Spinnaker-3.0.0.118_Binaries_v140_x64.msi ADDLOCAL=ALL"
-          cmd.exe /c "msiexec /quiet /i Spinnaker-3.0.0.118_SourceCode_v140_x64.msi ADDLOCAL=ALL"
+          cmd.exe /c "msiexec /quiet /i Spinnaker_4.0.0.116_Binaries_v140_x64.msi ADDLOCAL=ALL"
+          cmd.exe /c "msiexec /quiet /i Spinnaker_4.0.0.116_SourceCode_v140_x64.msi ADDLOCAL=ALL"
         )
 
         set GRADLE_TASK=publishToMavenLocal

.github/workflows/spinnaker.yml

@@ -19,19 +19,14 @@ env:
 jobs:
   linux-x86_64:
     runs-on: ubuntu-20.04
-    container: centos:7
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
-  windows-x86:
-    runs-on: windows-2019
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   windows-x86_64:
     runs-on: windows-2019
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   redeploy:
-    needs: [linux-x86_64, windows-x86, windows-x86_64]
+    needs: [linux-x86_64, windows-x86_64]
     runs-on: ubuntu-20.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

ci/install-travis.sh

@@ -123,16 +123,16 @@ if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ an
   fi 
   if [[ "$PROJ" =~ spinnaker ]]; then
     if [ "$OS" == "linux-x86_64" ]; then
-        if [[ $(find $HOME/downloads/spinnaker-3.0.0.118-amd64-pkg.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then
+        if [[ $(find $HOME/downloads/spinnaker-4.0.0.116-amd64-pkg-22.04.tar.gz -type f -size +1000000c 2>/dev/null) ]]; then
           echo "Found spinnaker in cache and size seems ok"
         else
           echo "Downloading spinnaker as not found in cache or too small"
-          python $TRAVIS_BUILD_DIR/ci/gDownload.py 1ILDEZk0SuOoh4_cJExpZJCPXCqfxUkAi $HOME/downloads/spinnaker-3.0.0.118-amd64-pkg.tar.gz
+          python $TRAVIS_BUILD_DIR/ci/gDownload.py 1Xapzvxrgx1w3RCbAOFILaNCZwpusB_VA $HOME/downloads/spinnaker-4.0.0.116-amd64-pkg.tar.gz
         fi
-        tar xzvf $HOME/downloads/spinnaker-spinnaker-3.0.0.118-amd64-pkg.tar.gz -C $TRAVIS_BUILD_DIR/../
-        ls $TRAVIS_BUILD_DIR/../spinnaker-3.0.0.118-amd64/*.deb | while read fName; do ar vx $fName; tar -xvf data.tar.xz; done;
-        ln -s libSpinnaker_C.so.3.0.0.118 usr/lib/libSpinnaker_C.so.1
-        ln -s libSpinnaker.so.3.0.0.118 usr/lib/libSpinnaker.so.1
+        tar xzvf $HOME/downloads/spinnaker-spinnaker-4.0.0.116-amd64-pkg-22.04.tar.gz -C $TRAVIS_BUILD_DIR/../
+        ls $TRAVIS_BUILD_DIR/../spinnaker-4.0.0.116-amd64/*.deb | while read fName; do ar vx $fName; tar -xvf data.tar.xz; done;
+        ln -s libSpinnaker_C.so.4.0.0.116 usr/lib/libSpinnaker_C.so.1
+        ln -s libSpinnaker.so.4.0.0.116 usr/lib/libSpinnaker.so.1
         cp -a usr $TRAVIS_BUILD_DIR/../
         docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "cp -a $HOME/build/usr/* /usr/"
     fi

ci/install-windows.sh

@@ -80,27 +80,16 @@ fi
 if [[ "$PROJ" =~ spinnaker ]]; then
        echo Spinnaker install
        if [ "$OS" == "windows-x86_64" ]; then
-           if [[ $(find /c/Downloads/Spinnaker_3.0.0.118_*_v140_x64.msi -type f -size +1000000c 2>/dev/null) ]]; then
+           if [[ $(find /c/Downloads/Spinnaker_4.0.0.116_*_v140_x64.msi -type f -size +1000000c 2>/dev/null) ]]; then
              echo "Found spinnaker in cache and size seems ok"
            else
              echo "Downloading spinnaker to cache as not found"
-             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 12AkFMckbDqxFudYGWwaSLT7omOTtuRJt /c/Downloads/Spinnaker_3.0.0.118_Binaries_v140_x64.msi
-             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1_SUnBQnv4czISJWVFnbxxWRZM6d2yzZK /c/Downloads/Spinnaker_3.0.0.118_SourceCode_v140_x64.msi
+             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1d0HHDHsPcgs-Pnw0u8KeeFlK79T1DQhf /c/Downloads/Spinnaker_4.0.0.116_Binaries_v140_x64.msi
+             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 18cWXUhL6aFs57Q73aVWT1BF_--pzoMha /c/Downloads/Spinnaker_4.0.0.116_SourceCode_v140_x64.msi
            fi
            # we can get these msi files by starting the installation from the exe file
-           cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_3.0.0.118_Binaries_v140_x64.msi ADDLOCAL=ALL'
-           cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_3.0.0.118_SourceCode_v140_x64.msi ADDLOCAL=ALL'
-       elif [ "$OS" == "windows-x86" ]; then
-           if [[ $(find /c/Downloads/Spinnaker_3.0.0.118_*_v140_x86.msi -type f -size +1000000c 2>/dev/null) ]]; then
-             echo "Found spinnaker32 in cache and size seems ok"
-           else
-             echo "Downloading spinnaker32 to cache as not found"
-             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 17GagcVjj2Gv6WswJR86_DKw9jLEfHHdo /c/Downloads/Spinnaker_3.0.0.118_Binaries_v140_x86.msi
-             /c/python27/python $APPVEYOR_BUILD_FOLDER/ci/gDownload.py 1i93o2rFPtRKrCGBH2bUL5FQZchrDzrDe /c/Downloads/Spinnaker_3.0.0.118_SourceCode_v140_x86.msi
-           fi
-           # we can get these msi files by starting the installation from the exe file
-           cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_3.0.0.118_Binaries_v140_x86.msi ADDLOCAL=ALL'
-           cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_3.0.0.118_SourceCode_v140_x86.msi ADDLOCAL=ALL'
+           cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_4.0.0.116_Binaries_v140_x64.msi ADDLOCAL=ALL'
+           cmd.exe //c 'msiexec /quiet /i C:\Downloads\Spinnaker_4.0.0.116_SourceCode_v140_x64.msi ADDLOCAL=ALL'
        fi
        echo "Finished spinnaker install"
 fi

platform/pom.xml

@@ -102,7 +102,7 @@
 <!--    <dependency>-->
 <!--      <groupId>org.bytedeco</groupId>-->
 <!--      <artifactId>spinnaker-platform</artifactId>-->
-<!--      <version>3.0.0.118-${project.version}</version>-->
+<!--      <version>4.0.0.116-${project.version}</version>-->
 <!--    </dependency>-->
 <!--    <dependency>-->
 <!--      <groupId>org.bytedeco</groupId>-->

spinnaker/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * Spinnaker 3.0.0.118  https://www.flir.com/products/spinnaker-sdk
+ * Spinnaker 4.0.0.116  https://www.flir.com/products/spinnaker-sdk
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -38,15 +38,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.spinnaker</groupId>
     <artifactId>acquisition_c</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.11-SNAPSHOT</version>
     <properties>
         <exec.mainClass>Acquisition_C</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>spinnaker-platform</artifactId>
-            <version>3.0.0.118-1.5.9</version>
+            <version>4.0.0.116-1.5.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

spinnaker/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-SPINNAKER_VERSION=3.0.0.118
+SPINNAKER_VERSION=4.0.0.116
 
 case $PLATFORM in
     linux-arm*)
@@ -29,8 +29,7 @@ case $PLATFORM in
         fi
         ;;
     windows-*)
-        if [[ ! -d "/C/Program Files/Spinnaker/" ]] && [[ ! -d "/C/Program Files (x86)/Spinnaker/" ]] &&
-           [[ ! -d "/C/Program Files/FLIR Systems/Spinnaker/" ]] && [[ ! -d "/C/Program Files (x86)/FLIR Systems/Spinnaker/" ]]; then
+        if [[ ! -d "/C/Program Files/Teledyne/Spinnaker/" ]]; then
             echo "Please install Spinnaker under the default installation directory"
             exit 1
         fi

spinnaker/platform/pom.xml

@@ -6,13 +6,13 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.11-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.bytedeco</groupId>
   <artifactId>spinnaker-platform</artifactId>
-  <version>3.0.0.118-${project.parent.version}</version>
+  <version>4.0.0.116-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for Spinnaker</name>
 
   <properties>

spinnaker/pom.xml

@@ -6,12 +6,12 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.11-SNAPSHOT</version>
   </parent>
 
   <groupId>org.bytedeco</groupId>
   <artifactId>spinnaker</artifactId>
-  <version>3.0.0.118-${project.parent.version}</version>
+  <version>4.0.0.116-${project.parent.version}</version>
   <name>JavaCPP Presets for Spinnaker</name>
 
   <dependencies>

spinnaker/samples/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.spinnaker</groupId>
     <artifactId>acquisition_c</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.11-SNAPSHOT</version>
     <properties>
         <exec.mainClass>Acquisition_C</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>spinnaker-platform</artifactId>
-            <version>3.0.0.118-1.5.9</version>
+            <version>4.0.0.116-1.5.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/actionCommandResult.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.spinnaker.Spinnaker_C;
 

spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpin.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.spinnaker.Spinnaker_C;
 

spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLDevice.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.spinnaker.Spinnaker_C;
 
@@ -15,7 +15,7 @@
 * \defgroup TLDeviceC_h TLDevice Structures
 * \ingroup CQuickSpin
 */
-/*@{*/
+/**\{*/
 
 @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class)
 public class quickSpinTLDevice extends Pointer {

spinnaker/src/gen/java/org/bytedeco/spinnaker/Spinnaker_C/quickSpinTLInterface.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.spinnaker.Spinnaker_C;
 
@@ -15,7 +15,7 @@
 * \defgroup TLInterfaceC_h TLInterface Structures
 * \ingroup CQuickSpin
 */
-/*@{*/
+/**\{*/
 
 @Properties(inherit = org.bytedeco.spinnaker.presets.Spinnaker_C.class)
 public class quickSpinTLInterface extends Pointer {
@@ -47,12 +47,15 @@ public class quickSpinTLInterface extends Pointer {
 	public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceTransmitLinkSpeed(); public native quickSpinTLInterface GevInterfaceTransmitLinkSpeed(spinNodeHandle setter);
 	public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceReceiveLinkSpeed(); public native quickSpinTLInterface GevInterfaceReceiveLinkSpeed(spinNodeHandle setter);
 	public native @Cast("quickSpinIntegerNode") spinNodeHandle GevInterfaceMTU(); public native quickSpinTLInterface GevInterfaceMTU(spinNodeHandle setter);
+	public native @Cast("quickSpinBooleanNode") spinNodeHandle GevInterfaceIsIPConflict(); public native quickSpinTLInterface GevInterfaceIsIPConflict(spinNodeHandle setter);
 	public native @Cast("quickSpinEnumerationNode") spinNodeHandle POEStatus(); public native quickSpinTLInterface POEStatus(spinNodeHandle setter);
-	public native @Cast("quickSpinEnumerationNode") spinNodeHandle FilterDriverStatus(); public native quickSpinTLInterface FilterDriverStatus(spinNodeHandle setter);
+	public native @Cast("quickSpinEnumerationNode") spinNodeHandle FLIRFilterDriverStatus(); public native quickSpinTLInterface FLIRFilterDriverStatus(spinNodeHandle setter);
+	public native @Cast("quickSpinEnumerationNode") spinNodeHandle TeledyneGigeVisionFilterDriverStatus(); public native quickSpinTLInterface TeledyneGigeVisionFilterDriverStatus(spinNodeHandle setter);
 	public native @Cast("quickSpinIntegerNode") spinNodeHandle GevActionDeviceKey(); public native quickSpinTLInterface GevActionDeviceKey(spinNodeHandle setter);
 	public native @Cast("quickSpinIntegerNode") spinNodeHandle GevActionGroupKey(); public native quickSpinTLInterface GevActionGroupKey(spinNodeHandle setter);
 	public native @Cast("quickSpinIntegerNode") spinNodeHandle GevActionGroupMask(); public native quickSpinTLInterface GevActionGroupMask(spinNodeHandle setter);
 	public native @Cast("quickSpinIntegerNode") spinNodeHandle GevActionTime(); public native quickSpinTLInterface GevActionTime(spinNodeHandle setter);
+	public native @Cast("quickSpinBooleanNode") spinNodeHandle GevActionAckRequired(); public native quickSpinTLInterface GevActionAckRequired(spinNodeHandle setter);
 	public native @Cast("quickSpinCommandNode") spinNodeHandle ActionCommand(); public native quickSpinTLInterface ActionCommand(spinNodeHandle setter);
 	public native @Cast("quickSpinStringNode") spinNodeHandle DeviceUnlock(); public native quickSpinTLInterface DeviceUnlock(spinNodeHandle setter);
 	public native @Cast("quickSpinCommandNode") spinNodeHandle DeviceUpdateList(); public native quickSpinTLInterface DeviceUpdateList(spinNodeHandle setter);
@@ -80,6 +83,9 @@ public class quickSpinTLInterface extends Pointer {
 	public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceSubnetMask(); public native quickSpinTLInterface GevDeviceForceSubnetMask(spinNodeHandle setter);
 	public native @Cast("quickSpinIntegerNode") spinNodeHandle GevDeviceForceGateway(); public native quickSpinTLInterface GevDeviceForceGateway(spinNodeHandle setter);
 	public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceAutoForceIP(); public native quickSpinTLInterface GevDeviceAutoForceIP(spinNodeHandle setter);
+	public native @Cast("quickSpinBooleanNode") spinNodeHandle GevDeviceDiscoveryEnabled(); public native quickSpinTLInterface GevDeviceDiscoveryEnabled(spinNodeHandle setter);
+	public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceEnableDiscovery(); public native quickSpinTLInterface GevDeviceEnableDiscovery(spinNodeHandle setter);
+	public native @Cast("quickSpinCommandNode") spinNodeHandle GevDeviceDisableDiscovery(); public native quickSpinTLInterface GevDeviceDisableDiscovery(spinNodeHandle setter);
 	public native @Cast("quickSpinStringNode") spinNodeHandle HostAdapterName(); public native quickSpinTLInterface HostAdapterName(spinNodeHandle setter);
 	public native @Cast("quickSpinStringNode") spinNodeHandle HostAdapterVendor(); public native quickSpinTLInterface HostAdapterVendor(spinNodeHandle setter);
 	public native @Cast("quickSpinStringNode") spinNodeHandle HostAdapterDriverVersion(); public native quickSpinTLInterface HostAdapterDriverVersion(spinNodeHandle setter);