Merge branch 'release_2.20.2' into main

Author: themarpe

.github/workflows/main.yml

@@ -473,23 +473,17 @@ jobs:
       with:
         submodules: 'recursive'
 
-    # Get tag version
-    # TODO(themarpe) - Node12, has to be updated
-    - name: Get tag version
-      id: tag
-      uses: battila7/get-version-action@v2
-
     - uses: actions/setup-python@v4
       with:
         python-version: '3.8'
 
     - name: Check if version matches
-      run: python3.8 -c 'import find_version as v; exit(0) if "${{ steps.tag.outputs.version-without-v }}" == v.get_package_version() else exit(1)'
+      run: python3.8 -c 'import find_version as v; exit(0) if "${{ github.ref_name }}" == f"v{v.get_package_version()}" else exit(1)'
 
     # Create GitHub release
     - uses: actions/create-release@master
       id: createRelease
-      name: Create ${{ steps.tag.outputs.version-without-v }} depthai-core release
+      name: Create ${{ github.ref_name }} depthai-python release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -504,8 +498,8 @@ jobs:
 
         draft: true
 
-  # Deploy to PyPi. Only when a commit is tagged
-  deploy-pypi:
+  # Deploy to PyPi and Artifactory. Only when a commit is tagged
+  deploy:
     if: startsWith(github.ref, 'refs/tags/v')
     needs: [release]
     runs-on: ubuntu-latest
@@ -525,6 +519,12 @@ jobs:
           PYPI_SERVER: ${{ secrets.PYPI_SERVER }}
           PYPI_USER: ${{ secrets.PYPI_USER }}
           PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      - name: Run deploy to Artifactory
+        run: bash ./ci/upload-artifactory-release.sh
+        env:
+          ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
+          ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
+          ARTIFACTORY_PASS: ${{ secrets.ARTIFACTORY_PASS }}
 
   notify_robothub:
     if: startsWith(github.ref, 'refs/tags/v')

.github/workflows/test-install-dependencies.yml

@@ -58,7 +58,7 @@
         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
         shell: pwsh
-        run: choco install cmake git python pycharm-community -y
+        run: choco install cmake git python --version 3.10 -y
       - name: Install example requrirements
         run: |
           python examples/install_requirements.py

ci/upload-artifactory-release.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+curl -fL https://getcli.jfrog.io | sh
+
+cd wheelhouse/audited/ || exit 1
+export PATH_PREFIX=luxonis-python-release-local/depthai
+
+../../jfrog config add --artifactory-url=$ARTIFACTORY_URL --user=$ARTIFACTORY_USER --password=$ARTIFACTORY_PASS
+../../jfrog rt u "*" "$PATH_PREFIX/"

depthai-core

@@ -109,6 +109,7 @@ add_python_example(rgb_camera_control ColorCamera/rgb_camera_control.py)
 add_python_example(rgb_preview ColorCamera/rgb_preview.py)
 add_python_example(rgb_scene ColorCamera/rgb_scene.py)
 add_python_example(rgb_video ColorCamera/rgb_video.py)
+add_python_example(rgb_isp_scale ColorCamera/rgb_isp_scale.py)
 
 ## EdgeDetector
 add_python_example(edge_detector EdgeDetector/edge_detector.py)

examples/CMakeLists.txt

@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+
+import cv2
+import depthai as dai
+
+# Create pipeline
+pipeline = dai.Pipeline()
+
+# Define source and output
+camRgb = pipeline.create(dai.node.ColorCamera)
+xoutVideo = pipeline.create(dai.node.XLinkOut)
+
+xoutVideo.setStreamName("video")
+
+# Properties
+camRgb.setBoardSocket(dai.CameraBoardSocket.RGB)
+camRgb.setResolution(dai.ColorCameraProperties.SensorResolution.THE_4_K)
+camRgb.setIspScale(1, 2)
+camRgb.setVideoSize(1920, 1080)
+
+xoutVideo.input.setBlocking(False)
+xoutVideo.input.setQueueSize(1)
+
+# Linking
+camRgb.video.link(xoutVideo.input)
+
+# Connect to device and start pipeline
+with dai.Device(pipeline) as device:
+
+    video = device.getOutputQueue(name="video", maxSize=1, blocking=False)
+
+    while True:
+        videoIn = video.get()
+
+        # Get BGR frame from NV12 encoded video frame to show with opencv
+        # Visualizing the frame on slower hosts might have overhead
+        cv2.imshow("video", videoIn.getCvFrame())
+
+        if cv2.waitKey(1) == ord('q'):
+            break

examples/ColorCamera/rgb_isp_scale.py

@@ -1,2 +1,2 @@
 [build-system]
-requires = ["setuptools", "wheel", "mypy"] # Must be preinstalled "cmake>=3.2.0"
+requires = ["setuptools", "wheel", "mypy", "cmake==3.25"]

pyproject.toml

@@ -20,6 +20,7 @@
 #include "depthai-shared/common/RotatedRect.hpp"
 #include "depthai-shared/common/Rect.hpp"
 #include "depthai-shared/common/Colormap.hpp"
+#include "depthai-shared/common/FrameEvent.hpp"
 
 // depthai
 #include "depthai/common/CameraFeatures.hpp"
@@ -54,6 +55,7 @@ void CommonBindings::bind(pybind11::module& m, void* pCallstack){
     py::class_<Rect> rect(m, "Rect", DOC(dai, Rect));
     py::enum_<CameraExposureOffset> cameraExposureOffset(m, "CameraExposureOffset");
     py::enum_<Colormap> colormap(m, "Colormap", DOC(dai, Colormap));
+    py::enum_<FrameEvent> frameEvent(m, "FrameEvent", DOC(dai, FrameEvent));
 
     ///////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////
@@ -328,4 +330,10 @@ void CommonBindings::bind(pybind11::module& m, void* pCallstack){
         // .value("DEEPGREEN", Colormap::DEEPGREEN)
     ;
 
+    frameEvent
+        .value("NONE", FrameEvent::NONE)
+        .value("READOUT_START", FrameEvent::READOUT_START)
+        .value("READOUT_END", FrameEvent::READOUT_END)
+    ;
+
 }

src/pipeline/CommonBindings.cpp

@@ -185,17 +185,22 @@ def wait(self) -> dai.DeviceInfo:
                     return deviceSelected
 
 def flashBootloader(bl: dai.DeviceBootloader, device: dai.DeviceInfo, type: dai.DeviceBootloader.Type):
+    userBlWarningMessage = """Updating bootloader can soft-brick a device.
+Proceed with caution"""
     factoryBlWarningMessage = """Factory Bootloader type or version doesn't support User Bootloader flashing.
 Factory bootloader will be updated instead.
 Proceed with caution
     """
 
     try:
         if bl.isUserBootloaderSupported():
-            pr = Progress('Flashing...')
-            progress = lambda p : pr.update(p)
-            bl.flashUserBootloader(progress)
-            pr.finish("Flashed newest User Bootloader version.")
+            if AreYouSure(text=userBlWarningMessage).wait():
+                pr = Progress('Flashing...')
+                progress = lambda p : pr.update(p)
+                bl.flashUserBootloader(progress)
+                pr.finish("Flashed newest User Bootloader version.")
+            else:
+                return False
         elif AreYouSure(text=factoryBlWarningMessage).wait():
             bl.close()
             pr = Progress('Connecting...')
@@ -400,12 +405,6 @@ def deviceStateTxt(state: dai.XLinkDeviceState) -> str:
         sg.Text("-version-", key="version", size=(30, 1)),
         sg.VSeparator(),
         sg.Text("-version-", key="commit", size=(31, 1))
-    ],
-    [sg.HSeparator()],
-    [
-        sg.Text("", size=(7, 2)),
-        sg.Button("Update Bootloader", size=(20, 2), font=('Arial', 10, 'bold'), disabled=True,
-                  button_color='#FFA500'),
     ]
 ]
 
@@ -510,12 +509,17 @@ def deviceStateTxt(state: dai.XLinkDeviceState) -> str:
     ],
     [sg.HSeparator()],
     [
+        sg.Button("Update Bootloader", size=(20, 2), font=('Arial', 10, 'bold'), disabled=True,
+                  button_color='#FFA500'),
         sg.Button("Flash Factory Bootloader", size=(20, 2), font=('Arial', 10, 'bold'), disabled=True,
                   button_color='#FFA500', key='flashFactoryBootloader'),
+    ],
+    [sg.HSeparator()],
+    [
         sg.Button("Factory reset",  size=(17, 2), font=('Arial', 10, 'bold'), disabled=True, button_color='#FFA500'),
         sg.Button("Boot into USB\nRecovery mode", size=(20, 2), font=('Arial', 10, 'bold'), disabled=True,
                   key='recoveryMode', button_color='#FFA500')
-    ],
+    ]
 ]
 
 
@@ -611,6 +615,8 @@ def run(self) -> None:
                     if self.bl is None: continue
                     self.getConfigs()
                 self.unlockConfig()
+
+            # Danger
             elif event == "Update Bootloader":
                 # Use current type
                 if flashBootloader(self.bl, self.device, self.bl.getType()):
@@ -620,8 +626,6 @@ def run(self) -> None:
                     self.getDevices()
                 else:
                     print("Flashing bootloader canceled.")
-
-            # Danger
             elif event == "flashFactoryBootloader":
                 sel = SelectBootloader(['AUTO', 'USB', 'NETWORK'], "Select bootloader type to flash.")
                 ok, type = sel.wait()