Merge remote-tracking branch 'origin/main' into develop

# Conflicts: # .gitignore # depthai_sdk/setup.py # requirements.txt
luxonis · Apr 21, 2023 · ebaeaf7 · ebaeaf7
2 parents ffb4623 + 7cc38f3
commit ebaeaf7
Show file tree

Hide file tree

Showing 16 changed files with 1,385 additions and 913 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [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
diff --git a/calibrate.py b/calibrate.py
diff --git a/depthai_helpers/calibration_utils.py b/depthai_helpers/calibration_utils.py
diff --git a/requirements.txt b/requirements.txt
@@ -8,3 +8,4 @@ pyqt5>5,<5.15.6 ; platform_machine != "armv6l" and platform_machine != "armv7l"
 --extra-index-url https://artifacts.luxonis.com/artifactory/luxonis-python-snapshot-local/
 depthai==2.21.2.0
 Qt.py
+scipy
diff --git a/resources/boards/ACME01.json b/resources/boards/ACME01.json
diff --git a/resources/boards/BW1097.json b/resources/boards/BW1097.json
diff --git a/resources/boards/BW1098OBC.json b/resources/boards/BW1098OBC.json
diff --git a/resources/boards/DM2097.json b/resources/boards/DM2097.json
diff --git a/resources/boards/OAK-D-CM4-POE.json b/resources/boards/OAK-D-CM4-POE.json
diff --git a/resources/boards/OAK-D-CM4.json b/resources/boards/OAK-D-CM4.json
diff --git a/resources/boards/OAK-D-IoT-40.json b/resources/boards/OAK-D-IoT-40.json
diff --git a/resources/boards/OAK-D-LITE.json b/resources/boards/OAK-D-LITE.json
diff --git a/resources/boards/OAK-D-PRO-W.json b/resources/boards/OAK-D-PRO-W.json
diff --git a/resources/boards/OAK-D-PRO.json b/resources/boards/OAK-D-PRO.json
diff --git a/resources/boards/OAK-D-W.json b/resources/boards/OAK-D-W.json
diff --git a/resources/depthai_boards b/resources/depthai_boards