Skip to content

Commit

Permalink
Merge pull request #272 from luxonis/develop
Browse files Browse the repository at this point in the history 
Release v2.4.0.0
  • Loading branch information
@SzabolcsGergely
SzabolcsGergely authored May 24, 2021
2 parents b747e5c + f365f23 commit 34d2ddc
Show file tree
Hide file tree
Showing 124 changed files with 2,484 additions and 1,861 deletions.
2 changes: 1 addition & 1 deletion depthai-core
Submodule depthai-core updated 69 files
+1 −1 CMakeLists.txt
+1 −1 cmake/Depthai/DepthaiDeviceSideConfig.cmake
+106 −56 examples/CMakeLists.txt
+0 −131 examples/src/camera_mobilenet_example.cpp
+10 −8 examples/src/camera_mobilenet_sync_example.cpp
+0 −63 examples/src/camera_preview_example.cpp
+0 −63 examples/src/camera_video_example.cpp
+110 −0 examples/src/depth_crop_control.cpp
+68 −0 examples/src/depth_preview.cpp
+50 −0 examples/src/device_queue_event.cpp
+0 −64 examples/src/device_queue_event_example.cpp
+86 −0 examples/src/encoding_max_limit.cpp
+0 −70 examples/src/h264_encoding_example.cpp
+13 −19 examples/src/image_manip_example.cpp
+20 −25 examples/src/mjpeg_encoding_example.cpp
+0 −124 examples/src/mobilenet_device_side_decoding_example.cpp
+149 −0 examples/src/mono_camera_control.cpp
+0 −57 examples/src/mono_camera_example.cpp
+153 −0 examples/src/mono_depth_mobilenetssd.cpp
+53 −0 examples/src/mono_full_resolution_saver.cpp
+116 −0 examples/src/mono_mobilenet.cpp
+55 −0 examples/src/mono_preview.cpp
+60 −62 examples/src/object_tracker.cpp
+52 −0 examples/src/opencv_support.cpp
+0 −56 examples/src/opencv_support_example.cpp
+76 −68 examples/src/rgb_camera_control.cpp
+33 −27 examples/src/rgb_depth_aligned.cpp
+55 −0 examples/src/rgb_encoding.cpp
+127 −0 examples/src/rgb_encoding_mobilenet.cpp
+162 −0 examples/src/rgb_encoding_mono_mobilenet.cpp
+216 −0 examples/src/rgb_encoding_mono_mobilenet_depth.cpp
+64 −0 examples/src/rgb_full_resolution_saver.cpp
+145 −0 examples/src/rgb_mobilenet.cpp
+130 −0 examples/src/rgb_mobilenet_4k.cpp
+82 −0 examples/src/rgb_mono_encoding.cpp
+55 −0 examples/src/rgb_preview.cpp
+48 −46 examples/src/rgb_rotate_warp.cpp
+45 −0 examples/src/rgb_video.cpp
+38 −36 examples/src/spatial_location_calculator.cpp
+77 −87 examples/src/spatial_mobilenet.cpp
+77 −88 examples/src/spatial_mobilenet_mono.cpp
+62 −65 examples/src/spatial_object_tracker.cpp
+77 −86 examples/src/spatial_tiny_yolo.cpp
+36 −42 examples/src/stereo_depth_video.cpp
+28 −43 examples/src/system_information.cpp
+92 −81 examples/src/tiny_yolo_v3_device_side_decoding.cpp
+0 −137 examples/src/tiny_yolo_v3_device_side_decoding_example.cpp
+159 −0 examples/src/tiny_yolo_v4_device_side_decoding.cpp
+30 −8 examples/src/utility.cpp
+1 −0 examples/src/utility.hpp
+112 −0 examples/src/video_mobilenet.cpp
+16 −16 examples/src/webcam_mobilenet_example.cpp
+25 −0 include/depthai/common/CameraBoardSocket.hpp
+31 −0 include/depthai/common/UsbSpeed.hpp
+9 −1 include/depthai/device/Device.hpp
+6 −0 include/depthai/pipeline/Pipeline.hpp
+9 −2 include/depthai/pipeline/node/MonoCamera.hpp
+9 −2 include/depthai/pipeline/node/StereoDepth.hpp
+1 −1 shared/depthai-shared
+6 −0 src/device/Device.cpp
+3 −3 src/device/DeviceBootloader.cpp
+9 −2 src/opencv/ImgFrame.cpp
+19 −0 src/pipeline/Pipeline.cpp
+1 −1 src/pipeline/node/MonoCamera.cpp
+1 −1 src/pipeline/node/NeuralNetwork.cpp
+8 −1 src/pipeline/node/StereoDepth.cpp
+1 −1 src/utility/Resources.cpp
+1 −1 tests/src/image_manip_node_test.cpp
+1 −1 tests/src/neural_network_test.cpp
6 changes: 3 additions & 3 deletions docs/source/components/messages/camera_control.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ scenes, effects etc.
Examples of functionality
#########################

- :ref:`14.1 - Color Camera Control`
- :ref:`19 - Mono Camera Control`
- :ref:`23 - Auto Exposure on ROI`
- :ref:`RGB Camera Control`
- :ref:`Mono Camera Control`
- :ref:`Auto Exposure on ROI`

Reference
#########
Expand Down
4 changes: 2 additions & 2 deletions docs/source/components/messages/image_manip_config.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ It is sent either from the host to :ref:`ColorCamera` or :ref:`ImageManip`.
Examples of functionality
#########################

- :ref:`14.1 - Color Camera Control`
- :ref:`20 - Color Rotate Warp`
- :ref:`RGB Camera Control`
- :ref:`RGB Rotate Warp`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/messages/img_detections.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ which contains :code:`label`, :code:`confidence`, and the bounding box informati
Examples of functionality
#########################

- :ref:`08 - RGB & MobilenetSSD`
- :ref:`09 - Mono & MobilenetSSD`
- :ref:`22.2 - RGB & TinyYoloV4 decoding on device`
- :ref:`RGB & MobilenetSSD`
- :ref:`Mono & MobilenetSSD`
- :ref:`RGB & TinyYoloV4 decoding on device`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/messages/img_frame.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ These are all the images (regardless of their encoding/format), as well as the d
Examples of functionality
#########################

- :ref:`01 - RGB Preview`
- :ref:`02 - Mono Preview`
- :ref:`03 - Depth Preview`
- :ref:`RGB Preview`
- :ref:`Mono Preview`
- :ref:`Depth Preview`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/messages/spatial_img_detections.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Both :ref:`YoloSpatialDetectionNetwork` and :ref:`MobileNetSpatialDetectionNetwo
Examples of functionality
#########################

- :ref:`26.1 - RGB & MobilenetSSD with spatial data`
- :ref:`26.2 - MONO & MobilenetSSD with spatial data`
- :ref:`26.3 - RGB & TinyYolo with spatial data`
- :ref:`RGB & MobilenetSSD with spatial data`
- :ref:`Mono & MobilenetSSD with spatial data`
- :ref:`RGB & TinyYolo with spatial data`

Reference
#########
Expand Down
2 changes: 1 addition & 1 deletion docs/source/components/messages/spatial_location_calculator_config.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This message is used to configure the :ref:`SpatialLocationCalculator` node.
Examples of functionality
#########################

- :ref:`27 - Spatial location calculator`
- :ref:`Spatial location calculator`

Reference
#########
Expand Down
2 changes: 1 addition & 1 deletion docs/source/components/messages/spatial_location_calculator_data.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This message is an output from the :ref:`SpatialLocationCalculator` node.
Examples of functionality
#########################

- :ref:`27 - Spatial location calculator`
- :ref:`Spatial location calculator`

Reference
#########
Expand Down
2 changes: 1 addition & 1 deletion docs/source/components/messages/system_information.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ System information message is created by the :ref:`SystemLogger` node.
Examples of functionality
#########################

- :ref:`25 - System information`
- :ref:`System information`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/messages/tracklets.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Tracklets are produced by the :ref:`ObjectTracker` node. They provide tracking i
Examples of functionality
#########################

- :ref:`29.1 - Object tracker on RGB camera`
- :ref:`29.2 - Spatial object tracker on RGB camera`
- :ref:`29.3 - Object tracker on video`
- :ref:`Object tracker on RGB`
- :ref:`Spatial object tracker on RGB`
- :ref:`Object tracker on video`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/nodes/color_camera.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ Usage
Examples of functionality
#########################

- :ref:`01 - RGB Preview`
- :ref:`14.1 - Color Camera Control`
- :ref:`28 - Camera video high resolution`
- :ref:`RGB Preview`
- :ref:`RGB Camera Control`
- :ref:`RGB video`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/nodes/image_manip.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ Usage
Examples of functionality
#########################

- :ref:`09 - Mono & MobilenetSSD`
- :ref:`11 - RGB & Encoding & Mono & MobilenetSSD`
- :ref:`14.1 - Color Camera Control`
- :ref:`Mono & MobilenetSSD`
- :ref:`RGB Encoding & Mono & MobilenetSSD`
- :ref:`RGB Camera Control`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/nodes/mobilenet_detection_network.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ Usage
Examples of functionality
#########################

- :ref:`08 - RGB & MobilenetSSD`
- :ref:`09 - Mono & MobilenetSSD`
- :ref:`10 - Mono & MobilenetSSD & Depth`
- :ref:`RGB & MobilenetSSD`
- :ref:`Mono & MobilenetSSD`
- :ref:`Mono & MobilenetSSD & Depth`

Reference
#########
Expand Down
4 changes: 2 additions & 2 deletions docs/source/components/nodes/mobilenet_spatial_detection_network.rst.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ Usage
Examples of functionality
#########################

- :ref:`26.1 - RGB & MobilenetSSD with spatial data`
- :ref:`26.2 - MONO & MobilenetSSD with spatial data`
- :ref:`RGB & MobilenetSSD with spatial data`
- :ref:`Mono & MobilenetSSD with spatial data`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/nodes/mono_camera.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ Usage
Examples of functionality
#########################

- :ref:`02 - Mono Preview`
- :ref:`09 - Mono & MobilenetSSD`
- :ref:`19 - Mono Camera Control`
- :ref:`Mono Preview`
- :ref:`Mono & MobilenetSSD`
- :ref:`Mono Camera Control`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/nodes/object_tracker.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ Usage
Examples of functionality
#########################

- :ref:`29.1 - Object tracker on RGB camera`
- :ref:`29.2 - Spatial object tracker on RGB camera`
- :ref:`29.3 - Object tracker on video`
- :ref:`Object tracker on RGB`
- :ref:`Spatial object tracker on RGB`
- :ref:`Object tracker on video`

Reference
#########
Expand Down
2 changes: 1 addition & 1 deletion docs/source/components/nodes/spatial_location_calculator.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Usage
Examples of functionality
#########################

- :ref:`27 - Spatial location calculator`
- :ref:`Spatial location calculator`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/nodes/stereo_depth.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ Usage
Examples of functionality
#########################

- :ref:`03 - Depth Preview`
- :ref:`10 - Mono & MobilenetSSD & Depth`
- :ref:`26.1 - RGB & MobilenetSSD with spatial data`
- :ref:`Depth Preview`
- :ref:`Mono & MobilenetSSD & Depth`
- :ref:`RGB & MobilenetSSD with spatial data`

Reference
#########
Expand Down
2 changes: 1 addition & 1 deletion docs/source/components/nodes/system_logger.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Usage
Examples of functionality
#########################

- :ref:`27 - Spatial location calculator`
- :ref:`Spatial location calculator`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/nodes/video_encoder.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ Usage
Examples of functionality
#########################

- :ref:`04 - RGB Encoding`
- :ref:`13 - Encoding Max Limit`
- :ref:`18 - RGB Encoding with MobilenetSSD`
- :ref:`RGB Encoding`
- :ref:`Encoding Max Limit`
- :ref:`RGB Encoding & MobilenetSSD`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/nodes/xlink_in.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ Usage
Examples of functionality
#########################

- :ref:`14.1 - Color Camera Control`
- :ref:`17 - Video & MobilenetSSD`
- :ref:`20 - Color Rotate Warp`
- :ref:`RGB Camera Control`
- :ref:`Video & MobilenetSSD`
- :ref:`RGB Rotate Warp`

Reference
#########
Expand Down
6 changes: 3 additions & 3 deletions docs/source/components/nodes/xlink_out.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ Usage
Examples of functionality
#########################

- :ref:`01 - RGB Preview`
- :ref:`09 - Mono & MobilenetSSD`
- :ref:`10 - Mono & MobilenetSSD & Depth`
- :ref:`RGB Preview`
- :ref:`Mono & MobilenetSSD`
- :ref:`Mono & MobilenetSSD & Depth`


Reference
Expand Down
4 changes: 2 additions & 2 deletions docs/source/components/nodes/yolo_detection_network.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ Usage
Examples of functionality
#########################

- :ref:`22.1 - RGB & TinyYoloV3 decoding on device`
- :ref:`22.2 - RGB & TinyYoloV4 decoding on device`
- :ref:`RGB & TinyYoloV3 decoding on device`
- :ref:`RGB & TinyYoloV4 decoding on device`

Reference
#########
Expand Down
2 changes: 1 addition & 1 deletion docs/source/components/nodes/yolo_spatial_detection_network.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Usage
Examples of functionality
#########################

- :ref:`26.3 - RGB & TinyYolo with spatial data`
- :ref:`RGB & TinyYolo with spatial data`

Reference
#########
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Now, pick a tutorial or code sample and start utilizing Gen2 capabilities
:caption: Code:

tutorials/code_samples.rst
Experiments (Github) <https://github.com/luxonis/depthai-experiments>
Experiments (GitHub) <https://github.com/luxonis/depthai-experiments>

.. toctree::
:maxdepth: 1
Expand Down
12 changes: 6 additions & 6 deletions docs/source/install.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,8 @@ Kernel Virtual Machine
To access the OAK-D camera in the `Kernel Virtual Machine <https://www.linux-kvm.org/page/Main_Page>`__, there is a need to attach and detach USB
devices on the fly when the host machine detects changes in the USB bus.

OAK-D camera changes the USB device type when it is used by DepthAI API. This happens in backgound when the camera is used natively.
But when the camera is used in a virtual environment the situation is different.
OAK-D camera changes the USB device type when it is used by DepthAI API. This happens in backgound when the camera is used natively.
But when the camera is used in a virtual environment the situation is different.

On your host machine, use the following code:

Expand All @@ -255,7 +255,7 @@ On your host machine, use the following code:
SUBSYSTEM=="usb", ACTION=="remove", ENV{PRODUCT}=="3e7/2485/1", ENV{DEVTYPE}=="usb_device", MODE="0666", RUN+="/usr/local/bin/movidius_usb_hotplug.sh depthai-vm"
SUBSYSTEM=="usb", ACTION=="remove", ENV{PRODUCT}=="3e7/f63b/100", ENV{DEVTYPE}=="usb_device", MODE="0666", RUN+="/usr/local/bin/movidius_usb_hotplug.sh depthai-vm"
The script that the udev rule is calling (movidius_usb_hotplug.sh) should then attach/detach the USB device to the virtual machine.
The script that the udev rule is calling (movidius_usb_hotplug.sh) should then attach/detach the USB device to the virtual machine.
In this case we need to call :code:`virsh` command. For example, the script could do the following:

.. code-block::
Expand Down Expand Up @@ -291,10 +291,10 @@ In this case we need to call :code:`virsh` command. For example, the script coul
exit 0
Note that when the device is disconnected from the USB bus, some udev environmental variables are not available (:code:`ID_VENDOR_ID` or :code:`ID_MODEL_ID`),
Note that when the device is disconnected from the USB bus, some udev environmental variables are not available (:code:`ID_VENDOR_ID` or :code:`ID_MODEL_ID`),
that is why you need to use :code:`PRODUCT` environmental variable to identify which device has been disconnected.

The virtual machine where DepthAI API application is running should have defined a udev rules that identify the OAK-D camera.
The virtual machine where DepthAI API application is running should have defined a udev rules that identify the OAK-D camera.
The udev rule is decribed `here <https://docs.luxonis.com/en/latest/pages/faq/#does-depthai-work-on-the-nvidia-jetson-series>`__

Solution provided by `Manuel Segarra-Abad <https://github.com/maseabunikie>`__
Expand Down Expand Up @@ -394,7 +394,7 @@ tools/environments on your system.
Using a virtual environment (or system-wide, if you prefer), run the following to install the requirements for this example repository:

.. code-block:: bash
cd examples
python3 install_requirements.py
Expand Down
31 changes: 0 additions & 31 deletions docs/source/samples/01_rgb_preview.rst
View file

This file was deleted.

30 changes: 0 additions & 30 deletions docs/source/samples/02_mono_preview.rst
View file

This file was deleted.

Loading

0 comments on commit 34d2ddc

Please sign in to comment.