Merge pull request #42 from carnegierobotics/mgjerde/more_logging

Added more log lines and fixed segfault form thread
carnegierobotics · Nov 21, 2024 · b9f0241 · b9f0241
2 parents ff71acc + 3e75893
commit b9f0241
Show file tree

Hide file tree

Showing 4 changed files with 186 additions and 86 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -246,7 +246,6 @@ jobs:
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ubuntu-22.04
-
     steps:
       - name: print install location
         run: echo "My output is ${{ needs.VersionJob.outputs.install_path  }}"
@@ -303,3 +302,67 @@ jobs:
           asset_content_type: application/zip
 
 
+
+  BuildUbuntu24:
+    name: Build and package for Ubuntu 24_04
+    needs: [ReleaseJob, VersionJob]
+    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+    # You can convert this to a matrix build if you need cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-24.04
+    steps:
+      - name: print install location
+        run: echo "My output is ${{ needs.VersionJob.outputs.install_path  }}"
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+
+      - name: Prepare Vulkan SDK
+        uses: humbletim/[email protected]
+        with:
+          vulkan-query-version: 1.3.204.0
+          vulkan-components: Vulkan-Headers, Vulkan-Loader
+          vulkan-use-cache: true
+
+      - name: Install dependencies
+        run: sudo apt-get install -y cmake libx11-dev build-essential xorg-dev libtbb-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libssl-dev libgtk-3-dev libsystemd-dev libwebp-dev
+
+      - name: Configure CMake
+        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGIT_SUBMODULE=OFF -DWARNINGS_AS_ERRORS=FALSE
+
+      - name: Build
+        # Build your program with the given configuration
+        run: cmake --build ${{github.workspace}}/build
+
+      - name: Install
+        working-directory: ${{github.workspace}}/build
+        run: cmake --install . --config ${{env.BUILD_TYPE}}
+
+      - name: Prepare package step
+        working-directory: ${{github.workspace}}/build
+        run: |
+          mkdir ${{ needs.VersionJob.outputs.install_path  }}/DEBIAN && cp ${{github.workspace}}/Assets/Tools/Ubuntu/control ${{ needs.VersionJob.outputs.install_path  }}/DEBIAN/
+          mkdir -p ${{ needs.VersionJob.outputs.install_path  }}/usr/share/applications && cp ${{github.workspace}}/Assets/Tools/Ubuntu/multisense.desktop ${{ needs.VersionJob.outputs.install_path  }}/usr/share/applications/
+          cp ${{github.workspace}}/Assets/Tools/Ubuntu/start.sh ${{ needs.VersionJob.outputs.install_path  }}/opt/multisense/
+          rm -rf ${{ needs.VersionJob.outputs.install_path  }}/opt/multisense/include
+          rm -rf ${{ needs.VersionJob.outputs.install_path  }}/opt/multisense/lib
+          rm -rf ${{ needs.VersionJob.outputs.install_path  }}/opt/multisense/share
+
+      - name: Package
+        working-directory: ${{github.workspace}}/build
+        run: dpkg-deb --build --root-owner-group "${{ needs.VersionJob.outputs.install_path  }}" "${{ needs.VersionJob.outputs.install_path  }}_ubuntu24_04.deb"
+
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.ReleaseJob.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path: ./build/${{ needs.VersionJob.outputs.install_path  }}_ubuntu24_04.deb
+          asset_name: ${{ needs.VersionJob.outputs.install_path  }}_ubuntu24_04.deb
+          asset_content_type: application/zip
+
+
diff --git a/.github/workflows/workflow_pr.yml b/.github/workflows/workflow_pr.yml
@@ -214,3 +214,58 @@ jobs:
       - name: Package
         working-directory: ${{github.workspace}}/build
         run: dpkg-deb --build --root-owner-group ${{ needs.VersionJob.outputs.install_path  }}
+
+  BuildUbuntu24:
+    name: Build and package for Ubuntu 24_04
+    needs: [VersionJob]
+    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+    # You can convert this to a matrix build if you need cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: print install location
+        run: echo "My output is ${{ needs.VersionJob.outputs.install_path  }}"
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+
+      - name: Prepare Vulkan SDK
+        uses: humbletim/[email protected]
+        with:
+          vulkan-query-version: 1.3.204.0
+          vulkan-components: Vulkan-Headers, Vulkan-Loader
+          vulkan-use-cache: true
+
+      - name: Install dependencies
+        run: sudo apt-get install -y cmake libx11-dev build-essential xorg-dev libtbb-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libssl-dev libgtk-3-dev libsystemd-dev libwebp-dev
+
+        #- name: update gcc11
+        #run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt update && sudo apt install -y gcc-11 g++-11
+
+      - name: Configure CMake
+        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGIT_SUBMODULE=OFF -DWARNINGS_AS_ERRORS=FALSE #-D CMAKE_C_COMPILER=gcc-11 -D CMAKE_CXX_COMPILER=g++-11
+
+      - name: Build
+        # Build your program with the given configuration
+        run: cmake --build ${{github.workspace}}/build -- -j3
+
+      - name: Install
+        working-directory: ${{github.workspace}}/build
+        run: cmake --install . --config ${{env.BUILD_TYPE}}
+
+      - name: Prepare package step
+        working-directory: ${{github.workspace}}/build
+        run: |
+          mkdir ${{ needs.VersionJob.outputs.install_path  }}/DEBIAN && cp ${{github.workspace}}/Assets/Tools/Ubuntu/control ${{ needs.VersionJob.outputs.install_path  }}/DEBIAN/
+          mkdir -p ${{ needs.VersionJob.outputs.install_path  }}/usr/share/applications && cp ${{github.workspace}}/Assets/Tools/Ubuntu/multisense.desktop ${{ needs.VersionJob.outputs.install_path  }}/usr/share/applications/
+          cp ${{github.workspace}}/Assets/Tools/Ubuntu/start.sh ${{ needs.VersionJob.outputs.install_path  }}/opt/multisense/
+          rm -rf ${{ needs.VersionJob.outputs.install_path  }}/opt/multisense/include
+          rm -rf ${{ needs.VersionJob.outputs.install_path  }}/opt/multisense/lib
+          rm -rf ${{ needs.VersionJob.outputs.install_path  }}/opt/multisense/share
+
+      - name: Package
+        working-directory: ${{github.workspace}}/build
+        run: dpkg-deb --build --root-owner-group ${{ needs.VersionJob.outputs.install_path  }}
diff --git a/internal/AutoConnect b/internal/AutoConnect