Merge branch 'main' into tof_calib

luxonis · Feb 23, 2024 · ab73f0c · ab73f0c
2 parents 3da2c89 + c0a2d6e
commit ab73f0c
Show file tree

Hide file tree

Showing 309 changed files with 8,157 additions and 5,717 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -43,3 +43,11 @@ jobs:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
         packages_dir: depthai_sdk/dist/
+
+    - name: Repository Dispatch
+      uses: peter-evans/repository-dispatch@v2
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        event-type: robothub-oak-release
+        repository: luxonis/robothub-images
+        client-payload: '{"ref": "${{ github.ref }}"}'
diff --git a/.github/workflows/test_install_requirements.yml b/.github/workflows/test_install_requirements.yml
@@ -91,9 +91,9 @@
       - name: Download chocolatey
         shell: pwsh
         run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-      - name: Install dependencies
+      - name: Install pycharm-community dependency
         shell: pwsh
-        run: choco install cmake git python --version 3.10 pycharm-community -y
+        run: choco install pycharm-community -y
       - name: Install requrirements
         run: |
           python install_requirements.py

diff --git a/.gitignore b/.gitignore
@@ -30,8 +30,7 @@ share/python-wheels/
 MANIFEST
 *.idea
 # DepthAI-Specific
-dataset/
-dataset*
+*dataset*
 .fw_cache/
 depthai.calib
 mesh_left.calib

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,7 @@
-[submodule "depthai_sdk/src/depthai_sdk/integrations/depthai_pipeline_graph"]
-	path = depthai_sdk/src/depthai_sdk/integrations/depthai_pipeline_graph
-	url = https://github.com/luxonis/depthai_pipeline_graph
 [submodule "resources/depthai_boards"]
 	path = resources/depthai_boards
 	url = https://github.com/luxonis/depthai-boards
+
+[submodule "depthai_calibration"]
+	path = depthai_calibration
+	url = https://github.com/luxonis/depthai-calibration
diff --git a/README.md b/README.md
@@ -15,7 +15,14 @@ _Click on the GIF below to see a full example run_
 __Documentation is available at [https://docs.luxonis.com/en/latest/pages/tutorials/first_steps/](https://docs.luxonis.com/en/latest/pages/tutorials/first_steps/#first-steps-with-depthai).__
 
 ## Installation
-
+First you need to clone this repository with
+```
+git clone --recursive https://github.com/luxonis/depthai.git
+```
+In case you have repository already cloned, you can update your submodules with:
+```
+git pull --recurse-submodules 
+```
 There are two installation steps that need to be performed to make sure the demo works:
 - **One-time installation** that will add all necessary packages to your OS.
   ```

diff --git a/calibrate.py b/calibrate.py
diff --git a/calibrate_and_test.py b/calibrate_and_test.py
diff --git a/charuco_11x8.pdf → charuco_11_8.pdf b/charuco_11x8.pdf → charuco_11_8.pdf
diff --git a/charuco_boards_user_calib/charuco_24inch_13x7.pdf b/charuco_boards_user_calib/charuco_24inch_13x7.pdf
diff --git a/charuco_boards_user_calib/charuco_28inch_15x8.pdf b/charuco_boards_user_calib/charuco_28inch_15x8.pdf
diff --git a/charuco_boards_user_calib/charuco_32inch_17x9.pdf b/charuco_boards_user_calib/charuco_32inch_17x9.pdf
diff --git a/charuco_boards_user_calib/charuco_36inch_19x11.pdf b/charuco_boards_user_calib/charuco_36inch_19x11.pdf
diff --git a/charuco_boards_user_calib/charuco_42inch_22x12.pdf b/charuco_boards_user_calib/charuco_42inch_22x12.pdf
diff --git a/charuco_boards_user_calib/charuco_50inch_27x15.pdf b/charuco_boards_user_calib/charuco_50inch_27x15.pdf
diff --git a/charuco_boards_user_calib/charuco_55inch_30x17.pdf b/charuco_boards_user_calib/charuco_55inch_30x17.pdf
diff --git a/charuco_boards_user_calib/charuco_65inch_35x20.pdf b/charuco_boards_user_calib/charuco_65inch_35x20.pdf
diff --git a/charuco_boards_user_calib/charuco_75inch_41x23.pdf b/charuco_boards_user_calib/charuco_75inch_41x23.pdf
diff --git a/depthai_calibration b/depthai_calibration
diff --git a/depthai_demo.py b/depthai_demo.py
@@ -206,7 +206,8 @@ def setup(self, conf: ConfigManager):
             self._nnManager.countLabel(self._conf.getCountLabel(self._nnManager))
             self._pm.setNnManager(self._nnManager)
 
-        self._device = dai.Device(self._pm.pipeline.getOpenVINOVersion(), self._deviceInfo, usb2Mode=self._conf.args.usbSpeed == "usb2")
+        maxUsbSpeed = dai.UsbSpeed.HIGH if self._conf.args.usbSpeed == "usb2" else dai.UsbSpeed.SUPER
+        self._device = dai.Device(self._pm.pipeline.getOpenVINOVersion(), self._deviceInfo, maxUsbSpeed)
         self._device.addLogCallback(self._logMonitorCallback)
         if sentryEnabled:
             try:
@@ -288,7 +289,7 @@ def run(self):
 
         if self._conf.useCamera:
             cameras = self._device.getConnectedCameras()
-            if dai.CameraBoardSocket.LEFT in cameras and dai.CameraBoardSocket.RIGHT in cameras:
+            if dai.CameraBoardSocket.CAM_B in cameras and dai.CameraBoardSocket.CAM_C in cameras:
                 self._pv.collectCalibData(self._device)
 
             self._updateCameraConfigs({

diff --git a/depthai_helpers/__init__.py b/depthai_helpers/__init__.py