Merge branch 'main' into develop

themarpe · themarpe · commit eab15be46539 · 2022-03-16T14:24:07.000+01:00
diff --git a/docs/source/components/nodes/stereo_depth.rst b/docs/source/components/nodes/stereo_depth.rst
@@ -177,20 +177,29 @@ Stereo depth FPS
    :header-rows: 1
 
    * - Stereo depth mode
-     - FPS for 720P
+     - FPS for 1280x720
+     - FPS for 640x400
    * - Standard mode
-     - 150
-   * - Left-Right Check
      - 60
+     - 110
+   * - Left-Right Check
+     - 55
+     - 105
    * - Subpixel Disparity
-     - 30
+     - 45
+     - 105
    * - Extended Disparity
-     - 60
+     - 54
+     - 105
    * - Subpixel + LR check
-     - 15
+     - 34
+     - 96
    * - Extended + LR check
-     - 30
+     - 26
+     - 62
 
+All stereo modes were measured for :code:`depth` output with **5x5 median filter** enabled. For 720P, mono cameras were set
+to **60 FPS** and for 400P mono cameras were set to **110 FPS**.
 
 Usage
 #####
diff --git a/docs/source/includes/footer-short.rst b/docs/source/includes/footer-short.rst
@@ -8,7 +8,7 @@ We're always happy to help with code or other questions you might have.
 
      <div class="cta-row cta-row-short">
          <div class="cta-box">
-            <a href="https://discord.gg/4hGT3AFPMZ">
+            <a href="https://discord.gg/luxonis">
                <img src="https://docs.luxonis.com/en/latest/_images/discord.png" alt="Discord"/>
                <h5 class="cta-title">Community Discord</h5>
             </a>
diff --git a/docs/source/install.rst b/docs/source/install.rst
@@ -46,7 +46,9 @@ macOS
 
 Close and re-open the terminal window after this command.
 
-The script also works on M1 Macs, Homebrew being installed under Rosetta 2, as some Python packages are still missing native M1 support.  In case you already have Homebrew installed natively and things don't work, see `here <https://github.com/luxonis/depthai/issues/299#issuecomment-757110966>`__ for some additional troubleshooting steps.
+The script also works on M1 Macs, Homebrew being installed under Rosetta 2, as some Python packages are still missing native M1
+support.  In case you already have Homebrew installed natively and things don't work, see `here <https://github.com/luxonis/depthai/issues/299#issuecomment-757110966>`__
+for some additional troubleshooting steps.
 
 Note that if the video streaming window does not appear consider running the
 following:
@@ -57,6 +59,52 @@ following:
 
 See the `Video preview window fails to appear on macOS <https://discuss.luxonis.com/d/95-video-preview-window-fails-to-appear-on-macos>`_ thread on our forum for more information.
 
+M1 Mac build wheels natively
+----------------------------
+
+In order to run DepthAI natively on M1 Mac, you currently need to build the wheels locally. We will add pre-building M1 wheels
+in Q2 of 2022, so this won't be needed anymore.
+
+This tutorial was provided by whab and tested on a MacBookPro M1 Pro running macOS Monterey 12.1 with a OAK-D-Lite.
+
+.. code-block:: bash
+
+  # Install native M1 version of brew
+  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+  echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zprofile
+  eval "$(/opt/homebrew/bin/brew shellenv)"
+
+  # Install conda to create virtual environments for Python
+  brew install --cask miniconda
+  conda init zsh
+
+  # Close and re-open a Terminal window
+
+  # Install DepthAI by building a M1 wheel (inside ~/DepthAI/)
+  conda create --name DepthAIEnv39 python=3.9
+  conda activate DepthAIEnv39
+  python3 -m pip install -U pip
+  brew update
+  brew install cmake libusb
+  cd ~; mkdir DepthAI; cd DepthAI
+  git clone --recursive  https://github.com/luxonis/depthai-python.git
+  cd depthai-python
+  mkdir build && cd build
+  # Build depthai-python
+  cmake ..
+  cmake --build . --parallel
+  cd ..
+  python3 -m pip wheel . -w wheelhouse
+  pip install wheelhouse/depthai-*
+
+  # Test DepthAI with a OAK plugged to your new M1 Mac
+  cd examples
+  nano install_requirements.py
+  #   Remove code of block (3 lines) starting with: if thisPlatform == "arm64" and platform.system() == "Darwin":
+  #   Remove code of block (48 lines) starting with: if not args.skip_depthai:
+  python3 install_requirements.py
+  python3 ColorCamera/rgb_preview.py
+
 Ubuntu
 ******
 
diff --git a/docs/source/samples/NeuralNetwork/concat_multi_input.rst b/docs/source/samples/NeuralNetwork/concat_multi_input.rst
@@ -22,15 +22,15 @@ Source code
 
     .. tab:: Python
 
-        Also `available on GitHub <https://github.com/luxonis/depthai-python/blob/main/examples/NeuralNetwork/concat_multiple_input.py>`__
+        Also `available on GitHub <https://github.com/luxonis/depthai-python/blob/main/examples/NeuralNetwork/concat_multi_input.py>`__
 
         .. literalinclude:: ../../../../examples/NeuralNetwork/concat_multi_input.py
            :language: python
            :linenos:
 
     .. tab:: C++
 
-        Also `available on GitHub <https://github.com/luxonis/depthai-core/blob/main/examples/src/concat_multiple_input.cpp>`__
+        Also `available on GitHub <https://github.com/luxonis/depthai-core/tree/main/examples/NeuralNetwork/concat_multiple_input.cpp>`__
 
         .. literalinclude:: ../../../../depthai-core/examples/NeuralNetwork/concat_multi_input.cpp
            :language: cpp
diff --git a/docs/source/samples/NeuralNetwork/normalization_multi_input.rst b/docs/source/samples/NeuralNetwork/normalization_multi_input.rst
@@ -29,15 +29,15 @@ Source code
 
     .. tab:: Python
 
-        Also `available on GitHub <https://github.com/luxonis/depthai-python/blob/main/examples/NeuralNetwork/normalization_multiple_input.py>`__
+        Also `available on GitHub <https://github.com/luxonis/depthai-python/blob/main/examples/NeuralNetwork/normalization_multi_input.py>`__
 
         .. literalinclude:: ../../../../examples/NeuralNetwork/normalization_multi_input.py
            :language: python
            :linenos:
 
     .. tab:: C++
 
-        Also `available on GitHub <https://github.com/luxonis/depthai-core/blob/main/examples/src/normalization_multiple_input.cpp>`__
+        Also `available on GitHub <https://github.com/luxonis/depthai-core/tree/main/examples/NeuralNetwork/normalization_multiple_input.cpp>`__
 
         .. literalinclude:: ../../../../depthai-core/examples/NeuralNetwork/normalization_multi_input.cpp
            :language: cpp
diff --git a/docs/source/samples/bootloader/poe_set_ip.rst b/docs/source/samples/bootloader/poe_set_ip.rst
@@ -19,8 +19,8 @@ Example script output:
     -------------------------------------
     Enter IPv4: 192.168.1.200
     Enter IPv4 Mask: 255.255.255.0
-    Enter IPv4 Gateway: 255.255.255.255
-    Flashing static IPv4 192.168.1.200, mask 255.255.255.0, gateway 255.255.255.255 to the POE device. Enter 'y' to confirm. y
+    Enter IPv4 Gateway: 192.168.1.1
+    Flashing static IPv4 192.168.1.200, mask 255.255.255.0, gateway 192.168.1.1 to the POE device. Enter 'y' to confirm. y
     Flashing successful.
 
 If you run the same example again after 10 seconds, you will see that IP changed to **192.168.1.200**:
@@ -33,6 +33,9 @@ If you run the same example again after 10 seconds, you will see that IP changed
     "2" to set a dynamic IPv4 address
     "3" to clear the config
 
+You can now also use the `Manually specify device IP <https://docs.luxonis.com/projects/hardware/en/latest/pages/guides/getting-started-with-poe.html#manually-specify-device-ip>`__
+script and change the IP to :code:`192.168.1.200`.
+
 Setup
 #####
 
diff --git a/docs/source/tutorials/maximize_fov.rst b/docs/source/tutorials/maximize_fov.rst
@@ -16,7 +16,10 @@ Change aspect ratio
 
 Use :code:`camRgb.setPreviewKeepAspectRatio(False)`. This means the aspect ratio will not be preserved and the image
 will be "stretched". This might be problematic for some off-the-shelf NN models, so model fine-tuning it might be required.
-`Usage example here <https://github.com/luxonis/depthai-python/blob/main/examples/rgb_mobilenet_4k.py#L42>`__.
+`Usage example here <https://github.com/luxonis/depthai-experiments/blob/master/gen2-lossless-zooming/main.py#L19>`__.
+
+.. image:: https://user-images.githubusercontent.com/18037362/144095838-d082040a-9716-4f8e-90e5-15bcb23115f9.gif
+    :target: https://youtu.be/8X0IcnkeIf8
 
 Letterboxing
 ************
@@ -26,7 +29,7 @@ the size of the image and apply "black bars" above and below the image, so the a
 achieve this by using :ref:`ImageManip` with :code:`manip.setResizeThumbnail(x,y)` (for Mobilenet :code:`x=300,y=300`).
 The downside of using this method is that your actual image will be smaller, so some features might not be preserved,
 which can mean the NN accuracy could decrease.
-`Usage example here <https://github.com/luxonis/depthai-python/blob/main/examples/object_tracker_video.py#L44>`__.
+`Usage example here <https://github.com/luxonis/depthai-experiments/blob/master/gen2-full-fov-nn/main.py#L28>`__.
 
 .. image:: /_static/images/tutorials/fov.jpeg
 
diff --git a/docs/source/tutorials/multiple.rst b/docs/source/tutorials/multiple.rst
@@ -69,8 +69,7 @@ on different DepthAI/uAI models.
 Specifying POE device to be used
 ********************************
 
-You can specify the POE device to be used by the IP address as well. Here's the `code snippet <https://docs.luxonis.com/en/latest/pages/tutorials/getting-started-with-poe/#manually-specify-device-ip>`__.
-
+You can specify the POE device to be used by the IP address as well. Here's the `code snippet <https://docs.luxonis.com/projects/hardware/en/latest/pages/guides/getting-started-with-poe.html#manually-specify-device-ip>`__.
 
 Now use as many DepthAI devices as you need!
 
