Move to Raspbian Buster (#193)

* builder: Build against Buster

* builder: Use correct repository specifications

* builder: Move ld.so.preload to have less errors

* builder: Use coex repo to install Monkey

* builder: Search for buster ROS packages

* aruco_pose: Vendor in aruco library from OpenCV 3.4.6

* builder: Move to ROS Melodic

* builder: Update kernel version

* aruco_pose, clever: Remove opencv3 ROS dependency

* builder: Update rosdep

* travis: Disable eclint for vendored aruco library

* tests: Don't try to locate opencv in ros

* roscore: Use melodic distribution

* Revert "aruco_pose: Vendor in aruco library from OpenCV 3.4.6"

This reverts commit 9c14a8c002bb3396f9a7d9b2ba39969207f066ba.

* aruco_pose: Vendor opencv_contrib/aruco again

* builder: Add led packages

* builder: Remove unused builder code

* travis: Add native tests

* builder: Set permissions for standalone-install

* builder: Use -y for package installation

* builder: Add repo for standalone build

* builder: Use correct file types for standalone install

* aruco_pose: Accept rgb8 map images

* builder: Disable mjpg_streamer test

* aruco_pose: Allow rgb8 map images (again)

* builder: Re-add mjpgstreamer

* builder: Install tornado==4.2.1 for rosbridge_suite

* builder: Use more recent base image

* builder: Use default kernel

* builder: Move ld.so.preload back after tests

* builder: Disable catkin tests

These tests fail on a remote machine but seem to pass just fine on real hardware. Something must have changed between Kinetic and Melodic, and we must investigate more, but for now we just need a working image.

* aruco_pose: Remove unused vendored code

* selfcheck: Update systemd-analyze regex

* builder: Add opencv repository

* rosdep: Update package definitions for Melodic

* rosdep: Use proper yaml formatting

* travis: Remove unnecessary space

* docs: Reference Melodic wherever possible

.gitattributes

@@ -3,3 +3,4 @@ roslib.js linguist-vendored
 eventemitter2.js linguist-vendored
 ros3d.js linguist-vendored
 three.min.js linguist-vendored
+aruco_pose/vendor/* linguist-vendored

.markdownlint.json

@@ -20,6 +20,7 @@
             "MAVLink",
             "ROS",
             "ROS Kinetic",
+            "ROS Melodic",
             "OpenCV",
             "Gazebo",
             "GitHub",

.travis.yml

@@ -50,6 +50,22 @@ jobs:
           tags: true
         draft: true
         name: ${TRAVIS_TAG}
+    - stage: Build
+      name: "Native Kinetic build"
+      env:
+        - NATIVE_DOCKER=ros:kinetic-ros-base
+      before_script:
+        - docker pull ${NATIVE_DOCKER}
+      script:
+        - docker run --rm -v $(pwd):/root/catkin_ws/src/clever ${NATIVE_DOCKER} /root/catkin_ws/src/clever/builder/standalone-install.sh
+    - stage: Build
+      name: "Native Melodic build"
+      env:
+        - NATIVE_DOCKER=ros:melodic-ros-base
+      before_script:
+        - docker pull ${NATIVE_DOCKER}
+      script:
+        - docker run --rm -v $(pwd):/root/catkin_ws/src/clever ${NATIVE_DOCKER} /root/catkin_ws/src/clever/builder/standalone-install.sh
     - stage: Build
       name: "Documentation"
       language: node_js
@@ -93,7 +109,7 @@ jobs:
         - wget https://github.com/okalachev/editorconfig-checker/releases/download/1.2.1-disable-spaces-amount/ec-linux-amd64
         - chmod +x ec-linux-amd64
       script:
-        - ./ec-linux-amd64 -spaces-after-tabs -e "roslib.js|ros3d.js|eventemitter2.js|draw.cpp|BinUtils.swift|\.idea|apps/android/app|Assets.xcassets|test_parser_pass.txt|test_node_failure.txt|\.stl|\.dxf"
+        - ./ec-linux-amd64 -spaces-after-tabs -e "roslib.js|ros3d.js|eventemitter2.js|draw.cpp|BinUtils.swift|\.idea|apps/android/app|Assets.xcassets|test_parser_pass.txt|test_node_failure.txt|aruco_pose/vendor|\.stl|\.dxf"
 stages:
   - Build
   - Annotate

README.md

@@ -18,8 +18,8 @@ Use it to learn how to assemble, configure, pilot and program autonomous CLEVER
 
 Image includes:
 
-* Raspbian Stretch
-* ROS Kinetic
+* Raspbian Buster
+* ROS Melodic
 * Configured networking
 * OpenCV
 * mavros
@@ -30,7 +30,7 @@ API description (in Russian) for autonomous flights is available [on GitBook](ht
 
 ## Manual installation
 
-Install ROS Kinetic according to the [documentation](http://wiki.ros.org/kinetic/Installation), then [create a Catkin workspace](http://wiki.ros.org/catkin/Tutorials/create_a_workspace).
+Install ROS Melodic according to the [documentation](http://wiki.ros.org/melodic/Installation), then [create a Catkin workspace](http://wiki.ros.org/catkin/Tutorials/create_a_workspace).
 
 Clone this repo to directory `~/catkin_ws/src/clever`:
 

aruco_pose/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0)
 project(aruco_pose)
 
 add_definitions(-std=c++11 -Wall -g)
@@ -23,7 +23,16 @@ find_package(catkin REQUIRED COMPONENTS
   message_generation
 )
 
-find_package(OpenCV 3 REQUIRED)
+find_package(OpenCV 3 REQUIRED COMPONENTS core imgproc calib3d)
+if ("${OpenCV_VERSION_MINOR}" LESS "3")
+  message(STATUS "OpenCV version too low, using vendored ArUco package")
+  include(vendor/VendorOpenCV.cmake)
+else()
+  message(STATUS "Using system OpenCV ArUco package")
+  find_package(OpenCV 3 REQUIRED COMPONENTS aruco)
+endif()
+message(STATUS "OpenCV include dirs: ${OpenCV_INCLUDE_DIRS}")
+message(STATUS "OpenCV libraries: ${OpenCV_LIBRARIES}")
 
 ## System dependencies are found with CMake's conventions
 # find_package(Boost REQUIRED COMPONENTS system)

aruco_pose/package.xml

@@ -18,7 +18,8 @@
   <depend>tf2</depend>
   <depend>tf2_ros</depend>
   <depend>tf2_geometry_msgs</depend>
-  <depend>opencv3</depend>
+  <!-- FIXME: OpenCV3 is not in Melodic -->
+  <!-- <depend>opencv3</depend> -->
   <depend>cv_bridge</depend>
   <depend>image_transport</depend>
   <depend>message_generation</depend>

aruco_pose/vendor/VendorOpenCV.cmake

@@ -0,0 +1,33 @@
+# There should be a better way to add ArUco libraries,
+# but I have not found it yet.
+#  -- sfalexrog, 2019.09.11
+if (NOT OpenCV_LIBRARIES OR NOT OpenCV_INCLUDE_DIRS)
+  message(FATAL_ERROR "OpenCV was not found - cannot continue")
+endif()
+
+message(STATUS "Adding vendored aruco_pose OpenCV module")
+add_library(_opencv_aruco STATIC
+  vendor/aruco/src/aruco.cpp
+  vendor/aruco/src/charuco.cpp
+  vendor/aruco/src/dictionary.cpp
+  vendor/aruco/src/zmaxheap.cpp
+  )
+
+target_include_directories(_opencv_aruco PRIVATE
+  ${OpenCV_INCLUDE_DIRS}
+)
+target_link_libraries(_opencv_aruco PRIVATE
+  ${OpenCV_LIBRARIES}
+)
+target_compile_definitions(_opencv_aruco PRIVATE
+  CV_OVERRIDE=override
+)
+target_compile_options(_opencv_aruco PRIVATE
+  -fpic -fPIC
+)
+
+target_include_directories(_opencv_aruco PUBLIC
+  vendor/aruco/include
+)
+
+set(OpenCV_LIBRARIES "_opencv_aruco;${OpenCV_LIBRARIES}")

aruco_pose/vendor/aruco/CMakeLists.txt

@@ -0,0 +1,2 @@
+set(the_description "ArUco Marker Detection")
+ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d WRAP python java)

aruco_pose/vendor/aruco/README.md

@@ -0,0 +1,12 @@
+ArUco Marker Detection
+======================
+
+**ArUco**
+
+ArUco markers are easy to detect pattern grids that yield up to 1024 different patterns. They were built for augmented reality and later used for camera calibration. Since the grid uniquely orients the square, the detection algorithm can determing the pose of the grid.
+
+**ChArUco**
+
+ArUco markers were improved by interspersing them inside a checkerboard called ChArUco. Checkerboard corner intersectionsa provide more stable corners because the edge location bias on one square is countered by the opposite edge orientation in the connecting square. By interspersing ArUco markers inside the checkerboard, each checkerboard corner gets a label which enables it to be used in complex calibration or pose scenarios where you cannot see all the corners of the checkerboard.
+
+The smallest ChArUco board is 5 checkers and 4 markers called a "Diamond Marker".

aruco_pose/vendor/aruco/include/opencv2/aruco.hpp

@@ -0,0 +1,604 @@
+/*
+By downloading, copying, installing or using the software you agree to this
+license. If you do not agree to this license, do not download, install,
+copy or use the software.
+
+                          License Agreement
+               For Open Source Computer Vision Library
+                       (3-clause BSD License)
+
+Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+Third party copyrights are property of their respective owners.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+  * Neither the names of the copyright holders nor the names of the contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as is" and
+any express or implied warranties, including, but not limited to, the implied
+warranties of merchantability and fitness for a particular purpose are
+disclaimed. In no event shall copyright holders or contributors be liable for
+any direct, indirect, incidental, special, exemplary, or consequential damages
+(including, but not limited to, procurement of substitute goods or services;
+loss of use, data, or profits; or business interruption) however caused
+and on any theory of liability, whether in contract, strict liability,
+or tort (including negligence or otherwise) arising in any way out of
+the use of this software, even if advised of the possibility of such damage.
+*/
+
+#ifndef __OPENCV_ARUCO_HPP__
+#define __OPENCV_ARUCO_HPP__
+
+#include <opencv2/core.hpp>
+#include <vector>
+#include "opencv2/aruco/dictionary.hpp"
+
+/**
+ * @defgroup aruco ArUco Marker Detection
+ * This module is dedicated to square fiducial markers (also known as Augmented Reality Markers)
+ * These markers are useful for easy, fast and robust camera pose estimation.ç
+ *
+ * The main functionalities are:
+ * - Detection of markers in an image
+ * - Pose estimation from a single marker or from a board/set of markers
+ * - Detection of ChArUco board for high subpixel accuracy
+ * - Camera calibration from both, ArUco boards and ChArUco boards.
+ * - Detection of ChArUco diamond markers
+ * The samples directory includes easy examples of how to use the module.
+ *
+ * The implementation is based on the ArUco Library by R. Muñoz-Salinas and S. Garrido-Jurado @cite Aruco2014.
+ *
+ * Markers can also be detected based on the AprilTag 2 @cite wang2016iros fiducial detection method.
+ *
+ * @sa S. Garrido-Jurado, R. Muñoz-Salinas, F. J. Madrid-Cuevas, and M. J. Marín-Jiménez. 2014.
+ * "Automatic generation and detection of highly reliable fiducial markers under occlusion".
+ * Pattern Recogn. 47, 6 (June 2014), 2280-2292. DOI=10.1016/j.patcog.2014.01.005
+ *
+ * @sa http://www.uco.es/investiga/grupos/ava/node/26
+ *
+ * This module has been originally developed by Sergio Garrido-Jurado as a project
+ * for Google Summer of Code 2015 (GSoC 15).
+ *
+ *
+*/
+
+namespace cv {
+namespace aruco {
+
+//! @addtogroup aruco
+//! @{
+
+enum CornerRefineMethod{
+    CORNER_REFINE_NONE,     ///< Tag and corners detection based on the ArUco approach
+    CORNER_REFINE_SUBPIX,   ///< ArUco approach and refine the corners locations using corner subpixel accuracy
+    CORNER_REFINE_CONTOUR,  ///< ArUco approach and refine the corners locations using the contour-points line fitting
+    CORNER_REFINE_APRILTAG, ///< Tag and corners detection based on the AprilTag 2 approach @cite wang2016iros
+};
+
+/**
+ * @brief Parameters for the detectMarker process:
+ * - adaptiveThreshWinSizeMin: minimum window size for adaptive thresholding before finding
+ *   contours (default 3).
+ * - adaptiveThreshWinSizeMax: maximum window size for adaptive thresholding before finding
+ *   contours (default 23).
+ * - adaptiveThreshWinSizeStep: increments from adaptiveThreshWinSizeMin to adaptiveThreshWinSizeMax
+ *   during the thresholding (default 10).
+ * - adaptiveThreshConstant: constant for adaptive thresholding before finding contours (default 7)
+ * - minMarkerPerimeterRate: determine minimum perimeter for marker contour to be detected. This
+ *   is defined as a rate respect to the maximum dimension of the input image (default 0.03).
+ * - maxMarkerPerimeterRate:  determine maximum perimeter for marker contour to be detected. This
+ *   is defined as a rate respect to the maximum dimension of the input image (default 4.0).
+ * - polygonalApproxAccuracyRate: minimum accuracy during the polygonal approximation process to
+ *   determine which contours are squares.
+ * - minCornerDistanceRate: minimum distance between corners for detected markers relative to its
+ *   perimeter (default 0.05)
+ * - minDistanceToBorder: minimum distance of any corner to the image border for detected markers
+ *   (in pixels) (default 3)
+ * - minMarkerDistanceRate: minimum mean distance beetween two marker corners to be considered
+ *   similar, so that the smaller one is removed. The rate is relative to the smaller perimeter
+ *   of the two markers (default 0.05).
+ * - cornerRefinementMethod: corner refinement method. (CORNER_REFINE_NONE, no refinement.
+ *   CORNER_REFINE_SUBPIX, do subpixel refinement. CORNER_REFINE_CONTOUR use contour-Points,
+ *   CORNER_REFINE_APRILTAG  use the AprilTag2 approach)
+ * - cornerRefinementWinSize: window size for the corner refinement process (in pixels) (default 5).
+ * - cornerRefinementMaxIterations: maximum number of iterations for stop criteria of the corner
+ *   refinement process (default 30).
+ * - cornerRefinementMinAccuracy: minimum error for the stop cristeria of the corner refinement
+ *   process (default: 0.1)
+ * - markerBorderBits: number of bits of the marker border, i.e. marker border width (default 1).
+ * - perspectiveRemovePixelPerCell: number of bits (per dimension) for each cell of the marker
+ *   when removing the perspective (default 8).
+ * - perspectiveRemoveIgnoredMarginPerCell: width of the margin of pixels on each cell not
+ *   considered for the determination of the cell bit. Represents the rate respect to the total
+ *   size of the cell, i.e. perspectiveRemovePixelPerCell (default 0.13)
+ * - maxErroneousBitsInBorderRate: maximum number of accepted erroneous bits in the border (i.e.
+ *   number of allowed white bits in the border). Represented as a rate respect to the total
+ *   number of bits per marker (default 0.35).
+ * - minOtsuStdDev: minimun standard deviation in pixels values during the decodification step to
+ *   apply Otsu thresholding (otherwise, all the bits are set to 0 or 1 depending on mean higher
+ *   than 128 or not) (default 5.0)
+ * - errorCorrectionRate error correction rate respect to the maximun error correction capability
+ *   for each dictionary. (default 0.6).
+ * - aprilTagMinClusterPixels: reject quads containing too few pixels.
+ * - aprilTagMaxNmaxima: how many corner candidates to consider when segmenting a group of pixels into a quad.
+ * - aprilTagCriticalRad: Reject quads where pairs of edges have angles that are close to straight or close to
+ *   180 degrees. Zero means that no quads are rejected. (In radians).
+ * - aprilTagMaxLineFitMse:  When fitting lines to the contours, what is the maximum mean squared error
+ *   allowed?  This is useful in rejecting contours that are far from being quad shaped; rejecting
+ *   these quads "early" saves expensive decoding processing.
+ * - aprilTagMinWhiteBlackDiff: When we build our model of black & white pixels, we add an extra check that
+ *   the white model must be (overall) brighter than the black model.  How much brighter? (in pixel values, [0,255]).
+ * - aprilTagDeglitch:  should the thresholded image be deglitched? Only useful for very noisy images
+ * - aprilTagQuadDecimate: Detection of quads can be done on a lower-resolution image, improving speed at a
+ *   cost of pose accuracy and a slight decrease in detection rate. Decoding the binary payload is still
+ *   done at full resolution.
+ * - aprilTagQuadSigma: What Gaussian blur should be applied to the segmented image (used for quad detection?)
+ *   Parameter is the standard deviation in pixels.  Very noisy images benefit from non-zero values (e.g. 0.8).
+ * - detectInvertedMarker: to check if there is a white marker. In order to generate a "white" marker just
+ *   invert a normal marker by using a tilde, ~markerImage. (default false)
+ */
+struct CV_EXPORTS_W DetectorParameters {
+
+    DetectorParameters();
+
+    CV_WRAP static Ptr<DetectorParameters> create();
+
+    CV_PROP_RW int adaptiveThreshWinSizeMin;
+    CV_PROP_RW int adaptiveThreshWinSizeMax;
+    CV_PROP_RW int adaptiveThreshWinSizeStep;
+    CV_PROP_RW double adaptiveThreshConstant;
+    CV_PROP_RW double minMarkerPerimeterRate;
+    CV_PROP_RW double maxMarkerPerimeterRate;
+    CV_PROP_RW double polygonalApproxAccuracyRate;
+    CV_PROP_RW double minCornerDistanceRate;
+    CV_PROP_RW int minDistanceToBorder;
+    CV_PROP_RW double minMarkerDistanceRate;
+    CV_PROP_RW int cornerRefinementMethod;
+    CV_PROP_RW int cornerRefinementWinSize;
+    CV_PROP_RW int cornerRefinementMaxIterations;
+    CV_PROP_RW double cornerRefinementMinAccuracy;
+    CV_PROP_RW int markerBorderBits;
+    CV_PROP_RW int perspectiveRemovePixelPerCell;
+    CV_PROP_RW double perspectiveRemoveIgnoredMarginPerCell;
+    CV_PROP_RW double maxErroneousBitsInBorderRate;
+    CV_PROP_RW double minOtsuStdDev;
+    CV_PROP_RW double errorCorrectionRate;
+
+    // April :: User-configurable parameters.
+    CV_PROP_RW float aprilTagQuadDecimate;
+    CV_PROP_RW float aprilTagQuadSigma;
+
+    // April :: Internal variables
+    CV_PROP_RW int aprilTagMinClusterPixels;
+    CV_PROP_RW int aprilTagMaxNmaxima;
+    CV_PROP_RW float aprilTagCriticalRad;
+    CV_PROP_RW float aprilTagMaxLineFitMse;
+    CV_PROP_RW int aprilTagMinWhiteBlackDiff;
+    CV_PROP_RW int aprilTagDeglitch;
+
+    // to detect white (inverted) markers
+    CV_PROP_RW bool detectInvertedMarker;
+};
+
+
+
+/**
+ * @brief Basic marker detection
+ *
+ * @param image input image
+ * @param dictionary indicates the type of markers that will be searched
+ * @param corners vector of detected marker corners. For each marker, its four corners
+ * are provided, (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers,
+ * the dimensions of this array is Nx4. The order of the corners is clockwise.
+ * @param ids vector of identifiers of the detected markers. The identifier is of type int
+ * (e.g. std::vector<int>). For N detected markers, the size of ids is also N.
+ * The identifiers have the same order than the markers in the imgPoints array.
+ * @param parameters marker detection parameters
+ * @param rejectedImgPoints contains the imgPoints of those squares whose inner code has not a
+ * correct codification. Useful for debugging purposes.
+ * @param cameraMatrix optional input 3x3 floating-point camera matrix
+ * \f$A = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$
+ * @param distCoeff optional vector of distortion coefficients
+ * \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6],[s_1, s_2, s_3, s_4]])\f$ of 4, 5, 8 or 12 elements
+ *
+ * Performs marker detection in the input image. Only markers included in the specific dictionary
+ * are searched. For each detected marker, it returns the 2D position of its corner in the image
+ * and its corresponding identifier.
+ * Note that this function does not perform pose estimation.
+ * @sa estimatePoseSingleMarkers,  estimatePoseBoard
+ *
+ */
+CV_EXPORTS_W void detectMarkers(InputArray image, const Ptr<Dictionary> &dictionary, OutputArrayOfArrays corners,
+                                OutputArray ids, const Ptr<DetectorParameters> &parameters = DetectorParameters::create(),
+                                OutputArrayOfArrays rejectedImgPoints = noArray(), InputArray cameraMatrix= noArray(), InputArray distCoeff= noArray());
+
+
+
+/**
+ * @brief Pose estimation for single markers
+ *
+ * @param corners vector of already detected markers corners. For each marker, its four corners
+ * are provided, (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers,
+ * the dimensions of this array should be Nx4. The order of the corners should be clockwise.
+ * @sa detectMarkers
+ * @param markerLength the length of the markers' side. The returning translation vectors will
+ * be in the same unit. Normally, unit is meters.
+ * @param cameraMatrix input 3x3 floating-point camera matrix
+ * \f$A = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$
+ * @param distCoeffs vector of distortion coefficients
+ * \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6],[s_1, s_2, s_3, s_4]])\f$ of 4, 5, 8 or 12 elements
+ * @param rvecs array of output rotation vectors (@sa Rodrigues) (e.g. std::vector<cv::Vec3d>).
+ * Each element in rvecs corresponds to the specific marker in imgPoints.
+ * @param tvecs array of output translation vectors (e.g. std::vector<cv::Vec3d>).
+ * Each element in tvecs corresponds to the specific marker in imgPoints.
+ * @param _objPoints array of object points of all the marker corners
+ *
+ * This function receives the detected markers and returns their pose estimation respect to
+ * the camera individually. So for each marker, one rotation and translation vector is returned.
+ * The returned transformation is the one that transforms points from each marker coordinate system
+ * to the camera coordinate system.
+ * The marker corrdinate system is centered on the middle of the marker, with the Z axis
+ * perpendicular to the marker plane.
+ * The coordinates of the four corners of the marker in its own coordinate system are:
+ * (-markerLength/2, markerLength/2, 0), (markerLength/2, markerLength/2, 0),
+ * (markerLength/2, -markerLength/2, 0), (-markerLength/2, -markerLength/2, 0)
+ */
+CV_EXPORTS_W void estimatePoseSingleMarkers(InputArrayOfArrays corners, float markerLength,
+                                            InputArray cameraMatrix, InputArray distCoeffs,
+                                            OutputArray rvecs, OutputArray tvecs, OutputArray _objPoints = noArray());
+
+
+
+/**
+ * @brief Board of markers
+ *
+ * A board is a set of markers in the 3D space with a common coordinate system.
+ * The common form of a board of marker is a planar (2D) board, however any 3D layout can be used.
+ * A Board object is composed by:
+ * - The object points of the marker corners, i.e. their coordinates respect to the board system.
+ * - The dictionary which indicates the type of markers of the board
+ * - The identifier of all the markers in the board.
+ */
+class CV_EXPORTS_W Board {
+
+    public:
+    /**
+    * @brief Provide way to create Board by passing necessary data. Specially needed in Python.
+    *
+    * @param objPoints array of object points of all the marker corners in the board
+    * @param dictionary the dictionary of markers employed for this board
+    * @param ids vector of the identifiers of the markers in the board
+    *
+    */
+    CV_WRAP static Ptr<Board> create(InputArrayOfArrays objPoints, const Ptr<Dictionary> &dictionary, InputArray ids);
+    /// array of object points of all the marker corners in the board
+    /// each marker include its 4 corners in CCW order. For M markers, the size is Mx4.
+    CV_PROP std::vector< std::vector< Point3f > > objPoints;
+
+    /// the dictionary of markers employed for this board
+    CV_PROP Ptr<Dictionary> dictionary;
+
+    /// vector of the identifiers of the markers in the board (same size than objPoints)
+    /// The identifiers refers to the board dictionary
+    CV_PROP std::vector< int > ids;
+};
+
+
+
+/**
+ * @brief Planar board with grid arrangement of markers
+ * More common type of board. All markers are placed in the same plane in a grid arrangement.
+ * The board can be drawn using drawPlanarBoard() function (@sa drawPlanarBoard)
+ */
+class CV_EXPORTS_W GridBoard : public Board {
+
+    public:
+    /**
+     * @brief Draw a GridBoard
+     *
+     * @param outSize size of the output image in pixels.
+     * @param img output image with the board. The size of this image will be outSize
+     * and the board will be on the center, keeping the board proportions.
+     * @param marginSize minimum margins (in pixels) of the board in the output image
+     * @param borderBits width of the marker borders.
+     *
+     * This function return the image of the GridBoard, ready to be printed.
+     */
+    CV_WRAP void draw(Size outSize, OutputArray img, int marginSize = 0, int borderBits = 1);
+
+
+    /**
+     * @brief Create a GridBoard object
+     *
+     * @param markersX number of markers in X direction
+     * @param markersY number of markers in Y direction
+     * @param markerLength marker side length (normally in meters)
+     * @param markerSeparation separation between two markers (same unit as markerLength)
+     * @param dictionary dictionary of markers indicating the type of markers
+     * @param firstMarker id of first marker in dictionary to use on board.
+     * @return the output GridBoard object
+     *
+     * This functions creates a GridBoard object given the number of markers in each direction and
+     * the marker size and marker separation.
+     */
+    CV_WRAP static Ptr<GridBoard> create(int markersX, int markersY, float markerLength,
+                                         float markerSeparation, const Ptr<Dictionary> &dictionary, int firstMarker = 0);
+
+    /**
+      *
+      */
+    CV_WRAP Size getGridSize() const { return Size(_markersX, _markersY); }
+
+    /**
+      *
+      */
+    CV_WRAP float getMarkerLength() const { return _markerLength; }
+
+    /**
+      *
+      */
+    CV_WRAP float getMarkerSeparation() const { return _markerSeparation; }
+
+
+    private:
+    // number of markers in X and Y directions
+    int _markersX, _markersY;
+
+    // marker side lenght (normally in meters)
+    float _markerLength;
+
+    // separation between markers in the grid
+    float _markerSeparation;
+};
+
+
+
+/**
+ * @brief Pose estimation for a board of markers
+ *
+ * @param corners vector of already detected markers corners. For each marker, its four corners
+ * are provided, (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers, the
+ * dimensions of this array should be Nx4. The order of the corners should be clockwise.
+ * @param ids list of identifiers for each marker in corners
+ * @param board layout of markers in the board. The layout is composed by the marker identifiers
+ * and the positions of each marker corner in the board reference system.
+ * @param cameraMatrix input 3x3 floating-point camera matrix
+ * \f$A = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$
+ * @param distCoeffs vector of distortion coefficients
+ * \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6],[s_1, s_2, s_3, s_4]])\f$ of 4, 5, 8 or 12 elements
+ * @param rvec Output vector (e.g. cv::Mat) corresponding to the rotation vector of the board
+ * (see cv::Rodrigues). Used as initial guess if not empty.
+ * @param tvec Output vector (e.g. cv::Mat) corresponding to the translation vector of the board.
+ * @param useExtrinsicGuess defines whether initial guess for \b rvec and \b tvec will be used or not.
+ * Used as initial guess if not empty.
+ *
+ * This function receives the detected markers and returns the pose of a marker board composed
+ * by those markers.
+ * A Board of marker has a single world coordinate system which is defined by the board layout.
+ * The returned transformation is the one that transforms points from the board coordinate system
+ * to the camera coordinate system.
+ * Input markers that are not included in the board layout are ignored.
+ * The function returns the number of markers from the input employed for the board pose estimation.
+ * Note that returning a 0 means the pose has not been estimated.
+ */
+CV_EXPORTS_W int estimatePoseBoard(InputArrayOfArrays corners, InputArray ids, const Ptr<Board> &board,
+                                   InputArray cameraMatrix, InputArray distCoeffs, OutputArray rvec,
+                                   OutputArray tvec, bool useExtrinsicGuess = false);
+
+
+
+
+/**
+ * @brief Refind not detected markers based on the already detected and the board layout
+ *
+ * @param image input image
+ * @param board layout of markers in the board.
+ * @param detectedCorners vector of already detected marker corners.
+ * @param detectedIds vector of already detected marker identifiers.
+ * @param rejectedCorners vector of rejected candidates during the marker detection process.
+ * @param cameraMatrix optional input 3x3 floating-point camera matrix
+ * \f$A = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$
+ * @param distCoeffs optional vector of distortion coefficients
+ * \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6],[s_1, s_2, s_3, s_4]])\f$ of 4, 5, 8 or 12 elements
+ * @param minRepDistance minimum distance between the corners of the rejected candidate and the
+ * reprojected marker in order to consider it as a correspondence.
+ * @param errorCorrectionRate rate of allowed erroneous bits respect to the error correction
+ * capability of the used dictionary. -1 ignores the error correction step.
+ * @param checkAllOrders Consider the four posible corner orders in the rejectedCorners array.
+ * If it set to false, only the provided corner order is considered (default true).
+ * @param recoveredIdxs Optional array to returns the indexes of the recovered candidates in the
+ * original rejectedCorners array.
+ * @param parameters marker detection parameters
+ *
+ * This function tries to find markers that were not detected in the basic detecMarkers function.
+ * First, based on the current detected marker and the board layout, the function interpolates
+ * the position of the missing markers. Then it tries to find correspondence between the reprojected
+ * markers and the rejected candidates based on the minRepDistance and errorCorrectionRate
+ * parameters.
+ * If camera parameters and distortion coefficients are provided, missing markers are reprojected
+ * using projectPoint function. If not, missing marker projections are interpolated using global
+ * homography, and all the marker corners in the board must have the same Z coordinate.
+ */
+CV_EXPORTS_W void refineDetectedMarkers(
+    InputArray image,const  Ptr<Board> &board, InputOutputArrayOfArrays detectedCorners,
+    InputOutputArray detectedIds, InputOutputArrayOfArrays rejectedCorners,
+    InputArray cameraMatrix = noArray(), InputArray distCoeffs = noArray(),
+    float minRepDistance = 10.f, float errorCorrectionRate = 3.f, bool checkAllOrders = true,
+    OutputArray recoveredIdxs = noArray(), const Ptr<DetectorParameters> &parameters = DetectorParameters::create());
+
+
+
+/**
+ * @brief Draw detected markers in image
+ *
+ * @param image input/output image. It must have 1 or 3 channels. The number of channels is not
+ * altered.
+ * @param corners positions of marker corners on input image.
+ * (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers, the dimensions of
+ * this array should be Nx4. The order of the corners should be clockwise.
+ * @param ids vector of identifiers for markers in markersCorners .
+ * Optional, if not provided, ids are not painted.
+ * @param borderColor color of marker borders. Rest of colors (text color and first corner color)
+ * are calculated based on this one to improve visualization.
+ *
+ * Given an array of detected marker corners and its corresponding ids, this functions draws
+ * the markers in the image. The marker borders are painted and the markers identifiers if provided.
+ * Useful for debugging purposes.
+ */
+CV_EXPORTS_W void drawDetectedMarkers(InputOutputArray image, InputArrayOfArrays corners,
+                                      InputArray ids = noArray(),
+                                      Scalar borderColor = Scalar(0, 255, 0));
+
+
+
+/**
+ * @brief Draw coordinate system axis from pose estimation
+ *
+ * @param image input/output image. It must have 1 or 3 channels. The number of channels is not
+ * altered.
+ * @param cameraMatrix input 3x3 floating-point camera matrix
+ * \f$A = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$
+ * @param distCoeffs vector of distortion coefficients
+ * \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6],[s_1, s_2, s_3, s_4]])\f$ of 4, 5, 8 or 12 elements
+ * @param rvec rotation vector of the coordinate system that will be drawn. (@sa Rodrigues).
+ * @param tvec translation vector of the coordinate system that will be drawn.
+ * @param length length of the painted axis in the same unit than tvec (usually in meters)
+ *
+ * Given the pose estimation of a marker or board, this function draws the axis of the world
+ * coordinate system, i.e. the system centered on the marker/board. Useful for debugging purposes.
+ *
+ * @deprecated use cv::drawFrameAxes
+ */
+CV_EXPORTS_W void drawAxis(InputOutputArray image, InputArray cameraMatrix, InputArray distCoeffs,
+                           InputArray rvec, InputArray tvec, float length);
+
+
+
+/**
+ * @brief Draw a canonical marker image
+ *
+ * @param dictionary dictionary of markers indicating the type of markers
+ * @param id identifier of the marker that will be returned. It has to be a valid id
+ * in the specified dictionary.
+ * @param sidePixels size of the image in pixels
+ * @param img output image with the marker
+ * @param borderBits width of the marker border.
+ *
+ * This function returns a marker image in its canonical form (i.e. ready to be printed)
+ */
+CV_EXPORTS_W void drawMarker(const Ptr<Dictionary> &dictionary, int id, int sidePixels, OutputArray img,
+                             int borderBits = 1);
+
+
+
+/**
+ * @brief Draw a planar board
+ * @sa _drawPlanarBoardImpl
+ *
+ * @param board layout of the board that will be drawn. The board should be planar,
+ * z coordinate is ignored
+ * @param outSize size of the output image in pixels.
+ * @param img output image with the board. The size of this image will be outSize
+ * and the board will be on the center, keeping the board proportions.
+ * @param marginSize minimum margins (in pixels) of the board in the output image
+ * @param borderBits width of the marker borders.
+ *
+ * This function return the image of a planar board, ready to be printed. It assumes
+ * the Board layout specified is planar by ignoring the z coordinates of the object points.
+ */
+CV_EXPORTS_W void drawPlanarBoard(const Ptr<Board> &board, Size outSize, OutputArray img,
+                                  int marginSize = 0, int borderBits = 1);
+
+
+
+/**
+ * @brief Implementation of drawPlanarBoard that accepts a raw Board pointer.
+ */
+void _drawPlanarBoardImpl(Board *board, Size outSize, OutputArray img,
+                          int marginSize = 0, int borderBits = 1);
+
+
+
+/**
+ * @brief Calibrate a camera using aruco markers
+ *
+ * @param corners vector of detected marker corners in all frames.
+ * The corners should have the same format returned by detectMarkers (see #detectMarkers).
+ * @param ids list of identifiers for each marker in corners
+ * @param counter number of markers in each frame so that corners and ids can be split
+ * @param board Marker Board layout
+ * @param imageSize Size of the image used only to initialize the intrinsic camera matrix.
+ * @param cameraMatrix Output 3x3 floating-point camera matrix
+ * \f$A = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$ . If CV\_CALIB\_USE\_INTRINSIC\_GUESS
+ * and/or CV_CALIB_FIX_ASPECT_RATIO are specified, some or all of fx, fy, cx, cy must be
+ * initialized before calling the function.
+ * @param distCoeffs Output vector of distortion coefficients
+ * \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6],[s_1, s_2, s_3, s_4]])\f$ of 4, 5, 8 or 12 elements
+ * @param rvecs Output vector of rotation vectors (see Rodrigues ) estimated for each board view
+ * (e.g. std::vector<cv::Mat>>). That is, each k-th rotation vector together with the corresponding
+ * k-th translation vector (see the next output parameter description) brings the board pattern
+ * from the model coordinate space (in which object points are specified) to the world coordinate
+ * space, that is, a real position of the board pattern in the k-th pattern view (k=0.. *M* -1).
+ * @param tvecs Output vector of translation vectors estimated for each pattern view.
+ * @param stdDeviationsIntrinsics Output vector of standard deviations estimated for intrinsic parameters.
+ * Order of deviations values:
+ * \f$(f_x, f_y, c_x, c_y, k_1, k_2, p_1, p_2, k_3, k_4, k_5, k_6 , s_1, s_2, s_3,
+ * s_4, \tau_x, \tau_y)\f$ If one of parameters is not estimated, it's deviation is equals to zero.
+ * @param stdDeviationsExtrinsics Output vector of standard deviations estimated for extrinsic parameters.
+ * Order of deviations values: \f$(R_1, T_1, \dotsc , R_M, T_M)\f$ where M is number of pattern views,
+ * \f$R_i, T_i\f$ are concatenated 1x3 vectors.
+ * @param perViewErrors Output vector of average re-projection errors estimated for each pattern view.
+ * @param flags flags Different flags  for the calibration process (see #calibrateCamera for details).
+ * @param criteria Termination criteria for the iterative optimization algorithm.
+ *
+ * This function calibrates a camera using an Aruco Board. The function receives a list of
+ * detected markers from several views of the Board. The process is similar to the chessboard
+ * calibration in calibrateCamera(). The function returns the final re-projection error.
+ */
+CV_EXPORTS_AS(calibrateCameraArucoExtended) double calibrateCameraAruco(
+    InputArrayOfArrays corners, InputArray ids, InputArray counter, const Ptr<Board> &board,
+    Size imageSize, InputOutputArray cameraMatrix, InputOutputArray distCoeffs,
+    OutputArrayOfArrays rvecs, OutputArrayOfArrays tvecs,
+    OutputArray stdDeviationsIntrinsics, OutputArray stdDeviationsExtrinsics,
+    OutputArray perViewErrors, int flags = 0,
+    TermCriteria criteria = TermCriteria(TermCriteria::COUNT + TermCriteria::EPS, 30, DBL_EPSILON));
+
+
+/** @brief It's the same function as #calibrateCameraAruco but without calibration error estimation.
+ */
+CV_EXPORTS_W double calibrateCameraAruco(
+  InputArrayOfArrays corners, InputArray ids, InputArray counter, const Ptr<Board> &board,
+  Size imageSize, InputOutputArray cameraMatrix, InputOutputArray distCoeffs,
+  OutputArrayOfArrays rvecs = noArray(), OutputArrayOfArrays tvecs = noArray(), int flags = 0,
+  TermCriteria criteria = TermCriteria(TermCriteria::COUNT + TermCriteria::EPS, 30, DBL_EPSILON));
+
+
+/**
+ * @brief Given a board configuration and a set of detected markers, returns the corresponding
+ * image points and object points to call solvePnP
+ *
+ * @param board Marker board layout.
+ * @param detectedCorners List of detected marker corners of the board.
+ * @param detectedIds List of identifiers for each marker.
+ * @param objPoints Vector of vectors of board marker points in the board coordinate space.
+ * @param imgPoints Vector of vectors of the projections of board marker corner points.
+*/
+CV_EXPORTS_W void getBoardObjectAndImagePoints(const Ptr<Board> &board, InputArrayOfArrays detectedCorners,
+  InputArray detectedIds, OutputArray objPoints, OutputArray imgPoints);
+
+
+//! @}
+}
+}
+
+#endif

aruco_pose/vendor/aruco/include/opencv2/aruco/charuco.hpp

@@ -0,0 +1,343 @@
+/*
+By downloading, copying, installing or using the software you agree to this
+license. If you do not agree to this license, do not download, install,
+copy or use the software.
+
+                          License Agreement
+               For Open Source Computer Vision Library
+                       (3-clause BSD License)
+
+Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+Third party copyrights are property of their respective owners.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+  * Neither the names of the copyright holders nor the names of the contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as is" and
+any express or implied warranties, including, but not limited to, the implied
+warranties of merchantability and fitness for a particular purpose are
+disclaimed. In no event shall copyright holders or contributors be liable for
+any direct, indirect, incidental, special, exemplary, or consequential damages
+(including, but not limited to, procurement of substitute goods or services;
+loss of use, data, or profits; or business interruption) however caused
+and on any theory of liability, whether in contract, strict liability,
+or tort (including negligence or otherwise) arising in any way out of
+the use of this software, even if advised of the possibility of such damage.
+*/
+
+#ifndef __OPENCV_CHARUCO_HPP__
+#define __OPENCV_CHARUCO_HPP__
+
+#include <opencv2/core.hpp>
+#include <vector>
+#include <opencv2/aruco.hpp>
+
+
+namespace cv {
+namespace aruco {
+
+//! @addtogroup aruco
+//! @{
+
+
+/**
+ * @brief ChArUco board
+ * Specific class for ChArUco boards. A ChArUco board is a planar board where the markers are placed
+ * inside the white squares of a chessboard. The benefits of ChArUco boards is that they provide
+ * both, ArUco markers versatility and chessboard corner precision, which is important for
+ * calibration and pose estimation.
+ * This class also allows the easy creation and drawing of ChArUco boards.
+ */
+class CV_EXPORTS_W CharucoBoard : public Board {
+
+    public:
+    // vector of chessboard 3D corners precalculated
+    CV_PROP std::vector< Point3f > chessboardCorners;
+
+    // for each charuco corner, nearest marker id and nearest marker corner id of each marker
+    CV_PROP std::vector< std::vector< int > > nearestMarkerIdx;
+    CV_PROP std::vector< std::vector< int > > nearestMarkerCorners;
+
+    /**
+     * @brief Draw a ChArUco board
+     *
+     * @param outSize size of the output image in pixels.
+     * @param img output image with the board. The size of this image will be outSize
+     * and the board will be on the center, keeping the board proportions.
+     * @param marginSize minimum margins (in pixels) of the board in the output image
+     * @param borderBits width of the marker borders.
+     *
+     * This function return the image of the ChArUco board, ready to be printed.
+     */
+    CV_WRAP void draw(Size outSize, OutputArray img, int marginSize = 0, int borderBits = 1);
+
+
+    /**
+     * @brief Create a CharucoBoard object
+     *
+     * @param squaresX number of chessboard squares in X direction
+     * @param squaresY number of chessboard squares in Y direction
+     * @param squareLength chessboard square side length (normally in meters)
+     * @param markerLength marker side length (same unit than squareLength)
+     * @param dictionary dictionary of markers indicating the type of markers.
+     * The first markers in the dictionary are used to fill the white chessboard squares.
+     * @return the output CharucoBoard object
+     *
+     * This functions creates a CharucoBoard object given the number of squares in each direction
+     * and the size of the markers and chessboard squares.
+     */
+    CV_WRAP static Ptr<CharucoBoard> create(int squaresX, int squaresY, float squareLength,
+                                            float markerLength, const Ptr<Dictionary> &dictionary);
+
+    /**
+      *
+      */
+    CV_WRAP Size getChessboardSize() const { return Size(_squaresX, _squaresY); }
+
+    /**
+      *
+      */
+    CV_WRAP float getSquareLength() const { return _squareLength; }
+
+    /**
+      *
+      */
+    CV_WRAP float getMarkerLength() const { return _markerLength; }
+
+    private:
+    void _getNearestMarkerCorners();
+
+    // number of markers in X and Y directions
+    int _squaresX, _squaresY;
+
+    // size of chessboard squares side (normally in meters)
+    float _squareLength;
+
+    // marker side lenght (normally in meters)
+    float _markerLength;
+};
+
+
+
+
+/**
+ * @brief Interpolate position of ChArUco board corners
+ * @param markerCorners vector of already detected markers corners. For each marker, its four
+ * corners are provided, (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers, the
+ * dimensions of this array should be Nx4. The order of the corners should be clockwise.
+ * @param markerIds list of identifiers for each marker in corners
+ * @param image input image necesary for corner refinement. Note that markers are not detected and
+ * should be sent in corners and ids parameters.
+ * @param board layout of ChArUco board.
+ * @param charucoCorners interpolated chessboard corners
+ * @param charucoIds interpolated chessboard corners identifiers
+ * @param cameraMatrix optional 3x3 floating-point camera matrix
+ * \f$A = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$
+ * @param distCoeffs optional vector of distortion coefficients
+ * \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6],[s_1, s_2, s_3, s_4]])\f$ of 4, 5, 8 or 12 elements
+ * @param minMarkers number of adjacent markers that must be detected to return a charuco corner
+ *
+ * This function receives the detected markers and returns the 2D position of the chessboard corners
+ * from a ChArUco board using the detected Aruco markers. If camera parameters are provided,
+ * the process is based in an approximated pose estimation, else it is based on local homography.
+ * Only visible corners are returned. For each corner, its corresponding identifier is
+ * also returned in charucoIds.
+ * The function returns the number of interpolated corners.
+ */
+CV_EXPORTS_W int interpolateCornersCharuco(InputArrayOfArrays markerCorners, InputArray markerIds,
+                                           InputArray image, const Ptr<CharucoBoard> &board,
+                                           OutputArray charucoCorners, OutputArray charucoIds,
+                                           InputArray cameraMatrix = noArray(),
+                                           InputArray distCoeffs = noArray(), int minMarkers = 2);
+
+
+
+
+/**
+ * @brief Pose estimation for a ChArUco board given some of their corners
+ * @param charucoCorners vector of detected charuco corners
+ * @param charucoIds list of identifiers for each corner in charucoCorners
+ * @param board layout of ChArUco board.
+ * @param cameraMatrix input 3x3 floating-point camera matrix
+ * \f$A = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$
+ * @param distCoeffs vector of distortion coefficients
+ * \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6],[s_1, s_2, s_3, s_4]])\f$ of 4, 5, 8 or 12 elements
+ * @param rvec Output vector (e.g. cv::Mat) corresponding to the rotation vector of the board
+ * (see cv::Rodrigues).
+ * @param tvec Output vector (e.g. cv::Mat) corresponding to the translation vector of the board.
+ * @param useExtrinsicGuess defines whether initial guess for \b rvec and \b tvec will be used or not.
+ *
+ * This function estimates a Charuco board pose from some detected corners.
+ * The function checks if the input corners are enough and valid to perform pose estimation.
+ * If pose estimation is valid, returns true, else returns false.
+ */
+CV_EXPORTS_W bool estimatePoseCharucoBoard(InputArray charucoCorners, InputArray charucoIds,
+                                           const Ptr<CharucoBoard> &board, InputArray cameraMatrix,
+                                           InputArray distCoeffs, OutputArray rvec, OutputArray tvec,
+                                           bool useExtrinsicGuess = false);
+
+
+
+
+/**
+ * @brief Draws a set of Charuco corners
+ * @param image input/output image. It must have 1 or 3 channels. The number of channels is not
+ * altered.
+ * @param charucoCorners vector of detected charuco corners
+ * @param charucoIds list of identifiers for each corner in charucoCorners
+ * @param cornerColor color of the square surrounding each corner
+ *
+ * This function draws a set of detected Charuco corners. If identifiers vector is provided, it also
+ * draws the id of each corner.
+ */
+CV_EXPORTS_W void drawDetectedCornersCharuco(InputOutputArray image, InputArray charucoCorners,
+                                             InputArray charucoIds = noArray(),
+                                             Scalar cornerColor = Scalar(255, 0, 0));
+
+
+
+/**
+ * @brief Calibrate a camera using Charuco corners
+ *
+ * @param charucoCorners vector of detected charuco corners per frame
+ * @param charucoIds list of identifiers for each corner in charucoCorners per frame
+ * @param board Marker Board layout
+ * @param imageSize input image size
+ * @param cameraMatrix Output 3x3 floating-point camera matrix
+ * \f$A = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$ . If CV\_CALIB\_USE\_INTRINSIC\_GUESS
+ * and/or CV_CALIB_FIX_ASPECT_RATIO are specified, some or all of fx, fy, cx, cy must be
+ * initialized before calling the function.
+ * @param distCoeffs Output vector of distortion coefficients
+ * \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6],[s_1, s_2, s_3, s_4]])\f$ of 4, 5, 8 or 12 elements
+ * @param rvecs Output vector of rotation vectors (see Rodrigues ) estimated for each board view
+ * (e.g. std::vector<cv::Mat>>). That is, each k-th rotation vector together with the corresponding
+ * k-th translation vector (see the next output parameter description) brings the board pattern
+ * from the model coordinate space (in which object points are specified) to the world coordinate
+ * space, that is, a real position of the board pattern in the k-th pattern view (k=0.. *M* -1).
+ * @param tvecs Output vector of translation vectors estimated for each pattern view.
+ * @param stdDeviationsIntrinsics Output vector of standard deviations estimated for intrinsic parameters.
+ * Order of deviations values:
+ * \f$(f_x, f_y, c_x, c_y, k_1, k_2, p_1, p_2, k_3, k_4, k_5, k_6 , s_1, s_2, s_3,
+ * s_4, \tau_x, \tau_y)\f$ If one of parameters is not estimated, it's deviation is equals to zero.
+ * @param stdDeviationsExtrinsics Output vector of standard deviations estimated for extrinsic parameters.
+ * Order of deviations values: \f$(R_1, T_1, \dotsc , R_M, T_M)\f$ where M is number of pattern views,
+ * \f$R_i, T_i\f$ are concatenated 1x3 vectors.
+ * @param perViewErrors Output vector of average re-projection errors estimated for each pattern view.
+ * @param flags flags Different flags  for the calibration process (see #calibrateCamera for details).
+ * @param criteria Termination criteria for the iterative optimization algorithm.
+ *
+ * This function calibrates a camera using a set of corners of a  Charuco Board. The function
+ * receives a list of detected corners and its identifiers from several views of the Board.
+ * The function returns the final re-projection error.
+ */
+CV_EXPORTS_AS(calibrateCameraCharucoExtended) double calibrateCameraCharuco(
+    InputArrayOfArrays charucoCorners, InputArrayOfArrays charucoIds, const Ptr<CharucoBoard> &board,
+    Size imageSize, InputOutputArray cameraMatrix, InputOutputArray distCoeffs,
+    OutputArrayOfArrays rvecs, OutputArrayOfArrays tvecs,
+    OutputArray stdDeviationsIntrinsics, OutputArray stdDeviationsExtrinsics,
+    OutputArray perViewErrors, int flags = 0,
+    TermCriteria criteria = TermCriteria(TermCriteria::COUNT + TermCriteria::EPS, 30, DBL_EPSILON));
+
+/** @brief It's the same function as #calibrateCameraCharuco but without calibration error estimation.
+*/
+CV_EXPORTS_W double calibrateCameraCharuco(
+  InputArrayOfArrays charucoCorners, InputArrayOfArrays charucoIds, const Ptr<CharucoBoard> &board,
+  Size imageSize, InputOutputArray cameraMatrix, InputOutputArray distCoeffs,
+  OutputArrayOfArrays rvecs = noArray(), OutputArrayOfArrays tvecs = noArray(), int flags = 0,
+  TermCriteria criteria = TermCriteria(TermCriteria::COUNT + TermCriteria::EPS, 30, DBL_EPSILON));
+
+
+
+/**
+ * @brief Detect ChArUco Diamond markers
+ *
+ * @param image input image necessary for corner subpixel.
+ * @param markerCorners list of detected marker corners from detectMarkers function.
+ * @param markerIds list of marker ids in markerCorners.
+ * @param squareMarkerLengthRate rate between square and marker length:
+ * squareMarkerLengthRate = squareLength/markerLength. The real units are not necessary.
+ * @param diamondCorners output list of detected diamond corners (4 corners per diamond). The order
+ * is the same than in marker corners: top left, top right, bottom right and bottom left. Similar
+ * format than the corners returned by detectMarkers (e.g std::vector<std::vector<cv::Point2f> > ).
+ * @param diamondIds ids of the diamonds in diamondCorners. The id of each diamond is in fact of
+ * type Vec4i, so each diamond has 4 ids, which are the ids of the aruco markers composing the
+ * diamond.
+ * @param cameraMatrix Optional camera calibration matrix.
+ * @param distCoeffs Optional camera distortion coefficients.
+ *
+ * This function detects Diamond markers from the previous detected ArUco markers. The diamonds
+ * are returned in the diamondCorners and diamondIds parameters. If camera calibration parameters
+ * are provided, the diamond search is based on reprojection. If not, diamond search is based on
+ * homography. Homography is faster than reprojection but can slightly reduce the detection rate.
+ */
+CV_EXPORTS_W void detectCharucoDiamond(InputArray image, InputArrayOfArrays markerCorners,
+                                       InputArray markerIds, float squareMarkerLengthRate,
+                                       OutputArrayOfArrays diamondCorners, OutputArray diamondIds,
+                                       InputArray cameraMatrix = noArray(),
+                                       InputArray distCoeffs = noArray());
+
+
+
+/**
+ * @brief Draw a set of detected ChArUco Diamond markers
+ *
+ * @param image input/output image. It must have 1 or 3 channels. The number of channels is not
+ * altered.
+ * @param diamondCorners positions of diamond corners in the same format returned by
+ * detectCharucoDiamond(). (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers,
+ * the dimensions of this array should be Nx4. The order of the corners should be clockwise.
+ * @param diamondIds vector of identifiers for diamonds in diamondCorners, in the same format
+ * returned by detectCharucoDiamond() (e.g. std::vector<Vec4i>).
+ * Optional, if not provided, ids are not painted.
+ * @param borderColor color of marker borders. Rest of colors (text color and first corner color)
+ * are calculated based on this one.
+ *
+ * Given an array of detected diamonds, this functions draws them in the image. The marker borders
+ * are painted and the markers identifiers if provided.
+ * Useful for debugging purposes.
+ */
+CV_EXPORTS_W void drawDetectedDiamonds(InputOutputArray image, InputArrayOfArrays diamondCorners,
+                                       InputArray diamondIds = noArray(),
+                                       Scalar borderColor = Scalar(0, 0, 255));
+
+
+
+
+/**
+ * @brief Draw a ChArUco Diamond marker
+ *
+ * @param dictionary dictionary of markers indicating the type of markers.
+ * @param ids list of 4 ids for each ArUco marker in the ChArUco marker.
+ * @param squareLength size of the chessboard squares in pixels.
+ * @param markerLength size of the markers in pixels.
+ * @param img output image with the marker. The size of this image will be
+ * 3*squareLength + 2*marginSize,.
+ * @param marginSize minimum margins (in pixels) of the marker in the output image
+ * @param borderBits width of the marker borders.
+ *
+ * This function return the image of a ChArUco marker, ready to be printed.
+ */
+// TODO cannot be exported yet; conversion from/to Vec4i is not wrapped in core
+CV_EXPORTS void drawCharucoDiamond(const Ptr<Dictionary> &dictionary, Vec4i ids, int squareLength,
+                                   int markerLength, OutputArray img, int marginSize = 0,
+                                   int borderBits = 1);
+
+
+
+
+//! @}
+}
+}
+
+#endif

aruco_pose/vendor/aruco/include/opencv2/aruco/dictionary.hpp

@@ -0,0 +1,212 @@
+/*
+By downloading, copying, installing or using the software you agree to this
+license. If you do not agree to this license, do not download, install,
+copy or use the software.
+
+                          License Agreement
+               For Open Source Computer Vision Library
+                       (3-clause BSD License)
+
+Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+Third party copyrights are property of their respective owners.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+  * Neither the names of the copyright holders nor the names of the contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as is" and
+any express or implied warranties, including, but not limited to, the implied
+warranties of merchantability and fitness for a particular purpose are
+disclaimed. In no event shall copyright holders or contributors be liable for
+any direct, indirect, incidental, special, exemplary, or consequential damages
+(including, but not limited to, procurement of substitute goods or services;
+loss of use, data, or profits; or business interruption) however caused
+and on any theory of liability, whether in contract, strict liability,
+or tort (including negligence or otherwise) arising in any way out of
+the use of this software, even if advised of the possibility of such damage.
+*/
+
+#ifndef __OPENCV_DICTIONARY_HPP__
+#define __OPENCV_DICTIONARY_HPP__
+
+#include <opencv2/core.hpp>
+
+namespace cv {
+namespace aruco {
+
+//! @addtogroup aruco
+//! @{
+
+
+/**
+ * @brief Dictionary/Set of markers. It contains the inner codification
+ *
+ * bytesList contains the marker codewords where
+ * - bytesList.rows is the dictionary size
+ * - each marker is encoded using `nbytes = ceil(markerSize*markerSize/8.)`
+ * - each row contains all 4 rotations of the marker, so its length is `4*nbytes`
+ *
+ * `bytesList.ptr(i)[k*nbytes + j]` is then the j-th byte of i-th marker, in its k-th rotation.
+ */
+class CV_EXPORTS_W Dictionary {
+
+    public:
+    CV_PROP_RW Mat bytesList;         // marker code information
+    CV_PROP_RW int markerSize;        // number of bits per dimension
+    CV_PROP_RW int maxCorrectionBits; // maximum number of bits that can be corrected
+
+
+    /**
+      */
+    Dictionary(const Mat &_bytesList = Mat(), int _markerSize = 0, int _maxcorr = 0);
+
+
+    /**
+    Dictionary(const Dictionary &_dictionary);
+    */
+
+
+    /**
+      */
+    Dictionary(const Ptr<Dictionary> &_dictionary);
+
+
+    /**
+     * @see generateCustomDictionary
+     */
+    CV_WRAP_AS(create) static Ptr<Dictionary> create(int nMarkers, int markerSize, int randomSeed=0);
+
+
+    /**
+     * @see generateCustomDictionary
+     */
+    CV_WRAP_AS(create_from) static Ptr<Dictionary> create(int nMarkers, int markerSize,
+            const Ptr<Dictionary> &baseDictionary, int randomSeed=0);
+
+    /**
+     * @see getPredefinedDictionary
+     */
+    CV_WRAP static Ptr<Dictionary> get(int dict);
+
+    /**
+     * @brief Given a matrix of bits. Returns whether if marker is identified or not.
+     * It returns by reference the correct id (if any) and the correct rotation
+     */
+    bool identify(const Mat &onlyBits, int &idx, int &rotation, double maxCorrectionRate) const;
+
+    /**
+      * @brief Returns the distance of the input bits to the specific id. If allRotations is true,
+      * the four posible bits rotation are considered
+      */
+    int getDistanceToId(InputArray bits, int id, bool allRotations = true) const;
+
+
+    /**
+     * @brief Draw a canonical marker image
+     */
+    CV_WRAP void drawMarker(int id, int sidePixels, OutputArray _img, int borderBits = 1) const;
+
+
+    /**
+      * @brief Transform matrix of bits to list of bytes in the 4 rotations
+      */
+    CV_WRAP static Mat getByteListFromBits(const Mat &bits);
+
+
+    /**
+      * @brief Transform list of bytes to matrix of bits
+      */
+    CV_WRAP static Mat getBitsFromByteList(const Mat &byteList, int markerSize);
+};
+
+
+
+
+/**
+ * @brief Predefined markers dictionaries/sets
+ * Each dictionary indicates the number of bits and the number of markers contained
+ * - DICT_ARUCO_ORIGINAL: standard ArUco Library Markers. 1024 markers, 5x5 bits, 0 minimum
+                          distance
+ */
+enum PREDEFINED_DICTIONARY_NAME {
+    DICT_4X4_50 = 0,
+    DICT_4X4_100,
+    DICT_4X4_250,
+    DICT_4X4_1000,
+    DICT_5X5_50,
+    DICT_5X5_100,
+    DICT_5X5_250,
+    DICT_5X5_1000,
+    DICT_6X6_50,
+    DICT_6X6_100,
+    DICT_6X6_250,
+    DICT_6X6_1000,
+    DICT_7X7_50,
+    DICT_7X7_100,
+    DICT_7X7_250,
+    DICT_7X7_1000,
+    DICT_ARUCO_ORIGINAL,
+    DICT_APRILTAG_16h5,     ///< 4x4 bits, minimum hamming distance between any two codes = 5, 30 codes
+    DICT_APRILTAG_25h9,     ///< 5x5 bits, minimum hamming distance between any two codes = 9, 35 codes
+    DICT_APRILTAG_36h10,    ///< 6x6 bits, minimum hamming distance between any two codes = 10, 2320 codes
+    DICT_APRILTAG_36h11     ///< 6x6 bits, minimum hamming distance between any two codes = 11, 587 codes
+};
+
+
+/**
+  * @brief Returns one of the predefined dictionaries defined in PREDEFINED_DICTIONARY_NAME
+  */
+CV_EXPORTS Ptr<Dictionary> getPredefinedDictionary(PREDEFINED_DICTIONARY_NAME name);
+
+
+/**
+  * @brief Returns one of the predefined dictionaries referenced by DICT_*.
+  */
+CV_EXPORTS_W Ptr<Dictionary> getPredefinedDictionary(int dict);
+
+
+/**
+  * @see generateCustomDictionary
+  */
+CV_EXPORTS_AS(custom_dictionary) Ptr<Dictionary> generateCustomDictionary(
+        int nMarkers,
+        int markerSize,
+        int randomSeed=0);
+
+
+/**
+  * @brief Generates a new customizable marker dictionary
+  *
+  * @param nMarkers number of markers in the dictionary
+  * @param markerSize number of bits per dimension of each markers
+  * @param baseDictionary Include the markers in this dictionary at the beginning (optional)
+  * @param randomSeed a user supplied seed for theRNG()
+  *
+  * This function creates a new dictionary composed by nMarkers markers and each markers composed
+  * by markerSize x markerSize bits. If baseDictionary is provided, its markers are directly
+  * included and the rest are generated based on them. If the size of baseDictionary is higher
+  * than nMarkers, only the first nMarkers in baseDictionary are taken and no new marker is added.
+  */
+CV_EXPORTS_AS(custom_dictionary_from) Ptr<Dictionary> generateCustomDictionary(
+        int nMarkers,
+        int markerSize,
+        const Ptr<Dictionary> &baseDictionary,
+        int randomSeed=0);
+
+
+
+//! @}
+}
+}
+
+#endif

aruco_pose/vendor/aruco/src/apriltag_quad_thresh.hpp

@@ -0,0 +1,125 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2013-2016, The Regents of The University of Michigan.
+//
+// This software was developed in the APRIL Robotics Lab under the
+// direction of Edwin Olson, ebolson@umich.edu. This software may be
+// available under alternative licensing terms; contact the address above.
+//
+// The views and conclusions contained in the software and documentation are those
+// of the authors and should not be interpreted as representing official policies,
+// either expressed or implied, of the Regents of The University of Michigan.
+
+// limitation: image size must be <32768 in width and height. This is
+// because we use a fixed-point 16 bit integer representation with one
+// fractional bit.
+
+#ifndef _OPENCV_APRIL_QUAD_THRESH_HPP_
+#define _OPENCV_APRIL_QUAD_THRESH_HPP_
+
+#include "opencv2/aruco.hpp"
+#include "unionfind.hpp"
+#include "zmaxheap.hpp"
+#include "zarray.hpp"
+
+namespace cv {
+namespace aruco {
+
+static inline uint32_t u64hash_2(uint64_t x) {
+    return uint32_t((2654435761UL * x) >> 32);
+}
+
+struct uint64_zarray_entry{
+    uint64_t id;
+    zarray_t *cluster;
+
+    struct uint64_zarray_entry *next;
+};
+
+struct pt{
+    // Note: these represent 2*actual value.
+    uint16_t x, y;
+    float theta;
+    int16_t gx, gy;
+};
+
+struct remove_vertex{
+    int i;           // which vertex to remove?
+    int left, right; // left vertex, right vertex
+
+    double err;
+};
+
+struct segment{
+    int is_vertex;
+
+    // always greater than zero, but right can be > size, which denotes
+    // a wrap around back to the beginning of the points. and left < right.
+    int left, right;
+};
+
+struct line_fit_pt{
+    double Mx, My;
+    double Mxx, Myy, Mxy;
+    double W; // total weight
+};
+
+/**
+ * lfps contains *cumulative* moments for N points, with
+ * index j reflecting points [0,j] (inclusive).
+ * fit a line to the points [i0, i1] (inclusive). i0, i1 are both (0, sz)
+ * if i1 < i0, we treat this as a wrap around.
+ */
+void fit_line(struct line_fit_pt *lfps, int sz, int i0, int i1, double *lineparm, double *err, double *mse);
+
+int err_compare_descending(const void *_a, const void *_b);
+
+/**
+  1. Identify A) white points near a black point and B) black points near a white point.
+
+  2. Find the connected components within each of the classes above,
+  yielding clusters of "white-near-black" and
+  "black-near-white". (These two classes are kept separate). Each
+  segment has a unique id.
+
+  3. For every pair of "white-near-black" and "black-near-white"
+  clusters, find the set of points that are in one and adjacent to the
+  other. In other words, a "boundary" layer between the two
+  clusters. (This is actually performed by iterating over the pixels,
+  rather than pairs of clusters.) Critically, this helps keep nearby
+  edges from becoming connected.
+ **/
+int quad_segment_maxima(const Ptr<DetectorParameters> &td, int sz, struct line_fit_pt *lfps, int indices[4]);
+
+/**
+ * returns 0 if the cluster looks bad.
+ */
+int quad_segment_agg(int sz, struct line_fit_pt *lfps, int indices[4]);
+
+/**
+ *  return 1 if the quad looks okay, 0 if it should be discarded
+ *  quad
+ **/
+int fit_quad(const Ptr<DetectorParameters> &_params, const Mat im, zarray_t *cluster, struct sQuad *quad);
+
+/**
+ *
+ * @param mIm
+ * @param parameters
+ * @param mThresh
+ */
+void threshold(const Mat mIm, const Ptr<DetectorParameters> &parameters, Mat& mThresh);
+
+/**
+ *
+ * @param parameters
+ * @param mImg
+ * @param contours
+ * @return
+ */
+zarray_t *apriltag_quad_thresh(const Ptr<DetectorParameters> &parameters, const Mat & mImg, std::vector< std::vector< Point > > &contours);
+
+}}
+#endif

aruco_pose/vendor/aruco/src/charuco.cpp

@@ -0,0 +1,934 @@
+/*
+By downloading, copying, installing or using the software you agree to this
+license. If you do not agree to this license, do not download, install,
+copy or use the software.
+
+                          License Agreement
+               For Open Source Computer Vision Library
+                       (3-clause BSD License)
+
+Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+Third party copyrights are property of their respective owners.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+  * Neither the names of the copyright holders nor the names of the contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as is" and
+any express or implied warranties, including, but not limited to, the implied
+warranties of merchantability and fitness for a particular purpose are
+disclaimed. In no event shall copyright holders or contributors be liable for
+any direct, indirect, incidental, special, exemplary, or consequential damages
+(including, but not limited to, procurement of substitute goods or services;
+loss of use, data, or profits; or business interruption) however caused
+and on any theory of liability, whether in contract, strict liability,
+or tort (including negligence or otherwise) arising in any way out of
+the use of this software, even if advised of the possibility of such damage.
+*/
+
+#include "precomp.hpp"
+#include "opencv2/aruco/charuco.hpp"
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+
+
+namespace cv {
+namespace aruco {
+
+using namespace std;
+
+
+
+/**
+ */
+void CharucoBoard::draw(Size outSize, OutputArray _img, int marginSize, int borderBits) {
+
+    /* NOTE: OpenCV v<3.3 does not have .empty() as a Size member */
+    CV_Assert(outSize.height > 0 && outSize.width > 0);
+    CV_Assert(marginSize >= 0);
+
+    _img.create(outSize, CV_8UC1);
+    _img.setTo(255);
+    Mat out = _img.getMat();
+    Mat noMarginsImg =
+        out.colRange(marginSize, out.cols - marginSize).rowRange(marginSize, out.rows - marginSize);
+
+    double totalLengthX, totalLengthY;
+    totalLengthX = _squareLength * _squaresX;
+    totalLengthY = _squareLength * _squaresY;
+
+    // proportional transformation
+    double xReduction = totalLengthX / double(noMarginsImg.cols);
+    double yReduction = totalLengthY / double(noMarginsImg.rows);
+
+    // determine the zone where the chessboard is placed
+    Mat chessboardZoneImg;
+    if(xReduction > yReduction) {
+        int nRows = int(totalLengthY / xReduction);
+        int rowsMargins = (noMarginsImg.rows - nRows) / 2;
+        chessboardZoneImg = noMarginsImg.rowRange(rowsMargins, noMarginsImg.rows - rowsMargins);
+    } else {
+        int nCols = int(totalLengthX / yReduction);
+        int colsMargins = (noMarginsImg.cols - nCols) / 2;
+        chessboardZoneImg = noMarginsImg.colRange(colsMargins, noMarginsImg.cols - colsMargins);
+    }
+
+    // determine the margins to draw only the markers
+    // take the minimum just to be sure
+    double squareSizePixels = min(double(chessboardZoneImg.cols) / double(_squaresX),
+                                  double(chessboardZoneImg.rows) / double(_squaresY));
+
+    double diffSquareMarkerLength = (_squareLength - _markerLength) / 2;
+    int diffSquareMarkerLengthPixels =
+        int(diffSquareMarkerLength * squareSizePixels / _squareLength);
+
+    // draw markers
+    Mat markersImg;
+    aruco::_drawPlanarBoardImpl(this, chessboardZoneImg.size(), markersImg,
+                                diffSquareMarkerLengthPixels, borderBits);
+
+    markersImg.copyTo(chessboardZoneImg);
+
+    // now draw black squares
+    for(int y = 0; y < _squaresY; y++) {
+        for(int x = 0; x < _squaresX; x++) {
+
+            if(y % 2 != x % 2) continue; // white corner, dont do anything
+
+            double startX, startY;
+            startX = squareSizePixels * double(x);
+            startY = double(chessboardZoneImg.rows) - squareSizePixels * double(y + 1);
+
+            Mat squareZone = chessboardZoneImg.rowRange(int(startY), int(startY + squareSizePixels))
+                                 .colRange(int(startX), int(startX + squareSizePixels));
+
+            squareZone.setTo(0);
+        }
+    }
+}
+
+
+
+/**
+ */
+Ptr<CharucoBoard> CharucoBoard::create(int squaresX, int squaresY, float squareLength,
+                                  float markerLength, const Ptr<Dictionary> &dictionary) {
+
+    CV_Assert(squaresX > 1 && squaresY > 1 && markerLength > 0 && squareLength > markerLength);
+    Ptr<CharucoBoard> res = makePtr<CharucoBoard>();
+
+    res->_squaresX = squaresX;
+    res->_squaresY = squaresY;
+    res->_squareLength = squareLength;
+    res->_markerLength = markerLength;
+    res->dictionary = dictionary;
+
+    float diffSquareMarkerLength = (squareLength - markerLength) / 2;
+
+    // calculate Board objPoints
+    for(int y = squaresY - 1; y >= 0; y--) {
+        for(int x = 0; x < squaresX; x++) {
+
+            if(y % 2 == x % 2) continue; // black corner, no marker here
+
+            vector< Point3f > corners;
+            corners.resize(4);
+            corners[0] = Point3f(x * squareLength + diffSquareMarkerLength,
+                                 y * squareLength + diffSquareMarkerLength + markerLength, 0);
+            corners[1] = corners[0] + Point3f(markerLength, 0, 0);
+            corners[2] = corners[0] + Point3f(markerLength, -markerLength, 0);
+            corners[3] = corners[0] + Point3f(0, -markerLength, 0);
+            res->objPoints.push_back(corners);
+            // first ids in dictionary
+            int nextId = (int)res->ids.size();
+            res->ids.push_back(nextId);
+        }
+    }
+
+    // now fill chessboardCorners
+    for(int y = 0; y < squaresY - 1; y++) {
+        for(int x = 0; x < squaresX - 1; x++) {
+            Point3f corner;
+            corner.x = (x + 1) * squareLength;
+            corner.y = (y + 1) * squareLength;
+            corner.z = 0;
+            res->chessboardCorners.push_back(corner);
+        }
+    }
+
+    res->_getNearestMarkerCorners();
+
+    return res;
+}
+
+
+
+/**
+  * Fill nearestMarkerIdx and nearestMarkerCorners arrays
+  */
+void CharucoBoard::_getNearestMarkerCorners() {
+
+    nearestMarkerIdx.resize(chessboardCorners.size());
+    nearestMarkerCorners.resize(chessboardCorners.size());
+
+    unsigned int nMarkers = (unsigned int)ids.size();
+    unsigned int nCharucoCorners = (unsigned int)chessboardCorners.size();
+    for(unsigned int i = 0; i < nCharucoCorners; i++) {
+        double minDist = -1; // distance of closest markers
+        Point3f charucoCorner = chessboardCorners[i];
+        for(unsigned int j = 0; j < nMarkers; j++) {
+            // calculate distance from marker center to charuco corner
+            Point3f center = Point3f(0, 0, 0);
+            for(unsigned int k = 0; k < 4; k++)
+                center += objPoints[j][k];
+            center /= 4.;
+            double sqDistance;
+            Point3f distVector = charucoCorner - center;
+            sqDistance = distVector.x * distVector.x + distVector.y * distVector.y;
+            if(j == 0 || fabs(sqDistance - minDist) < cv::pow(0.01 * _squareLength, 2)) {
+                // if same minimum distance (or first iteration), add to nearestMarkerIdx vector
+                nearestMarkerIdx[i].push_back(j);
+                minDist = sqDistance;
+            } else if(sqDistance < minDist) {
+                // if finding a closest marker to the charuco corner
+                nearestMarkerIdx[i].clear(); // remove any previous added marker
+                nearestMarkerIdx[i].push_back(j); // add the new closest marker index
+                minDist = sqDistance;
+            }
+        }
+
+        // for each of the closest markers, search the marker corner index closer
+        // to the charuco corner
+        for(unsigned int j = 0; j < nearestMarkerIdx[i].size(); j++) {
+            nearestMarkerCorners[i].resize(nearestMarkerIdx[i].size());
+            double minDistCorner = -1;
+            for(unsigned int k = 0; k < 4; k++) {
+                double sqDistance;
+                Point3f distVector = charucoCorner - objPoints[nearestMarkerIdx[i][j]][k];
+                sqDistance = distVector.x * distVector.x + distVector.y * distVector.y;
+                if(k == 0 || sqDistance < minDistCorner) {
+                    // if this corner is closer to the charuco corner, assing its index
+                    // to nearestMarkerCorners
+                    minDistCorner = sqDistance;
+                    nearestMarkerCorners[i][j] = k;
+                }
+            }
+        }
+    }
+}
+
+
+/**
+  * Remove charuco corners if any of their minMarkers closest markers has not been detected
+  */
+static int _filterCornersWithoutMinMarkers(const Ptr<CharucoBoard> &_board,
+                                                    InputArray _allCharucoCorners,
+                                                    InputArray _allCharucoIds,
+                                                    InputArray _allArucoIds, int minMarkers,
+                                                    OutputArray _filteredCharucoCorners,
+                                                    OutputArray _filteredCharucoIds) {
+
+    CV_Assert(minMarkers >= 0 && minMarkers <= 2);
+
+    vector< Point2f > filteredCharucoCorners;
+    vector< int > filteredCharucoIds;
+    // for each charuco corner
+    for(unsigned int i = 0; i < _allCharucoIds.getMat().total(); i++) {
+        int currentCharucoId = _allCharucoIds.getMat().at< int >(i);
+        int totalMarkers = 0; // nomber of closest marker detected
+        // look for closest markers
+        for(unsigned int m = 0; m < _board->nearestMarkerIdx[currentCharucoId].size(); m++) {
+            int markerId = _board->ids[_board->nearestMarkerIdx[currentCharucoId][m]];
+            bool found = false;
+            for(unsigned int k = 0; k < _allArucoIds.getMat().total(); k++) {
+                if(_allArucoIds.getMat().at< int >(k) == markerId) {
+                    found = true;
+                    break;
+                }
+            }
+            if(found) totalMarkers++;
+        }
+        // if enough markers detected, add the charuco corner to the final list
+        if(totalMarkers >= minMarkers) {
+            filteredCharucoIds.push_back(currentCharucoId);
+            filteredCharucoCorners.push_back(_allCharucoCorners.getMat().at< Point2f >(i));
+        }
+    }
+
+    // parse output
+    Mat(filteredCharucoCorners).copyTo(_filteredCharucoCorners);
+    Mat(filteredCharucoIds).copyTo(_filteredCharucoIds);
+    return (int)_filteredCharucoIds.total();
+}
+
+
+/**
+  * ParallelLoopBody class for the parallelization of the charuco corners subpixel refinement
+  * Called from function _selectAndRefineChessboardCorners()
+  */
+class CharucoSubpixelParallel : public ParallelLoopBody {
+    public:
+    CharucoSubpixelParallel(const Mat *_grey, vector< Point2f > *_filteredChessboardImgPoints,
+                            vector< Size > *_filteredWinSizes, const Ptr<DetectorParameters> &_params)
+        : grey(_grey), filteredChessboardImgPoints(_filteredChessboardImgPoints),
+          filteredWinSizes(_filteredWinSizes), params(_params) {}
+
+    void operator()(const Range &range) const CV_OVERRIDE {
+        const int begin = range.start;
+        const int end = range.end;
+
+        for(int i = begin; i < end; i++) {
+            vector< Point2f > in;
+            in.push_back((*filteredChessboardImgPoints)[i]);
+            Size winSize = (*filteredWinSizes)[i];
+            if(winSize.height == -1 || winSize.width == -1)
+                winSize = Size(params->cornerRefinementWinSize, params->cornerRefinementWinSize);
+
+            cornerSubPix(*grey, in, winSize, Size(),
+                         TermCriteria(TermCriteria::MAX_ITER | TermCriteria::EPS,
+                                      params->cornerRefinementMaxIterations,
+                                      params->cornerRefinementMinAccuracy));
+
+            (*filteredChessboardImgPoints)[i] = in[0];
+        }
+    }
+
+    private:
+    CharucoSubpixelParallel &operator=(const CharucoSubpixelParallel &); // to quiet MSVC
+
+    const Mat *grey;
+    vector< Point2f > *filteredChessboardImgPoints;
+    vector< Size > *filteredWinSizes;
+    const Ptr<DetectorParameters> &params;
+};
+
+
+
+
+/**
+  * @brief From all projected chessboard corners, select those inside the image and apply subpixel
+  * refinement. Returns number of valid corners.
+  */
+static int _selectAndRefineChessboardCorners(InputArray _allCorners, InputArray _image,
+                                                      OutputArray _selectedCorners,
+                                                      OutputArray _selectedIds,
+                                                      const vector< Size > &winSizes) {
+
+    const int minDistToBorder = 2; // minimum distance of the corner to the image border
+    // remaining corners, ids and window refinement sizes after removing corners outside the image
+    vector< Point2f > filteredChessboardImgPoints;
+    vector< Size > filteredWinSizes;
+    vector< int > filteredIds;
+
+    // filter corners outside the image
+    Rect innerRect(minDistToBorder, minDistToBorder, _image.getMat().cols - 2 * minDistToBorder,
+                   _image.getMat().rows - 2 * minDistToBorder);
+    for(unsigned int i = 0; i < _allCorners.getMat().total(); i++) {
+        if(innerRect.contains(_allCorners.getMat().at< Point2f >(i))) {
+            filteredChessboardImgPoints.push_back(_allCorners.getMat().at< Point2f >(i));
+            filteredIds.push_back(i);
+            filteredWinSizes.push_back(winSizes[i]);
+        }
+    }
+
+    // if none valid, return 0
+    if(filteredChessboardImgPoints.size() == 0) return 0;
+
+    // corner refinement, first convert input image to grey
+    Mat grey;
+    if(_image.type() == CV_8UC3)
+        cvtColor(_image, grey, COLOR_BGR2GRAY);
+    else
+        _image.copyTo(grey);
+
+    const Ptr<DetectorParameters> params = DetectorParameters::create(); // use default params for corner refinement
+
+    //// For each of the charuco corners, apply subpixel refinement using its correspondind winSize
+    // for(unsigned int i=0; i<filteredChessboardImgPoints.size(); i++) {
+    //    vector<Point2f> in;
+    //    in.push_back(filteredChessboardImgPoints[i]);
+    //    Size winSize = filteredWinSizes[i];
+    //    if(winSize.height == -1 || winSize.width == -1)
+    //        winSize = Size(params.cornerRefinementWinSize, params.cornerRefinementWinSize);
+    //    cornerSubPix(grey, in, winSize, Size(),
+    //                 TermCriteria(TermCriteria::MAX_ITER | TermCriteria::EPS,
+    //                              params->cornerRefinementMaxIterations,
+    //                              params->cornerRefinementMinAccuracy));
+    //    filteredChessboardImgPoints[i] = in[0];
+    //}
+
+    // this is the parallel call for the previous commented loop (result is equivalent)
+    parallel_for_(
+        Range(0, (int)filteredChessboardImgPoints.size()),
+        CharucoSubpixelParallel(&grey, &filteredChessboardImgPoints, &filteredWinSizes, params));
+
+    // parse output
+    Mat(filteredChessboardImgPoints).copyTo(_selectedCorners);
+    Mat(filteredIds).copyTo(_selectedIds);
+    return (int)filteredChessboardImgPoints.size();
+}
+
+
+/**
+  * Calculate the maximum window sizes for corner refinement for each charuco corner based on the
+  * distance to their closest markers
+  */
+static void _getMaximumSubPixWindowSizes(InputArrayOfArrays markerCorners, InputArray markerIds,
+                                         InputArray charucoCorners, const Ptr<CharucoBoard> &board,
+                                         vector< Size > &sizes) {
+
+    unsigned int nCharucoCorners = (unsigned int)charucoCorners.getMat().total();
+    sizes.resize(nCharucoCorners, Size(-1, -1));
+
+    for(unsigned int i = 0; i < nCharucoCorners; i++) {
+        if(charucoCorners.getMat().at< Point2f >(i) == Point2f(-1, -1)) continue;
+        if(board->nearestMarkerIdx[i].size() == 0) continue;
+
+        double minDist = -1;
+        int counter = 0;
+
+        // calculate the distance to each of the closest corner of each closest marker
+        for(unsigned int j = 0; j < board->nearestMarkerIdx[i].size(); j++) {
+            // find marker
+            int markerId = board->ids[board->nearestMarkerIdx[i][j]];
+            int markerIdx = -1;
+            for(unsigned int k = 0; k < markerIds.getMat().total(); k++) {
+                if(markerIds.getMat().at< int >(k) == markerId) {
+                    markerIdx = k;
+                    break;
+                }
+            }
+            if(markerIdx == -1) continue;
+            Point2f markerCorner =
+                markerCorners.getMat(markerIdx).at< Point2f >(board->nearestMarkerCorners[i][j]);
+            Point2f charucoCorner = charucoCorners.getMat().at< Point2f >(i);
+            double dist = norm(markerCorner - charucoCorner);
+            if(minDist == -1) minDist = dist; // if first distance, just assign it
+            minDist = min(dist, minDist);
+            counter++;
+        }
+
+        // if this is the first closest marker, dont do anything
+        if(counter == 0)
+            continue;
+        else {
+            // else, calculate the maximum window size
+            int winSizeInt = int(minDist - 2); // remove 2 pixels for safety
+            if(winSizeInt < 1) winSizeInt = 1; // minimum size is 1
+            if(winSizeInt > 10) winSizeInt = 10; // maximum size is 10
+            sizes[i] = Size(winSizeInt, winSizeInt);
+        }
+    }
+}
+
+
+
+/**
+  * Interpolate charuco corners using approximated pose estimation
+  */
+static int _interpolateCornersCharucoApproxCalib(InputArrayOfArrays _markerCorners,
+                                                 InputArray _markerIds, InputArray _image,
+                                                 const Ptr<CharucoBoard> &_board,
+                                                 InputArray _cameraMatrix, InputArray _distCoeffs,
+                                                 OutputArray _charucoCorners,
+                                                 OutputArray _charucoIds) {
+
+    CV_Assert(_image.getMat().channels() == 1 || _image.getMat().channels() == 3);
+    CV_Assert(_markerCorners.total() == _markerIds.getMat().total() &&
+              _markerIds.getMat().total() > 0);
+
+    // approximated pose estimation using marker corners
+    Mat approximatedRvec, approximatedTvec;
+    int detectedBoardMarkers;
+    Ptr<Board> _b = _board.staticCast<Board>();
+    detectedBoardMarkers =
+        aruco::estimatePoseBoard(_markerCorners, _markerIds, _b,
+                                 _cameraMatrix, _distCoeffs, approximatedRvec, approximatedTvec);
+
+    if(detectedBoardMarkers == 0) return 0;
+
+    // project chessboard corners
+    vector< Point2f > allChessboardImgPoints;
+
+    projectPoints(_board->chessboardCorners, approximatedRvec, approximatedTvec, _cameraMatrix,
+                  _distCoeffs, allChessboardImgPoints);
+
+
+    // calculate maximum window sizes for subpixel refinement. The size is limited by the distance
+    // to the closes marker corner to avoid erroneous displacements to marker corners
+    vector< Size > subPixWinSizes;
+    _getMaximumSubPixWindowSizes(_markerCorners, _markerIds, allChessboardImgPoints, _board,
+                                 subPixWinSizes);
+
+    // filter corners outside the image and subpixel-refine charuco corners
+    return _selectAndRefineChessboardCorners(allChessboardImgPoints, _image, _charucoCorners,
+                                             _charucoIds, subPixWinSizes);
+}
+
+
+
+/**
+  * Interpolate charuco corners using local homography
+  */
+static int _interpolateCornersCharucoLocalHom(InputArrayOfArrays _markerCorners,
+                                              InputArray _markerIds, InputArray _image,
+                                              const Ptr<CharucoBoard> &_board,
+                                              OutputArray _charucoCorners,
+                                              OutputArray _charucoIds) {
+
+    CV_Assert(_image.getMat().channels() == 1 || _image.getMat().channels() == 3);
+    CV_Assert(_markerCorners.total() == _markerIds.getMat().total() &&
+              _markerIds.getMat().total() > 0);
+
+    unsigned int nMarkers = (unsigned int)_markerIds.getMat().total();
+
+    // calculate local homographies for each marker
+    vector< Mat > transformations;
+    transformations.resize(nMarkers);
+    for(unsigned int i = 0; i < nMarkers; i++) {
+        vector< Point2f > markerObjPoints2D;
+        int markerId = _markerIds.getMat().at< int >(i);
+        vector< int >::const_iterator it = find(_board->ids.begin(), _board->ids.end(), markerId);
+        if(it == _board->ids.end()) continue;
+        int boardIdx = (int)std::distance<std::vector<int>::const_iterator>(_board->ids.begin(), it);
+        markerObjPoints2D.resize(4);
+        for(unsigned int j = 0; j < 4; j++)
+            markerObjPoints2D[j] =
+                Point2f(_board->objPoints[boardIdx][j].x, _board->objPoints[boardIdx][j].y);
+
+        transformations[i] = getPerspectiveTransform(markerObjPoints2D, _markerCorners.getMat(i));
+    }
+
+    unsigned int nCharucoCorners = (unsigned int)_board->chessboardCorners.size();
+    vector< Point2f > allChessboardImgPoints(nCharucoCorners, Point2f(-1, -1));
+
+    // for each charuco corner, calculate its interpolation position based on the closest markers
+    // homographies
+    for(unsigned int i = 0; i < nCharucoCorners; i++) {
+        Point2f objPoint2D = Point2f(_board->chessboardCorners[i].x, _board->chessboardCorners[i].y);
+
+        vector< Point2f > interpolatedPositions;
+        for(unsigned int j = 0; j < _board->nearestMarkerIdx[i].size(); j++) {
+            int markerId = _board->ids[_board->nearestMarkerIdx[i][j]];
+            int markerIdx = -1;
+            for(unsigned int k = 0; k < _markerIds.getMat().total(); k++) {
+                if(_markerIds.getMat().at< int >(k) == markerId) {
+                    markerIdx = k;
+                    break;
+                }
+            }
+            if(markerIdx != -1) {
+                vector< Point2f > in, out;
+                in.push_back(objPoint2D);
+                perspectiveTransform(in, out, transformations[markerIdx]);
+                interpolatedPositions.push_back(out[0]);
+            }
+        }
+
+        // none of the closest markers detected
+        if(interpolatedPositions.size() == 0) continue;
+
+        // more than one closest marker detected, take middle point
+        if(interpolatedPositions.size() > 1) {
+            allChessboardImgPoints[i] = (interpolatedPositions[0] + interpolatedPositions[1]) / 2.;
+        }
+        // a single closest marker detected
+        else allChessboardImgPoints[i] = interpolatedPositions[0];
+    }
+
+    // calculate maximum window sizes for subpixel refinement. The size is limited by the distance
+    // to the closes marker corner to avoid erroneous displacements to marker corners
+    vector< Size > subPixWinSizes;
+    _getMaximumSubPixWindowSizes(_markerCorners, _markerIds, allChessboardImgPoints, _board,
+                                 subPixWinSizes);
+
+
+    // filter corners outside the image and subpixel-refine charuco corners
+    return _selectAndRefineChessboardCorners(allChessboardImgPoints, _image, _charucoCorners,
+                                             _charucoIds, subPixWinSizes);
+}
+
+
+
+/**
+  */
+int interpolateCornersCharuco(InputArrayOfArrays _markerCorners, InputArray _markerIds,
+                              InputArray _image, const Ptr<CharucoBoard> &_board,
+                              OutputArray _charucoCorners, OutputArray _charucoIds,
+                              InputArray _cameraMatrix, InputArray _distCoeffs, int minMarkers) {
+
+    // if camera parameters are avaible, use approximated calibration
+    if(_cameraMatrix.total() != 0) {
+        _interpolateCornersCharucoApproxCalib(_markerCorners, _markerIds, _image, _board,
+                                                     _cameraMatrix, _distCoeffs, _charucoCorners,
+                                                     _charucoIds);
+    }
+    // else use local homography
+    else {
+        _interpolateCornersCharucoLocalHom(_markerCorners, _markerIds, _image, _board,
+                                                  _charucoCorners, _charucoIds);
+    }
+
+    // to return a charuco corner, its closest aruco markers should have been detected
+    return _filterCornersWithoutMinMarkers(_board, _charucoCorners, _charucoIds, _markerIds,
+                                           minMarkers, _charucoCorners, _charucoIds);
+}
+
+
+
+/**
+  */
+void drawDetectedCornersCharuco(InputOutputArray _image, InputArray _charucoCorners,
+                                InputArray _charucoIds, Scalar cornerColor) {
+
+    CV_Assert(_image.getMat().total() != 0 &&
+              (_image.getMat().channels() == 1 || _image.getMat().channels() == 3));
+    CV_Assert((_charucoCorners.getMat().total() == _charucoIds.getMat().total()) ||
+              _charucoIds.getMat().total() == 0);
+
+    unsigned int nCorners = (unsigned int)_charucoCorners.getMat().total();
+    for(unsigned int i = 0; i < nCorners; i++) {
+        Point2f corner = _charucoCorners.getMat().at< Point2f >(i);
+
+        // draw first corner mark
+        rectangle(_image, corner - Point2f(3, 3), corner + Point2f(3, 3), cornerColor, 1, LINE_AA);
+
+        // draw ID
+        if(_charucoIds.total() != 0) {
+            int id = _charucoIds.getMat().at< int >(i);
+            stringstream s;
+            s << "id=" << id;
+            putText(_image, s.str(), corner + Point2f(5, -5), FONT_HERSHEY_SIMPLEX, 0.5,
+                    cornerColor, 2);
+        }
+    }
+}
+
+
+/**
+  * Check if a set of 3d points are enough for calibration. Z coordinate is ignored.
+  * Only axis paralel lines are considered
+  */
+static bool _arePointsEnoughForPoseEstimation(const vector< Point3f > &points) {
+
+    if(points.size() < 4) return false;
+
+    vector< double > sameXValue; // different x values in points
+    vector< int > sameXCounter;  // number of points with the x value in sameXValue
+    for(unsigned int i = 0; i < points.size(); i++) {
+        bool found = false;
+        for(unsigned int j = 0; j < sameXValue.size(); j++) {
+            if(sameXValue[j] == points[i].x) {
+                found = true;
+                sameXCounter[j]++;
+            }
+        }
+        if(!found) {
+            sameXValue.push_back(points[i].x);
+            sameXCounter.push_back(1);
+        }
+    }
+
+    // count how many x values has more than 2 points
+    int moreThan2 = 0;
+    for(unsigned int i = 0; i < sameXCounter.size(); i++) {
+        if(sameXCounter[i] >= 2) moreThan2++;
+    }
+
+    // if we have more than 1 two xvalues with more than 2 points, calibration is ok
+    if(moreThan2 > 1)
+        return true;
+    else
+        return false;
+}
+
+
+/**
+  */
+bool estimatePoseCharucoBoard(InputArray _charucoCorners, InputArray _charucoIds,
+                              const Ptr<CharucoBoard> &_board, InputArray _cameraMatrix, InputArray _distCoeffs,
+                              OutputArray _rvec, OutputArray _tvec, bool useExtrinsicGuess) {
+
+    CV_Assert((_charucoCorners.getMat().total() == _charucoIds.getMat().total()));
+
+    // need, at least, 4 corners
+    if(_charucoIds.getMat().total() < 4) return false;
+
+    vector< Point3f > objPoints;
+    objPoints.reserve(_charucoIds.getMat().total());
+    for(unsigned int i = 0; i < _charucoIds.getMat().total(); i++) {
+        int currId = _charucoIds.getMat().at< int >(i);
+        CV_Assert(currId >= 0 && currId < (int)_board->chessboardCorners.size());
+        objPoints.push_back(_board->chessboardCorners[currId]);
+    }
+
+    // points need to be in different lines, check if detected points are enough
+    if(!_arePointsEnoughForPoseEstimation(objPoints)) return false;
+
+    solvePnP(objPoints, _charucoCorners, _cameraMatrix, _distCoeffs, _rvec, _tvec, useExtrinsicGuess);
+
+    return true;
+}
+
+
+
+
+/**
+  */
+double calibrateCameraCharuco(InputArrayOfArrays _charucoCorners, InputArrayOfArrays _charucoIds,
+                              const Ptr<CharucoBoard> &_board, Size imageSize,
+                              InputOutputArray _cameraMatrix, InputOutputArray _distCoeffs,
+                              OutputArrayOfArrays _rvecs, OutputArrayOfArrays _tvecs,
+                              OutputArray _stdDeviationsIntrinsics,
+                              OutputArray _stdDeviationsExtrinsics,
+                              OutputArray _perViewErrors,
+                              int flags, TermCriteria criteria) {
+
+    CV_Assert(_charucoIds.total() > 0 && (_charucoIds.total() == _charucoCorners.total()));
+
+    // Join object points of charuco corners in a single vector for calibrateCamera() function
+    vector< vector< Point3f > > allObjPoints;
+    allObjPoints.resize(_charucoIds.total());
+    for(unsigned int i = 0; i < _charucoIds.total(); i++) {
+        unsigned int nCorners = (unsigned int)_charucoIds.getMat(i).total();
+        CV_Assert(nCorners > 0 && nCorners == _charucoCorners.getMat(i).total());
+        allObjPoints[i].reserve(nCorners);
+
+        for(unsigned int j = 0; j < nCorners; j++) {
+            int pointId = _charucoIds.getMat(i).at< int >(j);
+            CV_Assert(pointId >= 0 && pointId < (int)_board->chessboardCorners.size());
+            allObjPoints[i].push_back(_board->chessboardCorners[pointId]);
+        }
+    }
+
+    return calibrateCamera(allObjPoints, _charucoCorners, imageSize, _cameraMatrix, _distCoeffs,
+                           _rvecs, _tvecs, _stdDeviationsIntrinsics, _stdDeviationsExtrinsics,
+                           _perViewErrors, flags, criteria);
+}
+
+
+
+/**
+ */
+double calibrateCameraCharuco(InputArrayOfArrays _charucoCorners, InputArrayOfArrays _charucoIds,
+  const Ptr<CharucoBoard> &_board, Size imageSize,
+  InputOutputArray _cameraMatrix, InputOutputArray _distCoeffs,
+  OutputArrayOfArrays _rvecs, OutputArrayOfArrays _tvecs, int flags,
+  TermCriteria criteria) {
+    return calibrateCameraCharuco(_charucoCorners, _charucoIds, _board, imageSize, _cameraMatrix, _distCoeffs, _rvecs,
+      _tvecs, noArray(), noArray(), noArray(), flags, criteria);
+}
+
+
+/**
+ */
+void detectCharucoDiamond(InputArray _image, InputArrayOfArrays _markerCorners,
+                          InputArray _markerIds, float squareMarkerLengthRate,
+                          OutputArrayOfArrays _diamondCorners, OutputArray _diamondIds,
+                          InputArray _cameraMatrix, InputArray _distCoeffs) {
+
+    CV_Assert(_markerIds.total() > 0 && _markerIds.total() == _markerCorners.total());
+
+    const float minRepDistanceRate = 1.302455f;
+
+    // create Charuco board layout for diamond (3x3 layout)
+    Ptr<Dictionary> dict = getPredefinedDictionary(PREDEFINED_DICTIONARY_NAME(0));
+    Ptr<CharucoBoard> _charucoDiamondLayout = CharucoBoard::create(3, 3, squareMarkerLengthRate, 1., dict);
+
+
+    vector< vector< Point2f > > diamondCorners;
+    vector< Vec4i > diamondIds;
+
+    // stores if the detected markers have been assigned or not to a diamond
+    vector< bool > assigned(_markerIds.total(), false);
+    if(_markerIds.total() < 4) return; // a diamond need at least 4 markers
+
+    // convert input image to grey
+    Mat grey;
+    if(_image.type() == CV_8UC3)
+        cvtColor(_image, grey, COLOR_BGR2GRAY);
+    else
+        _image.copyTo(grey);
+
+    // for each of the detected markers, try to find a diamond
+    for(unsigned int i = 0; i < _markerIds.total(); i++) {
+        if(assigned[i]) continue;
+
+        // calculate marker perimeter
+        float perimeterSq = 0;
+        Mat corners = _markerCorners.getMat(i);
+        for(int c = 0; c < 4; c++) {
+          Point2f edge = corners.at< Point2f >(c) - corners.at< Point2f >((c + 1) % 4);
+          perimeterSq += edge.x*edge.x + edge.y*edge.y;
+        }
+        // maximum reprojection error relative to perimeter
+        float minRepDistance = sqrt(perimeterSq) * minRepDistanceRate;
+
+        int currentId = _markerIds.getMat().at< int >(i);
+
+        // prepare data to call refineDetectedMarkers()
+        // detected markers (only the current one)
+        vector< Mat > currentMarker;
+        vector< int > currentMarkerId;
+        currentMarker.push_back(_markerCorners.getMat(i));
+        currentMarkerId.push_back(currentId);
+
+        // marker candidates (the rest of markers if they have not been assigned)
+        vector< Mat > candidates;
+        vector< int > candidatesIdxs;
+        for(unsigned int k = 0; k < assigned.size(); k++) {
+            if(k == i) continue;
+            if(!assigned[k]) {
+                candidates.push_back(_markerCorners.getMat(k));
+                candidatesIdxs.push_back(k);
+            }
+        }
+        if(candidates.size() < 3) break; // we need at least 3 free markers
+
+        // modify charuco layout id to make sure all the ids are different than current id
+        for(int k = 1; k < 4; k++)
+            _charucoDiamondLayout->ids[k] = currentId + 1 + k;
+        // current id is assigned to [0], so it is the marker on the top
+        _charucoDiamondLayout->ids[0] = currentId;
+
+        // try to find the rest of markers in the diamond
+        vector< int > acceptedIdxs;
+        Ptr<Board> _b = _charucoDiamondLayout.staticCast<Board>();
+        aruco::refineDetectedMarkers(grey, _b,
+                                     currentMarker, currentMarkerId,
+                                     candidates, noArray(), noArray(), minRepDistance, -1, false,
+                                     acceptedIdxs);
+
+        // if found, we have a diamond
+        if(currentMarker.size() == 4) {
+
+            assigned[i] = true;
+
+            // calculate diamond id, acceptedIdxs array indicates the markers taken from candidates
+            // array
+            Vec4i markerId;
+            markerId[0] = currentId;
+            for(int k = 1; k < 4; k++) {
+                int currentMarkerIdx = candidatesIdxs[acceptedIdxs[k - 1]];
+                markerId[k] = _markerIds.getMat().at< int >(currentMarkerIdx);
+                assigned[currentMarkerIdx] = true;
+            }
+
+            // interpolate the charuco corners of the diamond
+            vector< Point2f > currentMarkerCorners;
+            Mat aux;
+            interpolateCornersCharuco(currentMarker, currentMarkerId, grey, _charucoDiamondLayout,
+                                      currentMarkerCorners, aux, _cameraMatrix, _distCoeffs);
+
+            // if everything is ok, save the diamond
+            if(currentMarkerCorners.size() > 0) {
+                // reorder corners
+                vector< Point2f > currentMarkerCornersReorder;
+                currentMarkerCornersReorder.resize(4);
+                currentMarkerCornersReorder[0] = currentMarkerCorners[2];
+                currentMarkerCornersReorder[1] = currentMarkerCorners[3];
+                currentMarkerCornersReorder[2] = currentMarkerCorners[1];
+                currentMarkerCornersReorder[3] = currentMarkerCorners[0];
+
+                diamondCorners.push_back(currentMarkerCornersReorder);
+                diamondIds.push_back(markerId);
+            }
+        }
+    }
+
+
+    if(diamondIds.size() > 0) {
+        // parse output
+        Mat(diamondIds).copyTo(_diamondIds);
+
+        _diamondCorners.create((int)diamondCorners.size(), 1, CV_32FC2);
+        for(unsigned int i = 0; i < diamondCorners.size(); i++) {
+            _diamondCorners.create(4, 1, CV_32FC2, i, true);
+            for(int j = 0; j < 4; j++) {
+                _diamondCorners.getMat(i).at< Point2f >(j) = diamondCorners[i][j];
+            }
+        }
+    }
+}
+
+
+
+
+/**
+  */
+void drawCharucoDiamond(const Ptr<Dictionary> &dictionary, Vec4i ids, int squareLength, int markerLength,
+                        OutputArray _img, int marginSize, int borderBits) {
+
+    CV_Assert(squareLength > 0 && markerLength > 0 && squareLength > markerLength);
+    CV_Assert(marginSize >= 0 && borderBits > 0);
+
+    // create a charuco board similar to a charuco marker and print it
+    Ptr<CharucoBoard> board =
+        CharucoBoard::create(3, 3, (float)squareLength, (float)markerLength, dictionary);
+
+    // assign the charuco marker ids
+    for(int i = 0; i < 4; i++)
+        board->ids[i] = ids[i];
+
+    Size outSize(3 * squareLength + 2 * marginSize, 3 * squareLength + 2 * marginSize);
+    board->draw(outSize, _img, marginSize, borderBits);
+}
+
+
+/**
+ */
+void drawDetectedDiamonds(InputOutputArray _image, InputArrayOfArrays _corners,
+                          InputArray _ids, Scalar borderColor) {
+
+
+    CV_Assert(_image.getMat().total() != 0 &&
+              (_image.getMat().channels() == 1 || _image.getMat().channels() == 3));
+    CV_Assert((_corners.total() == _ids.total()) || _ids.total() == 0);
+
+    // calculate colors
+    Scalar textColor, cornerColor;
+    textColor = cornerColor = borderColor;
+    swap(textColor.val[0], textColor.val[1]);     // text color just sawp G and R
+    swap(cornerColor.val[1], cornerColor.val[2]); // corner color just sawp G and B
+
+    int nMarkers = (int)_corners.total();
+    for(int i = 0; i < nMarkers; i++) {
+        Mat currentMarker = _corners.getMat(i);
+        CV_Assert(currentMarker.total() == 4 && currentMarker.type() == CV_32FC2);
+
+        // draw marker sides
+        for(int j = 0; j < 4; j++) {
+            Point2f p0, p1;
+            p0 = currentMarker.at< Point2f >(j);
+            p1 = currentMarker.at< Point2f >((j + 1) % 4);
+            line(_image, p0, p1, borderColor, 1);
+        }
+
+        // draw first corner mark
+        rectangle(_image, currentMarker.at< Point2f >(0) - Point2f(3, 3),
+                  currentMarker.at< Point2f >(0) + Point2f(3, 3), cornerColor, 1, LINE_AA);
+
+        // draw id composed by four numbers
+        if(_ids.total() != 0) {
+            Point2f cent(0, 0);
+            for(int p = 0; p < 4; p++)
+                cent += currentMarker.at< Point2f >(p);
+            cent = cent / 4.;
+            stringstream s;
+            s << "id=" << _ids.getMat().at< Vec4i >(i);
+            putText(_image, s.str(), cent, FONT_HERSHEY_SIMPLEX, 0.5, textColor, 2);
+        }
+    }
+}
+}
+}

aruco_pose/vendor/aruco/src/dictionary.cpp

@@ -0,0 +1,494 @@
+/*
+By downloading, copying, installing or using the software you agree to this
+license. If you do not agree to this license, do not download, install,
+copy or use the software.
+
+                          License Agreement
+               For Open Source Computer Vision Library
+                       (3-clause BSD License)
+
+Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+Third party copyrights are property of their respective owners.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+  * Neither the names of the copyright holders nor the names of the contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as is" and
+any express or implied warranties, including, but not limited to, the implied
+warranties of merchantability and fitness for a particular purpose are
+disclaimed. In no event shall copyright holders or contributors be liable for
+any direct, indirect, incidental, special, exemplary, or consequential damages
+(including, but not limited to, procurement of substitute goods or services;
+loss of use, data, or profits; or business interruption) however caused
+and on any theory of liability, whether in contract, strict liability,
+or tort (including negligence or otherwise) arising in any way out of
+the use of this software, even if advised of the possibility of such damage.
+*/
+
+#include "precomp.hpp"
+#include "opencv2/aruco/dictionary.hpp"
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include "predefined_dictionaries.hpp"
+#include "predefined_dictionaries_apriltag.hpp"
+#include "opencv2/core/hal/hal.hpp"
+
+namespace cv {
+namespace aruco {
+
+using namespace std;
+
+
+/**
+  */
+Dictionary::Dictionary(const Ptr<Dictionary> &_dictionary) {
+    markerSize = _dictionary->markerSize;
+    maxCorrectionBits = _dictionary->maxCorrectionBits;
+    bytesList = _dictionary->bytesList.clone();
+}
+
+
+/**
+  */
+Dictionary::Dictionary(const Mat &_bytesList, int _markerSize, int _maxcorr) {
+    markerSize = _markerSize;
+    maxCorrectionBits = _maxcorr;
+    bytesList = _bytesList;
+}
+
+
+/**
+ */
+Ptr<Dictionary> Dictionary::create(int nMarkers, int markerSize, int randomSeed) {
+    const Ptr<Dictionary> baseDictionary = makePtr<Dictionary>();
+    return create(nMarkers, markerSize, baseDictionary, randomSeed);
+}
+
+
+/**
+ */
+Ptr<Dictionary> Dictionary::create(int nMarkers, int markerSize,
+                                   const Ptr<Dictionary> &baseDictionary, int randomSeed) {
+
+    return generateCustomDictionary(nMarkers, markerSize, baseDictionary, randomSeed);
+}
+
+
+/**
+ */
+Ptr<Dictionary> Dictionary::get(int dict) {
+    return getPredefinedDictionary(dict);
+}
+
+
+/**
+ */
+bool Dictionary::identify(const Mat &onlyBits, int &idx, int &rotation,
+                          double maxCorrectionRate) const {
+
+    CV_Assert(onlyBits.rows == markerSize && onlyBits.cols == markerSize);
+
+    int maxCorrectionRecalculed = int(double(maxCorrectionBits) * maxCorrectionRate);
+
+    // get as a byte list
+    Mat candidateBytes = getByteListFromBits(onlyBits);
+
+    idx = -1; // by default, not found
+
+    // search closest marker in dict
+    for(int m = 0; m < bytesList.rows; m++) {
+        int currentMinDistance = markerSize * markerSize + 1;
+        int currentRotation = -1;
+        for(unsigned int r = 0; r < 4; r++) {
+            int currentHamming = cv::hal::normHamming(
+                    bytesList.ptr(m)+r*candidateBytes.cols,
+                    candidateBytes.ptr(),
+                    candidateBytes.cols);
+
+            if(currentHamming < currentMinDistance) {
+                currentMinDistance = currentHamming;
+                currentRotation = r;
+            }
+        }
+
+        // if maxCorrection is fullfilled, return this one
+        if(currentMinDistance <= maxCorrectionRecalculed) {
+            idx = m;
+            rotation = currentRotation;
+            break;
+        }
+    }
+
+    return idx != -1;
+}
+
+
+/**
+  */
+int Dictionary::getDistanceToId(InputArray bits, int id, bool allRotations) const {
+
+    CV_Assert(id >= 0 && id < bytesList.rows);
+
+    unsigned int nRotations = 4;
+    if(!allRotations) nRotations = 1;
+
+    Mat candidateBytes = getByteListFromBits(bits.getMat());
+    int currentMinDistance = int(bits.total() * bits.total());
+    for(unsigned int r = 0; r < nRotations; r++) {
+        int currentHamming = cv::hal::normHamming(
+                bytesList.ptr(id) + r*candidateBytes.cols,
+                candidateBytes.ptr(),
+                candidateBytes.cols);
+
+        if(currentHamming < currentMinDistance) {
+            currentMinDistance = currentHamming;
+        }
+    }
+    return currentMinDistance;
+}
+
+
+
+/**
+ * @brief Draw a canonical marker image
+ */
+void Dictionary::drawMarker(int id, int sidePixels, OutputArray _img, int borderBits) const {
+
+    CV_Assert(sidePixels >= (markerSize + 2*borderBits));
+    CV_Assert(id < bytesList.rows);
+    CV_Assert(borderBits > 0);
+
+    _img.create(sidePixels, sidePixels, CV_8UC1);
+
+    // create small marker with 1 pixel per bin
+    Mat tinyMarker(markerSize + 2 * borderBits, markerSize + 2 * borderBits, CV_8UC1,
+                   Scalar::all(0));
+    Mat innerRegion = tinyMarker.rowRange(borderBits, tinyMarker.rows - borderBits)
+                          .colRange(borderBits, tinyMarker.cols - borderBits);
+    // put inner bits
+    Mat bits = 255 * getBitsFromByteList(bytesList.rowRange(id, id + 1), markerSize);
+    CV_Assert(innerRegion.total() == bits.total());
+    bits.copyTo(innerRegion);
+
+    // resize tiny marker to output size
+    cv::resize(tinyMarker, _img.getMat(), _img.getMat().size(), 0, 0, INTER_NEAREST);
+}
+
+
+
+
+/**
+  * @brief Transform matrix of bits to list of bytes in the 4 rotations
+  */
+Mat Dictionary::getByteListFromBits(const Mat &bits) {
+    // integer ceil
+    int nbytes = (bits.cols * bits.rows + 8 - 1) / 8;
+
+    Mat candidateByteList(1, nbytes, CV_8UC4, Scalar::all(0));
+    unsigned char currentBit = 0;
+    int currentByte = 0;
+
+    // the 4 rotations
+    uchar* rot0 = candidateByteList.ptr();
+    uchar* rot1 = candidateByteList.ptr() + 1*nbytes;
+    uchar* rot2 = candidateByteList.ptr() + 2*nbytes;
+    uchar* rot3 = candidateByteList.ptr() + 3*nbytes;
+
+    for(int row = 0; row < bits.rows; row++) {
+        for(int col = 0; col < bits.cols; col++) {
+            // circular shift
+            rot0[currentByte] <<= 1;
+            rot1[currentByte] <<= 1;
+            rot2[currentByte] <<= 1;
+            rot3[currentByte] <<= 1;
+            // set bit
+            rot0[currentByte] |= bits.at<uchar>(row, col);
+            rot1[currentByte] |= bits.at<uchar>(col, bits.cols - 1 - row);
+            rot2[currentByte] |= bits.at<uchar>(bits.rows - 1 - row, bits.cols - 1 - col);
+            rot3[currentByte] |= bits.at<uchar>(bits.rows - 1 - col, row);
+            currentBit++;
+            if(currentBit == 8) {
+                // next byte
+                currentBit = 0;
+                currentByte++;
+            }
+        }
+    }
+    return candidateByteList;
+}
+
+
+
+/**
+  * @brief Transform list of bytes to matrix of bits
+  */
+Mat Dictionary::getBitsFromByteList(const Mat &byteList, int markerSize) {
+    CV_Assert(byteList.total() > 0 &&
+              byteList.total() >= (unsigned int)markerSize * markerSize / 8 &&
+              byteList.total() <= (unsigned int)markerSize * markerSize / 8 + 1);
+    Mat bits(markerSize, markerSize, CV_8UC1, Scalar::all(0));
+
+    unsigned char base2List[] = { 128, 64, 32, 16, 8, 4, 2, 1 };
+    int currentByteIdx = 0;
+    // we only need the bytes in normal rotation
+    unsigned char currentByte = byteList.ptr()[0];
+    int currentBit = 0;
+    for(int row = 0; row < bits.rows; row++) {
+        for(int col = 0; col < bits.cols; col++) {
+            if(currentByte >= base2List[currentBit]) {
+                bits.at< unsigned char >(row, col) = 1;
+                currentByte -= base2List[currentBit];
+            }
+            currentBit++;
+            if(currentBit == 8) {
+                currentByteIdx++;
+                currentByte = byteList.ptr()[currentByteIdx];
+                // if not enough bits for one more byte, we are in the end
+                // update bit position accordingly
+                if(8 * (currentByteIdx + 1) > (int)bits.total())
+                    currentBit = 8 * (currentByteIdx + 1) - (int)bits.total();
+                else
+                    currentBit = 0; // ok, bits enough for next byte
+            }
+        }
+    }
+    return bits;
+}
+
+
+
+
+// DictionaryData constructors calls
+const Dictionary DICT_ARUCO_DATA = Dictionary(Mat(1024, (5*5 + 7)/8, CV_8UC4, (uchar*)DICT_ARUCO_BYTES), 5, 0);
+
+const Dictionary DICT_4X4_50_DATA = Dictionary(Mat(50, (4*4 + 7)/8, CV_8UC4, (uchar*)DICT_4X4_1000_BYTES), 4, 1);
+const Dictionary DICT_4X4_100_DATA = Dictionary(Mat(100, (4*4 + 7)/8, CV_8UC4, (uchar*)DICT_4X4_1000_BYTES), 4, 1);
+const Dictionary DICT_4X4_250_DATA = Dictionary(Mat(250, (4*4 + 7)/8, CV_8UC4, (uchar*)DICT_4X4_1000_BYTES), 4, 1);
+const Dictionary DICT_4X4_1000_DATA = Dictionary(Mat(1000, (4*4 + 7)/8, CV_8UC4, (uchar*)DICT_4X4_1000_BYTES), 4, 0);
+
+const Dictionary DICT_5X5_50_DATA = Dictionary(Mat(50, (5*5 + 7)/8, CV_8UC4, (uchar*)DICT_5X5_1000_BYTES), 5, 3);
+const Dictionary DICT_5X5_100_DATA = Dictionary(Mat(100, (5*5 + 7)/8, CV_8UC4, (uchar*)DICT_5X5_1000_BYTES), 5, 3);
+const Dictionary DICT_5X5_250_DATA = Dictionary(Mat(250, (5*5 + 7)/8, CV_8UC4, (uchar*)DICT_5X5_1000_BYTES), 5, 2);
+const Dictionary DICT_5X5_1000_DATA = Dictionary(Mat(1000, (5*5 + 7)/8, CV_8UC4, (uchar*)DICT_5X5_1000_BYTES), 5, 2);
+
+const Dictionary DICT_6X6_50_DATA = Dictionary(Mat(50, (6*6 + 7)/8 ,CV_8UC4, (uchar*)DICT_6X6_1000_BYTES), 6, 6);
+const Dictionary DICT_6X6_100_DATA = Dictionary(Mat(100, (6*6 + 7)/8 ,CV_8UC4, (uchar*)DICT_6X6_1000_BYTES), 6, 5);
+const Dictionary DICT_6X6_250_DATA = Dictionary(Mat(250, (6*6 + 7)/8 ,CV_8UC4, (uchar*)DICT_6X6_1000_BYTES), 6, 5);
+const Dictionary DICT_6X6_1000_DATA = Dictionary(Mat(1000, (6*6 + 7)/8 ,CV_8UC4, (uchar*)DICT_6X6_1000_BYTES), 6, 4);
+
+const Dictionary DICT_7X7_50_DATA = Dictionary(Mat(50, (7*7 + 7)/8 ,CV_8UC4, (uchar*)DICT_7X7_1000_BYTES), 7, 9);
+const Dictionary DICT_7X7_100_DATA = Dictionary(Mat(100, (7*7 + 7)/8 ,CV_8UC4, (uchar*)DICT_7X7_1000_BYTES), 7, 8);
+const Dictionary DICT_7X7_250_DATA = Dictionary(Mat(250, (7*7 + 7)/8 ,CV_8UC4, (uchar*)DICT_7X7_1000_BYTES), 7, 8);
+const Dictionary DICT_7X7_1000_DATA = Dictionary(Mat(1000, (7*7 + 7)/8 ,CV_8UC4, (uchar*)DICT_7X7_1000_BYTES), 7, 6);
+
+const Dictionary DICT_APRILTAG_16h5_DATA = Dictionary(Mat(30, (4*4 + 7)/8, CV_8UC4, (uchar*)DICT_APRILTAG_16h5_BYTES), 4, 0);
+const Dictionary DICT_APRILTAG_25h9_DATA = Dictionary(Mat(35, (5*5 + 7)/8, CV_8UC4, (uchar*)DICT_APRILTAG_25h9_BYTES), 5, 0);
+const Dictionary DICT_APRILTAG_36h10_DATA = Dictionary(Mat(2320, (6*6 + 7)/8, CV_8UC4, (uchar*)DICT_APRILTAG_36h10_BYTES), 6, 0);
+const Dictionary DICT_APRILTAG_36h11_DATA = Dictionary(Mat(587, (6*6 + 7)/8, CV_8UC4, (uchar*)DICT_APRILTAG_36h11_BYTES), 6, 0);
+
+
+Ptr<Dictionary> getPredefinedDictionary(PREDEFINED_DICTIONARY_NAME name) {
+    switch(name) {
+
+    case DICT_ARUCO_ORIGINAL:
+        return makePtr<Dictionary>(DICT_ARUCO_DATA);
+
+    case DICT_4X4_50:
+        return makePtr<Dictionary>(DICT_4X4_50_DATA);
+    case DICT_4X4_100:
+        return makePtr<Dictionary>(DICT_4X4_100_DATA);
+    case DICT_4X4_250:
+        return makePtr<Dictionary>(DICT_4X4_250_DATA);
+    case DICT_4X4_1000:
+        return makePtr<Dictionary>(DICT_4X4_1000_DATA);
+
+    case DICT_5X5_50:
+        return makePtr<Dictionary>(DICT_5X5_50_DATA);
+    case DICT_5X5_100:
+        return makePtr<Dictionary>(DICT_5X5_100_DATA);
+    case DICT_5X5_250:
+        return makePtr<Dictionary>(DICT_5X5_250_DATA);
+    case DICT_5X5_1000:
+        return makePtr<Dictionary>(DICT_5X5_1000_DATA);
+
+    case DICT_6X6_50:
+        return makePtr<Dictionary>(DICT_6X6_50_DATA);
+    case DICT_6X6_100:
+        return makePtr<Dictionary>(DICT_6X6_100_DATA);
+    case DICT_6X6_250:
+        return makePtr<Dictionary>(DICT_6X6_250_DATA);
+    case DICT_6X6_1000:
+        return makePtr<Dictionary>(DICT_6X6_1000_DATA);
+
+    case DICT_7X7_50:
+        return makePtr<Dictionary>(DICT_7X7_50_DATA);
+    case DICT_7X7_100:
+        return makePtr<Dictionary>(DICT_7X7_100_DATA);
+    case DICT_7X7_250:
+        return makePtr<Dictionary>(DICT_7X7_250_DATA);
+    case DICT_7X7_1000:
+        return makePtr<Dictionary>(DICT_7X7_1000_DATA);
+
+    case DICT_APRILTAG_16h5:
+        return makePtr<Dictionary>(DICT_APRILTAG_16h5_DATA);
+    case DICT_APRILTAG_25h9:
+        return makePtr<Dictionary>(DICT_APRILTAG_25h9_DATA);
+    case DICT_APRILTAG_36h10:
+        return makePtr<Dictionary>(DICT_APRILTAG_36h10_DATA);
+    case DICT_APRILTAG_36h11:
+        return makePtr<Dictionary>(DICT_APRILTAG_36h11_DATA);
+
+    }
+    return makePtr<Dictionary>(DICT_4X4_50_DATA);
+}
+
+
+Ptr<Dictionary> getPredefinedDictionary(int dict) {
+    return getPredefinedDictionary(PREDEFINED_DICTIONARY_NAME(dict));
+}
+
+
+/**
+ * @brief Generates a random marker Mat of size markerSize x markerSize
+ */
+static Mat _generateRandomMarker(int markerSize, RNG &rng) {
+    Mat marker(markerSize, markerSize, CV_8UC1, Scalar::all(0));
+    for(int i = 0; i < markerSize; i++) {
+        for(int j = 0; j < markerSize; j++) {
+            unsigned char bit = (unsigned char) (rng.uniform(0,2));
+            marker.at< unsigned char >(i, j) = bit;
+        }
+    }
+    return marker;
+}
+
+/**
+ * @brief Calculate selfDistance of the codification of a marker Mat. Self distance is the Hamming
+ * distance of the marker to itself in the other rotations.
+ * See S. Garrido-Jurado, R. Muñoz-Salinas, F. J. Madrid-Cuevas, and M. J. Marín-Jiménez. 2014.
+ * "Automatic generation and detection of highly reliable fiducial markers under occlusion".
+ * Pattern Recogn. 47, 6 (June 2014), 2280-2292. DOI=10.1016/j.patcog.2014.01.005
+ */
+static int _getSelfDistance(const Mat &marker) {
+    Mat bytes = Dictionary::getByteListFromBits(marker);
+    int minHamming = (int)marker.total() + 1;
+    for(int r = 1; r < 4; r++) {
+        int currentHamming = cv::hal::normHamming(bytes.ptr(), bytes.ptr() + bytes.cols*r, bytes.cols);
+        if(currentHamming < minHamming) minHamming = currentHamming;
+    }
+    return minHamming;
+}
+
+/**
+ */
+Ptr<Dictionary> generateCustomDictionary(int nMarkers, int markerSize,
+                                         const Ptr<Dictionary> &baseDictionary, int randomSeed) {
+    RNG rng((uint64)(randomSeed));
+
+    Ptr<Dictionary> out = makePtr<Dictionary>();
+    out->markerSize = markerSize;
+
+    // theoretical maximum intermarker distance
+    // See S. Garrido-Jurado, R. Muñoz-Salinas, F. J. Madrid-Cuevas, and M. J. Marín-Jiménez. 2014.
+    // "Automatic generation and detection of highly reliable fiducial markers under occlusion".
+    // Pattern Recogn. 47, 6 (June 2014), 2280-2292. DOI=10.1016/j.patcog.2014.01.005
+    int C = (int)std::floor(float(markerSize * markerSize) / 4.f);
+    int tau = 2 * (int)std::floor(float(C) * 4.f / 3.f);
+
+    // if baseDictionary is provided, calculate its intermarker distance
+    if(baseDictionary->bytesList.rows > 0) {
+        CV_Assert(baseDictionary->markerSize == markerSize);
+        out->bytesList = baseDictionary->bytesList.clone();
+
+        int minDistance = markerSize * markerSize + 1;
+        for(int i = 0; i < out->bytesList.rows; i++) {
+            Mat markerBytes = out->bytesList.rowRange(i, i + 1);
+            Mat markerBits = Dictionary::getBitsFromByteList(markerBytes, markerSize);
+            minDistance = min(minDistance, _getSelfDistance(markerBits));
+            for(int j = i + 1; j < out->bytesList.rows; j++) {
+                minDistance = min(minDistance, out->getDistanceToId(markerBits, j));
+            }
+        }
+        tau = minDistance;
+    }
+
+    // current best option
+    int bestTau = 0;
+    Mat bestMarker;
+
+    // after these number of unproductive iterations, the best option is accepted
+    const int maxUnproductiveIterations = 5000;
+    int unproductiveIterations = 0;
+
+    while(out->bytesList.rows < nMarkers) {
+        Mat currentMarker = _generateRandomMarker(markerSize, rng);
+
+        int selfDistance = _getSelfDistance(currentMarker);
+        int minDistance = selfDistance;
+
+        // if self distance is better or equal than current best option, calculate distance
+        // to previous accepted markers
+        if(selfDistance >= bestTau) {
+            for(int i = 0; i < out->bytesList.rows; i++) {
+                int currentDistance = out->getDistanceToId(currentMarker, i);
+                minDistance = min(currentDistance, minDistance);
+                if(minDistance <= bestTau) {
+                    break;
+                }
+            }
+        }
+
+        // if distance is high enough, accept the marker
+        if(minDistance >= tau) {
+            unproductiveIterations = 0;
+            bestTau = 0;
+            Mat bytes = Dictionary::getByteListFromBits(currentMarker);
+            out->bytesList.push_back(bytes);
+        } else {
+            unproductiveIterations++;
+
+            // if distance is not enough, but is better than the current best option
+            if(minDistance > bestTau) {
+                bestTau = minDistance;
+                bestMarker = currentMarker;
+            }
+
+            // if number of unproductive iterarions has been reached, accept the current best option
+            if(unproductiveIterations == maxUnproductiveIterations) {
+                unproductiveIterations = 0;
+                tau = bestTau;
+                bestTau = 0;
+                Mat bytes = Dictionary::getByteListFromBits(bestMarker);
+                out->bytesList.push_back(bytes);
+            }
+        }
+    }
+
+    // update the maximum number of correction bits for the generated dictionary
+    out->maxCorrectionBits = (tau - 1) / 2;
+
+    return out;
+}
+
+
+/**
+ */
+Ptr<Dictionary> generateCustomDictionary(int nMarkers, int markerSize, int randomSeed) {
+    Ptr<Dictionary> baseDictionary = makePtr<Dictionary>();
+    return generateCustomDictionary(nMarkers, markerSize, baseDictionary, randomSeed);
+}
+
+
+}
+}

aruco_pose/vendor/aruco/src/precomp.hpp

@@ -0,0 +1,49 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+ //
+ //  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+ //
+ //  By downloading, copying, installing or using the software you agree to this license.
+ //  If you do not agree to this license, do not download, install,
+ //  copy or use the software.
+ //
+ //
+ //                           License Agreement
+ //                For Open Source Computer Vision Library
+ //
+ // Copyright (C) 2014, OpenCV Foundation, all rights reserved.
+ // Third party copyrights are property of their respective owners.
+ //
+ // Redistribution and use in source and binary forms, with or without modification,
+ // are permitted provided that the following conditions are met:
+ //
+ //   * Redistribution's of source code must retain the above copyright notice,
+ //     this list of conditions and the following disclaimer.
+ //
+ //   * Redistribution's in binary form must reproduce the above copyright notice,
+ //     this list of conditions and the following disclaimer in the documentation
+ //     and/or other materials provided with the distribution.
+ //
+ //   * The name of the copyright holders may not be used to endorse or promote products
+ //     derived from this software without specific prior written permission.
+ //
+ // This software is provided by the copyright holders and contributors "as is" and
+ // any express or implied warranties, including, but not limited to, the implied
+ // warranties of merchantability and fitness for a particular purpose are disclaimed.
+ // In no event shall the Intel Corporation or contributors be liable for any direct,
+ // indirect, incidental, special, exemplary, or consequential damages
+ // (including, but not limited to, procurement of substitute goods or services;
+ // loss of use, data, or profits; or business interruption) however caused
+ // and on any theory of liability, whether in contract, strict liability,
+ // or tort (including negligence or otherwise) arising in any way out of
+ // the use of this software, even if advised of the possibility of such damage.
+ //
+ //M*/
+
+#ifndef __OPENCV_CCALIB_PRECOMP__
+#define __OPENCV_CCALIB_PRECOMP__
+
+#include <opencv2/core.hpp>
+#include <opencv2/calib3d.hpp>
+#include <vector>
+
+#endif

aruco_pose/vendor/aruco/src/unionfind.hpp

@@ -0,0 +1,133 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2013-2016, The Regents of The University of Michigan.
+//
+// This software was developed in the APRIL Robotics Lab under the
+// direction of Edwin Olson, ebolson@umich.edu. This software may be
+// available under alternative licensing terms; contact the address above.
+//
+// The views and conclusions contained in the software and documentation are those
+// of the authors and should not be interpreted as representing official policies,
+// either expressed or implied, of the Regents of The University of Michigan.
+#ifndef _OPENCV_UNIONFIND_HPP_
+#define _OPENCV_UNIONFIND_HPP_
+
+#include <stdint.h>
+#include <stdlib.h>
+namespace cv {
+namespace aruco {
+
+typedef struct unionfind unionfind_t;
+struct unionfind{
+    uint32_t maxid;
+    struct ufrec *data;
+};
+
+struct ufrec{
+    // the parent of this node. If a node's parent is its own index,
+    // then it is a root.
+    uint32_t parent;
+
+    // for the root of a connected component, the number of components
+    // connected to it. For intermediate values, it's not meaningful.
+    uint32_t size;
+};
+
+static inline unionfind_t *unionfind_create(uint32_t maxid){
+    unionfind_t *uf = (unionfind_t*) calloc(1, sizeof(unionfind_t));
+    uf->maxid = maxid;
+    uf->data = (struct ufrec*) malloc((maxid+1) * sizeof(struct ufrec));
+    for (unsigned int i = 0; i <= maxid; i++) {
+        uf->data[i].size = 1;
+        uf->data[i].parent = i;
+    }
+    return uf;
+}
+
+static inline void unionfind_destroy(unionfind_t *uf){
+    free(uf->data);
+    free(uf);
+}
+
+/*
+static inline uint32_t unionfind_get_representative(unionfind_t *uf, uint32_t id)
+{
+    // base case: a node is its own parent
+    if (uf->data[id].parent == id)
+        return id;
+
+    // otherwise, recurse
+    uint32_t root = unionfind_get_representative(uf, uf->data[id].parent);
+
+    // short circuit the path. [XXX This write prevents tail recursion]
+    uf->data[id].parent = root;
+
+    return root;
+}
+ */
+
+// this one seems to be every-so-slightly faster than the recursive
+// version above.
+static inline uint32_t unionfind_get_representative(unionfind_t *uf, uint32_t id){
+    uint32_t root = id;
+
+    // chase down the root
+    while (uf->data[root].parent != root) {
+        root = uf->data[root].parent;
+    }
+
+    // go back and collapse the tree.
+    //
+    // XXX: on some of our workloads that have very shallow trees
+    // (e.g. image segmentation), we are actually faster not doing
+    // this...
+    while (uf->data[id].parent != root) {
+        uint32_t tmp = uf->data[id].parent;
+        uf->data[id].parent = root;
+        id = tmp;
+    }
+
+    return root;
+}
+
+static inline uint32_t unionfind_get_set_size(unionfind_t *uf, uint32_t id){
+    uint32_t repid = unionfind_get_representative(uf, id);
+    return uf->data[repid].size;
+}
+
+static inline uint32_t unionfind_connect(unionfind_t *uf, uint32_t aid, uint32_t bid){
+    uint32_t aroot = unionfind_get_representative(uf, aid);
+    uint32_t broot = unionfind_get_representative(uf, bid);
+
+    if (aroot == broot)
+        return aroot;
+
+    // we don't perform "union by rank", but we perform a similar
+    // operation (but probably without the same asymptotic guarantee):
+    // We join trees based on the number of *elements* (as opposed to
+    // rank) contained within each tree. I.e., we use size as a proxy
+    // for rank.  In my testing, it's often *faster* to use size than
+    // rank, perhaps because the rank of the tree isn't that critical
+    // if there are very few nodes in it.
+    uint32_t asize = uf->data[aroot].size;
+    uint32_t bsize = uf->data[broot].size;
+
+    // optimization idea: We could shortcut some or all of the tree
+    // that is grafted onto the other tree. Pro: those nodes were just
+    // read and so are probably in cache. Con: it might end up being
+    // wasted effort -- the tree might be grafted onto another tree in
+    // a moment!
+    if (asize > bsize) {
+        uf->data[broot].parent = aroot;
+        uf->data[aroot].size += bsize;
+        return aroot;
+    } else {
+        uf->data[aroot].parent = broot;
+        uf->data[broot].size += asize;
+        return broot;
+    }
+}
+}}
+#endif

aruco_pose/vendor/aruco/src/zarray.hpp

@@ -0,0 +1,150 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2013-2016, The Regents of The University of Michigan.
+//
+// This software was developed in the APRIL Robotics Lab under the
+// direction of Edwin Olson, ebolson@umich.edu. This software may be
+// available under alternative licensing terms; contact the address above.
+//
+// The views and conclusions contained in the software and documentation are those
+// of the authors and should not be interpreted as representing official policies,
+// either expressed or implied, of the Regents of The University of Michigan.
+#ifndef _OPENCV_ZARRAY_HPP_
+#define _OPENCV_ZARRAY_HPP_
+
+#include <stdlib.h>
+#include <string.h>
+
+namespace cv {
+namespace aruco {
+
+
+struct sQuad{
+    float p[4][2]; // corners
+};
+
+/**
+ * Defines a structure which acts as a resize-able array ala Java's ArrayList.
+ */
+typedef struct zarray zarray_t;
+struct zarray{
+    size_t el_sz; // size of each element
+
+    int size; // how many elements?
+    int alloc; // we've allocated storage for how many elements?
+    char *data;
+};
+
+/**
+ * Creates and returns a variable array structure capable of holding elements of
+ * the specified size. It is the caller's responsibility to call zarray_destroy()
+ * on the returned array when it is no longer needed.
+ */
+inline static zarray_t *_zarray_create(size_t el_sz){
+    zarray_t *za = (zarray_t*) calloc(1, sizeof(zarray_t));
+    za->el_sz = el_sz;
+    return za;
+}
+
+/**
+ * Frees all resources associated with the variable array structure which was
+ * created by zarray_create(). After calling, 'za' will no longer be valid for storage.
+ */
+inline static void _zarray_destroy(zarray_t *za){
+    if (za == NULL)
+        return;
+
+    if (za->data != NULL)
+        free(za->data);
+    memset(za, 0, sizeof(zarray_t));
+    free(za);
+}
+
+/**
+ * Retrieves the number of elements currently being contained by the passed
+ * array, which may be different from its capacity. The index of the last element
+ * in the array will be one less than the returned value.
+ */
+inline static int _zarray_size(const zarray_t *za){
+    return za->size;
+}
+
+/**
+ * Allocates enough internal storage in the supplied variable array structure to
+ * guarantee that the supplied number of elements (capacity) can be safely stored.
+ */
+inline static void _zarray_ensure_capacity(zarray_t *za, int capacity){
+    if (capacity <= za->alloc)
+        return;
+
+    while (za->alloc < capacity) {
+        za->alloc *= 2;
+        if (za->alloc < 8)
+            za->alloc = 8;
+    }
+
+    za->data = (char*) realloc(za->data, za->alloc * za->el_sz);
+}
+
+/**
+ * Adds a new element to the end of the supplied array, and sets its value
+ * (by copying) from the data pointed to by the supplied pointer 'p'.
+ * Automatically ensures that enough storage space is available for the new element.
+ */
+inline static void _zarray_add(zarray_t *za, const void *p){
+    _zarray_ensure_capacity(za, za->size + 1);
+
+    memcpy(&za->data[za->size*za->el_sz], p, za->el_sz);
+    za->size++;
+}
+
+/**
+ * Retrieves the element from the supplied array located at the zero-based
+ * index of 'idx' and copies its value into the variable pointed to by the pointer
+ * 'p'.
+ */
+inline static void _zarray_get(const zarray_t *za, int idx, void *p){
+    CV_DbgAssert(idx >= 0);
+    CV_DbgAssert(idx < za->size);
+
+    memcpy(p, &za->data[idx*za->el_sz], za->el_sz);
+}
+
+/**
+ * Similar to zarray_get(), but returns a "live" pointer to the internal
+ * storage, avoiding a memcpy. This pointer is not valid across
+ * operations which might move memory around (i.e. zarray_remove_value(),
+ * zarray_remove_index(), zarray_insert(), zarray_sort(), zarray_clear()).
+ * 'p' should be a pointer to the pointer which will be set to the internal address.
+ */
+inline static void _zarray_get_volatile(const zarray_t *za, int idx, void *p){
+    CV_DbgAssert(idx >= 0);
+    CV_DbgAssert(idx < za->size);
+
+    *((void**) p) = &za->data[idx*za->el_sz];
+}
+
+inline static void _zarray_truncate(zarray_t *za, int sz){
+    za->size = sz;
+}
+
+/**
+ * Sets the value of the current element at index 'idx' by copying its value from
+ * the data pointed to by 'p'. The previous value of the changed element will be
+ * copied into the data pointed to by 'outp' if it is not null.
+ */
+static inline void _zarray_set(zarray_t *za, int idx, const void *p, void *outp){
+    CV_DbgAssert(idx >= 0);
+    CV_DbgAssert(idx < za->size);
+
+    if (outp != NULL)
+        memcpy(outp, &za->data[idx*za->el_sz], za->el_sz);
+
+    memcpy(&za->data[idx*za->el_sz], p, za->el_sz);
+}
+
+}
+}
+#endif

aruco_pose/vendor/aruco/src/zmaxheap.cpp

@@ -0,0 +1,208 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2013-2016, The Regents of The University of Michigan.
+//
+// This software was developed in the APRIL Robotics Lab under the
+// direction of Edwin Olson, ebolson@umich.edu. This software may be
+// available under alternative licensing terms; contact the address above.
+//
+// The views and conclusions contained in the software and documentation are those
+// of the authors and should not be interpreted as representing official policies,
+// either expressed or implied, of the Regents of The University of Michigan.
+
+#include "precomp.hpp"
+#include "zmaxheap.hpp"
+
+
+//                 0
+//         1               2
+//      3     4        5       6
+//     7 8   9 10    11 12   13 14
+//
+// Children of node i:  2*i+1, 2*i+2
+// Parent of node i: (i-1) / 2
+//
+// Heap property: a parent is greater than (or equal to) its children.
+
+#define MIN_CAPACITY 16
+namespace cv {
+namespace aruco {
+struct zmaxheap
+{
+    size_t el_sz;
+
+    int size;
+    int alloc;
+
+    float *values;
+    char *data;
+
+    void (*swap)(zmaxheap_t *heap, int a, int b);
+};
+
+static inline void _swap_default(zmaxheap_t *heap, int a, int b)
+{
+    float t = heap->values[a];
+    heap->values[a] = heap->values[b];
+    heap->values[b] = t;
+
+    cv::AutoBuffer<char> tmp(heap->el_sz);
+	/* NOTE: OpenCV v<3.3 does not have .data() member for AutoBuffer */
+    memcpy(tmp, &heap->data[a*heap->el_sz], heap->el_sz);
+    memcpy(&heap->data[a*heap->el_sz], &heap->data[b*heap->el_sz], heap->el_sz);
+    memcpy(&heap->data[b*heap->el_sz], tmp, heap->el_sz);
+}
+
+static inline void _swap_pointer(zmaxheap_t *heap, int a, int b)
+{
+    float t = heap->values[a];
+    heap->values[a] = heap->values[b];
+    heap->values[b] = t;
+
+    void **pp = (void**) heap->data;
+    void *tmp = pp[a];
+    pp[a] = pp[b];
+    pp[b] = tmp;
+}
+
+
+zmaxheap_t *zmaxheap_create(size_t el_sz)
+{
+    zmaxheap_t *heap = (zmaxheap_t*)calloc(1, sizeof(zmaxheap_t));
+    heap->el_sz = el_sz;
+
+    heap->swap = _swap_default;
+
+    if (el_sz == sizeof(void*))
+        heap->swap = _swap_pointer;
+
+    return heap;
+}
+
+void zmaxheap_destroy(zmaxheap_t *heap)
+{
+    free(heap->values);
+    free(heap->data);
+    memset(heap, 0, sizeof(zmaxheap_t));
+    free(heap);
+}
+
+static void _zmaxheap_ensure_capacity(zmaxheap_t *heap, int capacity)
+{
+    if (heap->alloc >= capacity)
+        return;
+
+    int newcap = heap->alloc;
+
+    while (newcap < capacity) {
+        if (newcap < MIN_CAPACITY) {
+            newcap = MIN_CAPACITY;
+            continue;
+        }
+
+        newcap *= 2;
+    }
+
+    heap->values = (float*)realloc(heap->values, newcap * sizeof(float));
+    heap->data = (char*)realloc(heap->data, newcap * heap->el_sz);
+    heap->alloc = newcap;
+}
+
+void zmaxheap_add(zmaxheap_t *heap, void *p, float v)
+{
+    _zmaxheap_ensure_capacity(heap, heap->size + 1);
+
+    int idx = heap->size;
+
+    heap->values[idx] = v;
+    memcpy(&heap->data[idx*heap->el_sz], p, heap->el_sz);
+
+    heap->size++;
+
+    while (idx > 0) {
+
+        int parent = (idx - 1) / 2;
+
+        // we're done!
+        if (heap->values[parent] >= v)
+            break;
+
+        // else, swap and recurse upwards.
+        heap->swap(heap, idx, parent);
+        idx = parent;
+    }
+}
+
+// Removes the item in the heap at the given index.  Returns 1 if the
+// item existed. 0 Indicates an invalid idx (heap is smaller than
+// idx). This is mostly intended to be used by zmaxheap_remove_max.
+static int zmaxheap_remove_index(zmaxheap_t *heap, int idx, void *p, float *v)
+{
+    if (idx >= heap->size)
+        return 0;
+
+    // copy out the requested element from the heap.
+    if (v != NULL)
+        *v = heap->values[idx];
+    if (p != NULL)
+        memcpy(p, &heap->data[idx*heap->el_sz], heap->el_sz);
+
+    heap->size--;
+
+    // If this element is already the last one, then there's nothing
+    // for us to do.
+    if (idx == heap->size)
+        return 1;
+
+    // copy last element to first element. (which probably upsets
+    // the heap property).
+    heap->values[idx] = heap->values[heap->size];
+    memcpy(&heap->data[idx*heap->el_sz], &heap->data[heap->el_sz * heap->size], heap->el_sz);
+
+    // now fix the heap. Note, as we descend, we're "pushing down"
+    // the same node the entire time. Thus, while the index of the
+    // parent might change, the parent_score doesn't.
+    int parent = idx;
+    float parent_score = heap->values[idx];
+
+    // descend, fixing the heap.
+    while (parent < heap->size) {
+
+        int left = 2*parent + 1;
+        int right = left + 1;
+
+//            assert(parent_score == heap->values[parent]);
+
+        float left_score = (left < heap->size) ? heap->values[left] : -INFINITY;
+        float right_score = (right < heap->size) ? heap->values[right] : -INFINITY;
+
+        // put the biggest of (parent, left, right) as the parent.
+
+        // already okay?
+        if (parent_score >= left_score && parent_score >= right_score)
+            break;
+
+        // if we got here, then one of the children is bigger than the parent.
+        if (left_score >= right_score) {
+            CV_Assert(left < heap->size);
+            heap->swap(heap, parent, left);
+            parent = left;
+        } else {
+            // right_score can't be less than left_score if right_score is -INFINITY.
+            CV_Assert(right < heap->size);
+            heap->swap(heap, parent, right);
+            parent = right;
+        }
+    }
+
+    return 1;
+}
+
+int zmaxheap_remove_max(zmaxheap_t *heap, void *p, float *v)
+{
+    return zmaxheap_remove_index(heap, 0, p, v);
+}
+
+}}

aruco_pose/vendor/aruco/src/zmaxheap.hpp

@@ -0,0 +1,42 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2013-2016, The Regents of The University of Michigan.
+//
+// This software was developed in the APRIL Robotics Lab under the
+// direction of Edwin Olson, ebolson@umich.edu. This software may be
+// available under alternative licensing terms; contact the address above.
+//
+// The views and conclusions contained in the software and documentation are those
+// of the authors and should not be interpreted as representing official policies,
+// either expressed or implied, of the Regents of The University of Michigan.
+#ifndef _OPENCV_ZMAXHEAP_HPP_
+#define _OPENCV_ZMAXHEAP_HPP_
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+namespace cv {
+namespace aruco {
+typedef struct zmaxheap zmaxheap_t;
+
+typedef struct zmaxheap_iterator zmaxheap_iterator_t;
+struct zmaxheap_iterator {
+    zmaxheap_t *heap;
+    int in, out;
+};
+
+zmaxheap_t *zmaxheap_create(size_t el_sz);
+
+void zmaxheap_destroy(zmaxheap_t *heap);
+
+void zmaxheap_add(zmaxheap_t *heap, void *p, float v);
+
+// returns 0 if the heap is empty, so you can do
+// while (zmaxheap_remove_max(...)) { }
+int zmaxheap_remove_max(zmaxheap_t *heap, void *p, float *v);
+
+}}
+#endif

builder/assets/kinetic-rosdep-clever.yaml

@@ -1,531 +1,531 @@
 actionlib:
   debian:
-    stretch: [ros-kinetic-actionlib]
+    buster: [ros-kinetic-actionlib]
 actionlib_msgs:
   debian:
-    stretch: [ros-kinetic-actionlib-msgs]
+    buster: [ros-kinetic-actionlib-msgs]
 angles:
   debian:
-    stretch: [ros-kinetic-angles]
+    buster: [ros-kinetic-angles]
 async_web_server_cpp:
   debian:
-    stretch: [ros-kinetic-async-web-server-cpp]
+    buster: [ros-kinetic-async-web-server-cpp]
 bond:
   debian:
-    stretch: [ros-kinetic-bond]
+    buster: [ros-kinetic-bond]
 bondcpp:
   debian:
-    stretch: [ros-kinetic-bondcpp]
+    buster: [ros-kinetic-bondcpp]
 bondpy:
   debian:
-    stretch: [ros-kinetic-bondpy]
+    buster: [ros-kinetic-bondpy]
 camera_calibration_parsers:
   debian:
-    stretch: [ros-kinetic-camera-calibration-parsers]
+    buster: [ros-kinetic-camera-calibration-parsers]
 camera_info_manager:
   debian:
-    stretch: [ros-kinetic-camera-info-manager]
+    buster: [ros-kinetic-camera-info-manager]
 catkin:
   debian:
-    stretch: [ros-kinetic-catkin]
+    buster: [ros-kinetic-catkin]
 class_loader:
   debian:
-    stretch: [ros-kinetic-class-loader]
+    buster: [ros-kinetic-class-loader]
 cmake_modules:
   debian:
-    stretch: [ros-kinetic-cmake-modules]
+    buster: [ros-kinetic-cmake-modules]
 cpp_common:
   debian:
-    stretch: [ros-kinetic-cpp-common]
+    buster: [ros-kinetic-cpp-common]
 cv_bridge:
   debian:
-    stretch: [ros-kinetic-cv-bridge]
+    buster: [ros-kinetic-cv-bridge]
 cv_camera:
   debian:
-    stretch: [ros-kinetic-cv-camera=0.3.1-0stretch]
+    buster: [ros-kinetic-cv-camera=0.3.1-0buster]
 diagnostic_msgs:
   debian:
-    stretch: [ros-kinetic-diagnostic-msgs]
+    buster: [ros-kinetic-diagnostic-msgs]
 diagnostic_updater:
   debian:
-    stretch: [ros-kinetic-diagnostic-updater]
+    buster: [ros-kinetic-diagnostic-updater]
 eigen_conversions:
   debian:
-    stretch: [ros-kinetic-eigen-conversions]
+    buster: [ros-kinetic-eigen-conversions]
 gencpp:
   debian:
-    stretch: [ros-kinetic-gencpp]
+    buster: [ros-kinetic-gencpp]
 geneus:
   debian:
-    stretch: [ros-kinetic-geneus]
+    buster: [ros-kinetic-geneus]
 genlisp:
   debian:
-    stretch: [ros-kinetic-genlisp]
+    buster: [ros-kinetic-genlisp]
 genmsg:
   debian:
-    stretch: [ros-kinetic-genmsg]
+    buster: [ros-kinetic-genmsg]
 gennodejs:
   debian:
-    stretch: [ros-kinetic-gennodejs]
+    buster: [ros-kinetic-gennodejs]
 genpy:
   debian:
-    stretch: [ros-kinetic-genpy]
+    buster: [ros-kinetic-genpy]
 geographic_msgs:
   debian:
-    stretch: [ros-kinetic-geographic-msgs]
+    buster: [ros-kinetic-geographic-msgs]
 geometry_msgs:
   debian:
-    stretch: [ros-kinetic-geometry-msgs]
+    buster: [ros-kinetic-geometry-msgs]
 image_transport:
   debian:
-    stretch: [ros-kinetic-image-transport]
+    buster: [ros-kinetic-image-transport]
 libmavconn:
   debian:
-    stretch: [ros-kinetic-libmavconn]
+    buster: [ros-kinetic-libmavconn]
 lxml:
   debian:
-    stretch: [python-lxml=3.7.1-1]
+    buster: [python-lxml=3.7.1-1]
 mavlink:
   debian:
-    stretch: [ros-kinetic-mavlink]
+    buster: [ros-kinetic-mavlink]
 mavros:
   debian:
-    stretch: [ros-kinetic-mavros]
+    buster: [ros-kinetic-mavros]
 mavros_msgs:
   debian:
-    stretch: [ros-kinetic-mavros-msgs]
+    buster: [ros-kinetic-mavros-msgs]
 mavros_extras:
   debian:
-    stretch: [ros-kinetic-mavros-extras]
+    buster: [ros-kinetic-mavros-extras]
 message_filters:
   debian:
-    stretch: [ros-kinetic-message-filters]
+    buster: [ros-kinetic-message-filters]
 message_generation:
   debian:
-    stretch: [ros-kinetic-message-generation]
+    buster: [ros-kinetic-message-generation]
 message_runtime:
   debian:
-    stretch: [ros-kinetic-message-runtime]
+    buster: [ros-kinetic-message-runtime]
 mjpg-streamer:
   debian:
-    stretch: [mjpg-streamer=2.0]
+    buster: [mjpg-streamer=2.0]
 mk:
   debian:
-    stretch: [ros-kinetic-mk]
+    buster: [ros-kinetic-mk]
 nav_msgs:
   debian:
-    stretch: [ros-kinetic-nav-msgs]
+    buster: [ros-kinetic-nav-msgs]
 nodelet:
   debian:
-    stretch: [ros-kinetic-nodelet]
+    buster: [ros-kinetic-nodelet]
 opencv3:
   debian:
-    stretch: [ros-kinetic-opencv3]
+    buster: [ros-kinetic-opencv3]
 orocos_kdl:
   debian:
-    stretch: [ros-kinetic-orocos-kdl]
+    buster: [ros-kinetic-orocos-kdl]
 pluginlib:
   debian:
-    stretch: [ros-kinetic-pluginlib]
+    buster: [ros-kinetic-pluginlib]
 python_orocos_kdl:
   debian:
-    stretch: [ros-kinetic-python-orocos-kdl]
+    buster: [ros-kinetic-python-orocos-kdl]
 ros:
   debian:
-    stretch: [ros-kinetic-ros]
+    buster: [ros-kinetic-ros]
 ros_comm:
   debian:
-    stretch: [ros-kinetic-ros-comm]
+    buster: [ros-kinetic-ros-comm]
 ros_environment:
   debian:
-    stretch: [ros-kinetic-ros-environment]
+    buster: [ros-kinetic-ros-environment]
 rosapi:
   debian:
-    stretch: [ros-kinetic-rosapi]
+    buster: [ros-kinetic-rosapi]
 rosauth:
   debian:
-    stretch: [ros-kinetic-rosauth]
+    buster: [ros-kinetic-rosauth]
 rosbag:
   debian:
-    stretch: [ros-kinetic-rosbag]
+    buster: [ros-kinetic-rosbag]
 rosbag_migration_rule:
   debian:
-    stretch: [ros-kinetic-rosbag-migration-rule]
+    buster: [ros-kinetic-rosbag-migration-rule]
 rosbag_storage:
   debian:
-    stretch: [ros-kinetic-rosbag-storage]
+    buster: [ros-kinetic-rosbag-storage]
 rosbash:
   debian:
-    stretch: [ros-kinetic-rosbash]
+    buster: [ros-kinetic-rosbash]
 rosboost_cfg:
   debian:
-    stretch: [ros-kinetic-rosboost-cfg]
+    buster: [ros-kinetic-rosboost-cfg]
 rosbridge_library:
   debian:
-    stretch: [ros-kinetic-rosbridge-library]
+    buster: [ros-kinetic-rosbridge-library]
 rosbridge_server:
   debian:
-    stretch: [ros-kinetic-rosbridge-server]
+    buster: [ros-kinetic-rosbridge-server]
 rosbuild:
   debian:
-    stretch: [ros-kinetic-rosbuild]
+    buster: [ros-kinetic-rosbuild]
 rosclean:
   debian:
-    stretch: [ros-kinetic-rosclean]
+    buster: [ros-kinetic-rosclean]
 rosconsole:
   debian:
-    stretch: [ros-kinetic-rosconsole]
+    buster: [ros-kinetic-rosconsole]
 rosconsole_bridge:
   debian:
-    stretch: [ros-kinetic-rosconsole-bridge]
+    buster: [ros-kinetic-rosconsole-bridge]
 roscpp:
   debian:
-    stretch: [ros-kinetic-roscpp]
+    buster: [ros-kinetic-roscpp]
 roscpp_serialization:
   debian:
-    stretch: [ros-kinetic-roscpp-serialization]
+    buster: [ros-kinetic-roscpp-serialization]
 roscpp_traits:
   debian:
-    stretch: [ros-kinetic-roscpp-traits]
+    buster: [ros-kinetic-roscpp-traits]
 roscreate:
   debian:
-    stretch: [ros-kinetic-roscreate]
+    buster: [ros-kinetic-roscreate]
 rosgraph:
   debian:
-    stretch: [ros-kinetic-rosgraph]
+    buster: [ros-kinetic-rosgraph]
 rosgraph_msgs:
   debian:
-    stretch: [ros-kinetic-rosgraph-msgs]
+    buster: [ros-kinetic-rosgraph-msgs]
 roslang:
   debian:
-    stretch: [ros-kinetic-roslang]
+    buster: [ros-kinetic-roslang]
 roslaunch:
   debian:
-    stretch: [ros-kinetic-roslaunch]
+    buster: [ros-kinetic-roslaunch]
 roslib:
   debian:
-    stretch: [ros-kinetic-roslib]
+    buster: [ros-kinetic-roslib]
 roslint:
   debian:
-    stretch: [ros-kinetic-roslint]
+    buster: [ros-kinetic-roslint]
 roslisp:
   debian:
-    stretch: [ros-kinetic-roslisp]
+    buster: [ros-kinetic-roslisp]
 roslz4:
   debian:
-    stretch: [ros-kinetic-roslz4]
+    buster: [ros-kinetic-roslz4]
 rosmake:
   debian:
-    stretch: [ros-kinetic-rosmake]
+    buster: [ros-kinetic-rosmake]
 rosmaster:
   debian:
-    stretch: [ros-kinetic-rosmaster]
+    buster: [ros-kinetic-rosmaster]
 rosmsg:
   debian:
-    stretch: [ros-kinetic-rosmsg]
+    buster: [ros-kinetic-rosmsg]
 rosnode:
   debian:
-    stretch: [ros-kinetic-rosnode]
+    buster: [ros-kinetic-rosnode]
 rosout:
   debian:
-    stretch: [ros-kinetic-rosout]
+    buster: [ros-kinetic-rosout]
 rospack:
   debian:
-    stretch: [ros-kinetic-rospack]
+    buster: [ros-kinetic-rospack]
 rosparam:
   debian:
-    stretch: [ros-kinetic-rosparam]
+    buster: [ros-kinetic-rosparam]
 rospy:
   debian:
-    stretch: [ros-kinetic-rospy]
+    buster: [ros-kinetic-rospy]
 rospy_tutorials:
   debian:
-    stretch: [ros-kinetic-rospy-tutorials]
+    buster: [ros-kinetic-rospy-tutorials]
 rosserial_client:
   debian:
-    stretch: [ros-kinetic-rosserial-client]
+    buster: [ros-kinetic-rosserial-client]
 rosserial_msgs:
   debian:
-    stretch: [ros-kinetic-rosserial-msgs]
+    buster: [ros-kinetic-rosserial-msgs]
 rosserial_python:
   debian:
-    stretch: [ros-kinetic-rosserial-python]
+    buster: [ros-kinetic-rosserial-python]
 rosservice:
   debian:
-    stretch: [ros-kinetic-rosservice]
+    buster: [ros-kinetic-rosservice]
 rostest:
   debian:
-    stretch: [ros-kinetic-rostest]
+    buster: [ros-kinetic-rostest]
 rostime:
   debian:
-    stretch: [ros-kinetic-rostime]
+    buster: [ros-kinetic-rostime]
 rostopic:
   debian:
-    stretch: [ros-kinetic-rostopic]
+    buster: [ros-kinetic-rostopic]
 rosunit:
   debian:
-    stretch: [ros-kinetic-rosunit]
+    buster: [ros-kinetic-rosunit]
 roswtf:
   debian:
-    stretch: [ros-kinetic-roswtf]
+    buster: [ros-kinetic-roswtf]
 sensor_msgs:
   debian:
-    stretch: [ros-kinetic-sensor-msgs]
+    buster: [ros-kinetic-sensor-msgs]
 smclib:
   debian:
-    stretch: [ros-kinetic-smclib]
+    buster: [ros-kinetic-smclib]
 std_msgs:
   debian:
-    stretch: [ros-kinetic-std-msgs]
+    buster: [ros-kinetic-std-msgs]
 std_srvs:
   debian:
-    stretch: [ros-kinetic-std-srvs]
+    buster: [ros-kinetic-std-srvs]
 stereo_msgs:
   debian:
-    stretch: [ros-kinetic-stereo-msgs]
+    buster: [ros-kinetic-stereo-msgs]
 tf2:
   debian:
-    stretch: [ros-kinetic-tf2]
+    buster: [ros-kinetic-tf2]
 tf2_bullet:
   debian:
-    stretch: [ros-kinetic-tf2-bullet]
+    buster: [ros-kinetic-tf2-bullet]
 tf2_eigen:
   debian:
-    stretch: [ros-kinetic-tf2-eigen]
+    buster: [ros-kinetic-tf2-eigen]
 tf2_geometry_msgs:
   debian:
-    stretch: [ros-kinetic-tf2-geometry-msgs]
+    buster: [ros-kinetic-tf2-geometry-msgs]
 tf2_kdl:
   debian:
-    stretch: [ros-kinetic-tf2-kdl]
+    buster: [ros-kinetic-tf2-kdl]
 tf2_msgs:
   debian:
-    stretch: [ros-kinetic-tf2-msgs]
+    buster: [ros-kinetic-tf2-msgs]
 tf2_py:
   debian:
-    stretch: [ros-kinetic-tf2-py]
+    buster: [ros-kinetic-tf2-py]
 tf2_ros:
   debian:
-    stretch: [ros-kinetic-tf2-ros]
+    buster: [ros-kinetic-tf2-ros]
 tf2_sensor_msgs:
   debian:
-    stretch: [ros-kinetic-tf2-sensor-msgs]
+    buster: [ros-kinetic-tf2-sensor-msgs]
 tf2_tools:
   debian:
-    stretch: [ros-kinetic-tf2-tools]
+    buster: [ros-kinetic-tf2-tools]
 tf:
   debian:
-    stretch: [ros-kinetic-tf]
+    buster: [ros-kinetic-tf]
 topic_tools:
   debian:
-    stretch: [ros-kinetic-topic-tools]
+    buster: [ros-kinetic-topic-tools]
 trajectory_msgs:
   debian:
-    stretch: [ros-kinetic-trajectory-msgs]
+    buster: [ros-kinetic-trajectory-msgs]
 urdf:
   debian:
-    stretch: [ros-kinetic-urdf]
+    buster: [ros-kinetic-urdf]
 urdf_parser_plugin:
   debian:
-    stretch: [ros-kinetic-urdf-parser-plugin]
+    buster: [ros-kinetic-urdf-parser-plugin]
 uuid_msgs:
   debian:
-    stretch: [ros-kinetic-uuid-msgs]
+    buster: [ros-kinetic-uuid-msgs]
 visualization_msgs:
   debian:
-    stretch: [ros-kinetic-visualization-msgs]
+    buster: [ros-kinetic-visualization-msgs]
 xmlrpcpp:
   debian:
-    stretch: [ros-kinetic-xmlrpcpp]
+    buster: [ros-kinetic-xmlrpcpp]
 boost:
   debian:
-    stretch: [libboost-all-dev]
+    buster: [libboost-all-dev]
 bullet:
   debian:
-    stretch: [libbullet-dev]
+    buster: [libbullet-dev]
 bzip2:
   debian:
-    stretch: [libbz2-dev]
+    buster: [libbz2-dev]
 cmake:
   debian:
-    stretch: [cmake]
+    buster: [cmake]
 cppunit:
   debian:
-    stretch: [libcppunit-dev]
+    buster: [libcppunit-dev]
 eigen:
   debian:
-    stretch: [libeigen3-dev]
+    buster: [libeigen3-dev]
 geographiclib-tools:
   debian:
-    stretch: [geographiclib-tools]
+    buster: [geographiclib-tools]
 geographiclib:
   debian:
-    stretch: [libgeographic-dev]
+    buster: [libgeographic-dev]
 google-mock:
   debian:
-    stretch: [google-mock]
+    buster: [google-mock]
 graphviz:
   debian:
-    stretch: [graphviz]
+    buster: [graphviz]
 gtest:
   debian:
-    stretch: [libgtest-dev]
+    buster: [libgtest-dev]
 libconsole-bridge-dev:
   debian:
-    stretch: [libconsole-bridge-dev]
+    buster: [libconsole-bridge-dev]
 libjpeg:
   debian:
-    stretch: [libjpeg-dev]
+    buster: [libjpeg-dev]
 libpng-dev:
   debian:
-    stretch: [libpng-dev]
+    buster: [libpng-dev]
 libpoco-dev:
   debian:
-    stretch: [libpoco-dev]
+    buster: [libpoco-dev]
 libssl-dev:
   debian:
-    stretch: [libssl-dev]
+    buster: [libssl-dev]
 libtiff-dev:
   debian:
-    stretch: [libtiff5-dev]
+    buster: [libtiff5-dev]
 liburdfdom-dev:
   debian:
-    stretch: [liburdfdom-dev]
+    buster: [liburdfdom-dev]
 liburdfdom-headers-dev:
   debian:
-    stretch: [liburdfdom-headers-dev]
+    buster: [liburdfdom-headers-dev]
 libv4l-dev:
   debian:
-    stretch: [libv4l-dev]
+    buster: [libv4l-dev]
 libvtk-qt:
   debian:
-    stretch: [libvtk6-qt-dev]
+    buster: [libvtk6-qt-dev]
 libwebp-dev:
   debian:
-    stretch: [libwebp-dev]
+    buster: [libwebp-dev]
 log4cxx:
   debian:
-    stretch: [liblog4cxx-dev]
+    buster: [liblog4cxx-dev]
 lz4:
   debian:
-    stretch: [liblz4-dev]
+    buster: [liblz4-dev]
 pkg-config:
   debian:
-    stretch: [pkg-config]
+    buster: [pkg-config]
 protobuf:
   debian:
-    stretch: [libprotobuf10]
+    buster: [libprotobuf10]
 python-bson:
   debian:
-    stretch: [python-bson]
+    buster: [python-bson]
 python-catkin-pkg:
   debian:
-    stretch: [python-catkin-pkg]
+    buster: [python-catkin-pkg]
 python-coverage:
   debian:
-    stretch: [python-coverage]
+    buster: [python-coverage]
 python-defusedxml:
   debian:
-    stretch: [python-defusedxml]
+    buster: [python-defusedxml]
 python-empy:
   debian:
-    stretch: [python-empy]
+    buster: [python-empy]
 python-future:
   debian:
-    stretch: [python-future]
+    buster: [python-future]
 python-imaging:
   debian:
-    stretch: [python-imaging]
+    buster: [python-imaging]
 python-lxml:
   debian:
-    stretch: [python-lxml]
+    buster: [python-lxml]
 python-mock:
   debian:
-    stretch: [python-mock]
+    buster: [python-mock]
 python-netifaces:
   debian:
-    stretch: [python-netifaces]
+    buster: [python-netifaces]
 python-nose:
   debian:
-    stretch: [python-nose]
+    buster: [python-nose]
 python-numpy:
   debian:
-    stretch: [python-numpy]
+    buster: [python-numpy]
 python-paramiko:
   debian:
-    stretch: [python-paramiko]
+    buster: [python-paramiko]
 python-rosdep:
   debian:
-    stretch: [python-rosdep]
+    buster: [python-rosdep]
 python-rospkg:
   debian:
-    stretch: [python-rospkg]
+    buster: [python-rospkg]
 python-serial:
   debian:
-    stretch: [python-serial]
+    buster: [python-serial]
 python-setuptools:
   debian:
-    stretch: [python-setuptools]
+    buster: [python-setuptools]
 python-sip:
   debian:
-    stretch: [python-sip-dev]
+    buster: [python-sip-dev]
 python-tornado:
   debian:
-    stretch: [python-tornado]
+    buster: [python-tornado]
 python-twisted-core:
   debian:
-    stretch: [python-twisted-core]
+    buster: [python-twisted-core]
 python-websocket:
   debian:
-    stretch: [python-websocket]
+    buster: [python-websocket]
 python-wxtools:
   debian:
-    stretch: [python-wxtools]
+    buster: [python-wxtools]
 python-yaml:
   debian:
-    stretch: [python-yaml]
+    buster: [python-yaml]
 python:
   debian:
-    stretch: [python-dev]
+    buster: [python-dev]
 sbcl:
   debian:
-    stretch: [sbcl]
+    buster: [sbcl]
 tinyxml2:
   debian:
-    stretch: [libtinyxml2-dev]
+    buster: [libtinyxml2-dev]
 tinyxml:
   debian:
-    stretch: [libtinyxml-dev]
+    buster: [libtinyxml-dev]
 uuid:
   debian:
-    stretch: [uuid-dev]
+    buster: [uuid-dev]
 web_video_server:
   debian:
-    stretch: [ros-kinetic-web-video-server]
+    buster: [ros-kinetic-web-video-server]
 v4l-utils:
   debian:
-    stretch: [v4l-utils]
+    buster: [v4l-utils]
 yaml-cpp:
   debian:
-    stretch: [libyaml-cpp-dev]
+    buster: [libyaml-cpp-dev]
 zlib:
   debian:
-    stretch: [zlib1g-dev]
+    buster: [zlib1g-dev]
 compressed_depth_image_transport:
   debian:
-    stretch: [ros-kinetic-compressed-depth-image-transport]
+    buster: [ros-kinetic-compressed-depth-image-transport]
 compressed_image_transport:
   debian:
-    stretch: [ros-kinetic-compressed-image-transport]
+    buster: [ros-kinetic-compressed-image-transport]
 dynamic_reconfigure:
   debian:
-    stretch: [ros-kinetic-dynamic-reconfigure]
+    buster: [ros-kinetic-dynamic-reconfigure]
 theora_image_transport:
   debian:
-    stretch: [ros-kinetic-theora-image-transport]
+    buster: [ros-kinetic-theora-image-transport]
 libogg:
   debian:
-    stretch: [libtheora0=1.1.1+dfsg.1-14]
+    buster: [libtheora0=1.1.1+dfsg.1-14]
 vl53l1x:
   debian:
     stretch: [ros-kinetic-vl53l1x]
@@ -537,25 +537,25 @@ led_msgs:
     stretch: [ros-kinetic-led-msgs]
 interactive_markers:
   debian:
-    stretch: [ros-kinetic-interactive-markers]
+    buster: [ros-kinetic-interactive-markers]
 interactive_marker_proxy:
   debian:
-    stretch: [ros-kinetic-interactive-marker-proxy]
+    buster: [ros-kinetic-interactive-marker-proxy]
 tf2_web_republisher:
   debian:
-    stretch: [ros-kinetic-tf2-web-republisher]
+    buster: [ros-kinetic-tf2-web-republisher]
 image_publisher:
   debian:
-    stretch: [ros-kinetic-image-publisher]
+    buster: [ros-kinetic-image-publisher]
 raspberry-kernel-headers:
   debian:
-    stretch: [raspberry-kernel-headers]
+    buster: [raspberry-kernel-headers]
 ddynamic_reconfigure:
   debian:
-    stretch: [ros-kinetic-ddynamic-reconfigure]
+    buster: [ros-kinetic-ddynamic-reconfigure]
 realsense2_camera:
   debian:
-    stretch: [ros-kinetic-realsense2-camera]
+    buster: [ros-kinetic-realsense2-camera]
 ros_pytest:
   debian:
-    stretch: [ros-kinetic-ros-pytest]
+    buster: [ros-kinetic-ros-pytest]

builder/assets/melodic-rosdep-clever.yaml

@@ -0,0 +1,735 @@
+catkin:
+  debian:
+    buster: [ros-melodic-catkin]
+genmsg:
+  debian:
+    buster: [ros-melodic-genmsg]
+gencpp:
+  debian:
+    buster: [ros-melodic-gencpp]
+geneus:
+  debian:
+    buster: [ros-melodic-geneus]
+genlisp:
+  debian:
+    buster: [ros-melodic-genlisp]
+gennodejs:
+  debian:
+    buster: [ros-melodic-gennodejs]
+genpy:
+  debian:
+    buster: [ros-melodic-genpy]
+bond_core:
+  debian:
+    buster: [ros-melodic-bond-core]
+cmake_modules:
+  debian:
+    buster: [ros-melodic-cmake-modules]
+class_loader:
+  debian:
+    buster: [ros-melodic-class-loader]
+common_msgs:
+  debian:
+    buster: [ros-melodic-common-msgs]
+common_tutorials:
+  debian:
+    buster: [ros-melodic-common-tutorials]
+cpp_common:
+  debian:
+    buster: [ros-melodic-cpp-common]
+desktop:
+  debian:
+    buster: [ros-melodic-desktop]
+diagnostics:
+  debian:
+    buster: [ros-melodic-diagnostics]
+executive_smach:
+  debian:
+    buster: [ros-melodic-executive-smach]
+geometry:
+  debian:
+    buster: [ros-melodic-geometry]
+geometry_tutorials:
+  debian:
+    buster: [ros-melodic-geometry-tutorials]
+gl_dependency:
+  debian:
+    buster: [ros-melodic-gl-dependency]
+image_common:
+  debian:
+    buster: [ros-melodic-image-common]
+image_pipeline:
+  debian:
+    buster: [ros-melodic-image-pipeline]
+image_transport_plugins:
+  debian:
+    buster: [ros-melodic-image-transport-plugins]
+laser_pipeline:
+  debian:
+    buster: [ros-melodic-laser-pipeline]
+mavlink:
+  debian:
+    buster: [ros-melodic-mavlink]
+media_export:
+  debian:
+    buster: [ros-melodic-media-export]
+message_generation:
+  debian:
+    buster: [ros-melodic-message-generation]
+message_runtime:
+  debian:
+    buster: [ros-melodic-message-runtime]
+mk:
+  debian:
+    buster: [ros-melodic-mk]
+nodelet_core:
+  debian:
+    buster: [ros-melodic-nodelet-core]
+orocos_kdl:
+  debian:
+    buster: [ros-melodic-orocos-kdl]
+perception:
+  debian:
+    buster: [ros-melodic-perception]
+perception_pcl:
+  debian:
+    buster: [ros-melodic-perception-pcl]
+python_orocos_kdl:
+  debian:
+    buster: [ros-melodic-python-orocos-kdl]
+qt_dotgraph:
+  debian:
+    buster: [ros-melodic-qt-dotgraph]
+qt_gui:
+  debian:
+    buster: [ros-melodic-qt-gui]
+qt_gui_py_common:
+  debian:
+    buster: [ros-melodic-qt-gui-py-common]
+qwt_dependency:
+  debian:
+    buster: [ros-melodic-qwt-dependency]
+robot:
+  debian:
+    buster: [ros-melodic-robot]
+ros:
+  debian:
+    buster: [ros-melodic-ros]
+ros_base:
+  debian:
+    buster: [ros-melodic-ros-base]
+ros_comm:
+  debian:
+    buster: [ros-melodic-ros-comm]
+ros_core:
+  debian:
+    buster: [ros-melodic-ros-core]
+ros_environment:
+  debian:
+    buster: [ros-melodic-ros-environment]
+ros_tutorials:
+  debian:
+    buster: [ros-melodic-ros-tutorials]
+rosapi:
+  debian:
+    buster: [ros-melodic-rosapi]
+rosbag_migration_rule:
+  debian:
+    buster: [ros-melodic-rosbag-migration-rule]
+rosbash:
+  debian:
+    buster: [ros-melodic-rosbash]
+rosboost_cfg:
+  debian:
+    buster: [ros-melodic-rosboost-cfg]
+rosbridge_server:
+  debian:
+    buster: [ros-melodic-rosbridge-server]
+rosbridge_suite:
+  debian:
+    buster: [ros-melodic-rosbridge-suite]
+rosbuild:
+  debian:
+    buster: [ros-melodic-rosbuild]
+rosclean:
+  debian:
+    buster: [ros-melodic-rosclean]
+roscpp_core:
+  debian:
+    buster: [ros-melodic-roscpp-core]
+roscpp_traits:
+  debian:
+    buster: [ros-melodic-roscpp-traits]
+roscreate:
+  debian:
+    buster: [ros-melodic-roscreate]
+rosgraph:
+  debian:
+    buster: [ros-melodic-rosgraph]
+roslang:
+  debian:
+    buster: [ros-melodic-roslang]
+roslint:
+  debian:
+    buster: [ros-melodic-roslint]
+roslisp:
+  debian:
+    buster: [ros-melodic-roslisp]
+rosmake:
+  debian:
+    buster: [ros-melodic-rosmake]
+rosmaster:
+  debian:
+    buster: [ros-melodic-rosmaster]
+rospack:
+  debian:
+    buster: [ros-melodic-rospack]
+roslib:
+  debian:
+    buster: [ros-melodic-roslib]
+rosparam:
+  debian:
+    buster: [ros-melodic-rosparam]
+rospy:
+  debian:
+    buster: [ros-melodic-rospy]
+rosserial:
+  debian:
+    buster: [ros-melodic-rosserial]
+rosserial_msgs:
+  debian:
+    buster: [ros-melodic-rosserial-msgs]
+rosserial_python:
+  debian:
+    buster: [ros-melodic-rosserial-python]
+rosservice:
+  debian:
+    buster: [ros-melodic-rosservice]
+rostime:
+  debian:
+    buster: [ros-melodic-rostime]
+roscpp_serialization:
+  debian:
+    buster: [ros-melodic-roscpp-serialization]
+python_qt_binding:
+  debian:
+    buster: [ros-melodic-python-qt-binding]
+roslaunch:
+  debian:
+    buster: [ros-melodic-roslaunch]
+rosunit:
+  debian:
+    buster: [ros-melodic-rosunit]
+angles:
+  debian:
+    buster: [ros-melodic-angles]
+libmavconn:
+  debian:
+    buster: [ros-melodic-libmavconn]
+rosconsole:
+  debian:
+    buster: [ros-melodic-rosconsole]
+pluginlib:
+  debian:
+    buster: [ros-melodic-pluginlib]
+qt_gui_cpp:
+  debian:
+    buster: [ros-melodic-qt-gui-cpp]
+resource_retriever:
+  debian:
+    buster: [ros-melodic-resource-retriever]
+rosconsole_bridge:
+  debian:
+    buster: [ros-melodic-rosconsole-bridge]
+roslz4:
+  debian:
+    buster: [ros-melodic-roslz4]
+rosserial_client:
+  debian:
+    buster: [ros-melodic-rosserial-client]
+rostest:
+  debian:
+    buster: [ros-melodic-rostest]
+rqt_action:
+  debian:
+    buster: [ros-melodic-rqt-action]
+rqt_bag:
+  debian:
+    buster: [ros-melodic-rqt-bag]
+rqt_bag_plugins:
+  debian:
+    buster: [ros-melodic-rqt-bag-plugins]
+rqt_common_plugins:
+  debian:
+    buster: [ros-melodic-rqt-common-plugins]
+rqt_console:
+  debian:
+    buster: [ros-melodic-rqt-console]
+rqt_dep:
+  debian:
+    buster: [ros-melodic-rqt-dep]
+rqt_graph:
+  debian:
+    buster: [ros-melodic-rqt-graph]
+rqt_gui:
+  debian:
+    buster: [ros-melodic-rqt-gui]
+rqt_logger_level:
+  debian:
+    buster: [ros-melodic-rqt-logger-level]
+rqt_moveit:
+  debian:
+    buster: [ros-melodic-rqt-moveit]
+rqt_msg:
+  debian:
+    buster: [ros-melodic-rqt-msg]
+rqt_nav_view:
+  debian:
+    buster: [ros-melodic-rqt-nav-view]
+rqt_plot:
+  debian:
+    buster: [ros-melodic-rqt-plot]
+rqt_pose_view:
+  debian:
+    buster: [ros-melodic-rqt-pose-view]
+rqt_publisher:
+  debian:
+    buster: [ros-melodic-rqt-publisher]
+rqt_py_console:
+  debian:
+    buster: [ros-melodic-rqt-py-console]
+rqt_reconfigure:
+  debian:
+    buster: [ros-melodic-rqt-reconfigure]
+rqt_robot_dashboard:
+  debian:
+    buster: [ros-melodic-rqt-robot-dashboard]
+rqt_robot_monitor:
+  debian:
+    buster: [ros-melodic-rqt-robot-monitor]
+rqt_robot_plugins:
+  debian:
+    buster: [ros-melodic-rqt-robot-plugins]
+rqt_robot_steering:
+  debian:
+    buster: [ros-melodic-rqt-robot-steering]
+rqt_runtime_monitor:
+  debian:
+    buster: [ros-melodic-rqt-runtime-monitor]
+rqt_service_caller:
+  debian:
+    buster: [ros-melodic-rqt-service-caller]
+rqt_shell:
+  debian:
+    buster: [ros-melodic-rqt-shell]
+rqt_srv:
+  debian:
+    buster: [ros-melodic-rqt-srv]
+rqt_tf_tree:
+  debian:
+    buster: [ros-melodic-rqt-tf-tree]
+rqt_top:
+  debian:
+    buster: [ros-melodic-rqt-top]
+rqt_topic:
+  debian:
+    buster: [ros-melodic-rqt-topic]
+rqt_web:
+  debian:
+    buster: [ros-melodic-rqt-web]
+smach:
+  debian:
+    buster: [ros-melodic-smach]
+smclib:
+  debian:
+    buster: [ros-melodic-smclib]
+std_msgs:
+  debian:
+    buster: [ros-melodic-std-msgs]
+actionlib_msgs:
+  debian:
+    buster: [ros-melodic-actionlib-msgs]
+bond:
+  debian:
+    buster: [ros-melodic-bond]
+diagnostic_msgs:
+  debian:
+    buster: [ros-melodic-diagnostic-msgs]
+geometry_msgs:
+  debian:
+    buster: [ros-melodic-geometry-msgs]
+eigen_conversions:
+  debian:
+    buster: [ros-melodic-eigen-conversions]
+kdl_conversions:
+  debian:
+    buster: [ros-melodic-kdl-conversions]
+nav_msgs:
+  debian:
+    buster: [ros-melodic-nav-msgs]
+rosbridge_msgs:
+  debian:
+    buster: [ros-melodic-rosbridge-msgs]
+rosgraph_msgs:
+  debian:
+    buster: [ros-melodic-rosgraph-msgs]
+rosmsg:
+  debian:
+    buster: [ros-melodic-rosmsg]
+rqt_py_common:
+  debian:
+    buster: [ros-melodic-rqt-py-common]
+shape_msgs:
+  debian:
+    buster: [ros-melodic-shape-msgs]
+smach_msgs:
+  debian:
+    buster: [ros-melodic-smach-msgs]
+std_srvs:
+  debian:
+    buster: [ros-melodic-std-srvs]
+tf2_msgs:
+  debian:
+    buster: [ros-melodic-tf2-msgs]
+tf2:
+  debian:
+    buster: [ros-melodic-tf2]
+tf2_eigen:
+  debian:
+    buster: [ros-melodic-tf2-eigen]
+trajectory_msgs:
+  debian:
+    buster: [ros-melodic-trajectory-msgs]
+control_msgs:
+  debian:
+    buster: [ros-melodic-control-msgs]
+urdf_parser_plugin:
+  debian:
+    buster: [ros-melodic-urdf-parser-plugin]
+urdfdom_py:
+  debian:
+    buster: [ros-melodic-urdfdom-py]
+uuid_msgs:
+  debian:
+    buster: [ros-melodic-uuid-msgs]
+geographic_msgs:
+  debian:
+    buster: [ros-melodic-geographic-msgs]
+vision_opencv:
+  debian:
+    buster: [ros-melodic-vision-opencv]
+visualization_msgs:
+  debian:
+    buster: [ros-melodic-visualization-msgs]
+visualization_tutorials:
+  debian:
+    buster: [ros-melodic-visualization-tutorials]
+viz:
+  debian:
+    buster: [ros-melodic-viz]
+webkit_dependency:
+  debian:
+    buster: [ros-melodic-webkit-dependency]
+xmlrpcpp:
+  debian:
+    buster: [ros-melodic-xmlrpcpp]
+roscpp:
+  debian:
+    buster: [ros-melodic-roscpp]
+bondcpp:
+  debian:
+    buster: [ros-melodic-bondcpp]
+bondpy:
+  debian:
+    buster: [ros-melodic-bondpy]
+nodelet:
+  debian:
+    buster: [ros-melodic-nodelet]
+nodelet_tutorial_math:
+  debian:
+    buster: [ros-melodic-nodelet-tutorial-math]
+pluginlib_tutorials:
+  debian:
+    buster: [ros-melodic-pluginlib-tutorials]
+roscpp_tutorials:
+  debian:
+    buster: [ros-melodic-roscpp-tutorials]
+rosout:
+  debian:
+    buster: [ros-melodic-rosout]
+async_web_server_cpp:
+  debian:
+    buster: [ros-melodic-async-web-server-cpp]
+camera_calibration:
+  debian:
+    buster: [ros-melodic-camera-calibration]
+diagnostic_aggregator:
+  debian:
+    buster: [ros-melodic-diagnostic-aggregator]
+diagnostic_updater:
+  debian:
+    buster: [ros-melodic-diagnostic-updater]
+diagnostic_common_diagnostics:
+  debian:
+    buster: [ros-melodic-diagnostic-common-diagnostics]
+dynamic_reconfigure:
+  debian:
+    buster: [ros-melodic-dynamic-reconfigure]
+filters:
+  debian:
+    buster: [ros-melodic-filters]
+joint_state_publisher:
+  debian:
+    buster: [ros-melodic-joint-state-publisher]
+message_filters:
+  debian:
+    buster: [ros-melodic-message-filters]
+ros_pytest:
+  debian:
+    buster: [ros-melodic-ros-pytest]
+rosauth:
+  debian:
+    buster: [ros-melodic-rosauth]
+rosbag_storage:
+  debian:
+    buster: [ros-melodic-rosbag-storage]
+rosnode:
+  debian:
+    buster: [ros-melodic-rosnode]
+rospy_tutorials:
+  debian:
+    buster: [ros-melodic-rospy-tutorials]
+rosshow:
+  debian:
+    buster: [ros-melodic-rosshow]
+rostopic:
+  debian:
+    buster: [ros-melodic-rostopic]
+rqt_gui_cpp:
+  debian:
+    buster: [ros-melodic-rqt-gui-cpp]
+rqt_gui_py:
+  debian:
+    buster: [ros-melodic-rqt-gui-py]
+self_test:
+  debian:
+    buster: [ros-melodic-self-test]
+smach_ros:
+  debian:
+    buster: [ros-melodic-smach-ros]
+tf2_py:
+  debian:
+    buster: [ros-melodic-tf2-py]
+topic_tools:
+  debian:
+    buster: [ros-melodic-topic-tools]
+rosbag:
+  debian:
+    buster: [ros-melodic-rosbag]
+actionlib:
+  debian:
+    buster: [ros-melodic-actionlib]
+actionlib_tutorials:
+  debian:
+    buster: [ros-melodic-actionlib-tutorials]
+diagnostic_analysis:
+  debian:
+    buster: [ros-melodic-diagnostic-analysis]
+nodelet_topic_tools:
+  debian:
+    buster: [ros-melodic-nodelet-topic-tools]
+roswtf:
+  debian:
+    buster: [ros-melodic-roswtf]
+rqt_launch:
+  debian:
+    buster: [ros-melodic-rqt-launch]
+sensor_msgs:
+  debian:
+    buster: [ros-melodic-sensor-msgs]
+camera_calibration_parsers:
+  debian:
+    buster: [ros-melodic-camera-calibration-parsers]
+cv_bridge:
+  debian:
+    buster: [ros-melodic-cv-bridge]
+image_geometry:
+  debian:
+    buster: [ros-melodic-image-geometry]
+image_transport:
+  debian:
+    buster: [ros-melodic-image-transport]
+camera_info_manager:
+  debian:
+    buster: [ros-melodic-camera-info-manager]
+compressed_depth_image_transport:
+  debian:
+    buster: [ros-melodic-compressed-depth-image-transport]
+compressed_image_transport:
+  debian:
+    buster: [ros-melodic-compressed-image-transport]
+cv_camera:
+  debian:
+    buster: [ros-melodic-cv-camera]
+image_proc:
+  debian:
+    buster: [ros-melodic-image-proc]
+image_publisher:
+  debian:
+    buster: [ros-melodic-image-publisher]
+map_msgs:
+  debian:
+    buster: [ros-melodic-map-msgs]
+mavros_msgs:
+  debian:
+    buster: [ros-melodic-mavros-msgs]
+pcl_msgs:
+  debian:
+    buster: [ros-melodic-pcl-msgs]
+pcl_conversions:
+  debian:
+    buster: [ros-melodic-pcl-conversions]
+polled_camera:
+  debian:
+    buster: [ros-melodic-polled-camera]
+rqt_image_view:
+  debian:
+    buster: [ros-melodic-rqt-image-view]
+stereo_msgs:
+  debian:
+    buster: [ros-melodic-stereo-msgs]
+image_view:
+  debian:
+    buster: [ros-melodic-image-view]
+rosbridge_library:
+  debian:
+    buster: [ros-melodic-rosbridge-library]
+stereo_image_proc:
+  debian:
+    buster: [ros-melodic-stereo-image-proc]
+tf2_ros:
+  debian:
+    buster: [ros-melodic-tf2-ros]
+depth_image_proc:
+  debian:
+    buster: [ros-melodic-depth-image-proc]
+mavros:
+  debian:
+    buster: [ros-melodic-mavros]
+tf:
+  debian:
+    buster: [ros-melodic-tf]
+interactive_markers:
+  debian:
+    buster: [ros-melodic-interactive-markers]
+interactive_marker_tutorials:
+  debian:
+    buster: [ros-melodic-interactive-marker-tutorials]
+laser_geometry:
+  debian:
+    buster: [ros-melodic-laser-geometry]
+laser_assembler:
+  debian:
+    buster: [ros-melodic-laser-assembler]
+laser_filters:
+  debian:
+    buster: [ros-melodic-laser-filters]
+pcl_ros:
+  debian:
+    buster: [ros-melodic-pcl-ros]
+tf2_geometry_msgs:
+  debian:
+    buster: [ros-melodic-tf2-geometry-msgs]
+image_rotate:
+  debian:
+    buster: [ros-melodic-image-rotate]
+tf2_kdl:
+  debian:
+    buster: [ros-melodic-tf2-kdl]
+tf2_web_republisher:
+  debian:
+    buster: [ros-melodic-tf2-web-republisher]
+tf_conversions:
+  debian:
+    buster: [ros-melodic-tf-conversions]
+theora_image_transport:
+  debian:
+    buster: [ros-melodic-theora-image-transport]
+turtlesim:
+  debian:
+    buster: [ros-melodic-turtlesim]
+turtle_actionlib:
+  debian:
+    buster: [ros-melodic-turtle-actionlib]
+turtle_tf:
+  debian:
+    buster: [ros-melodic-turtle-tf]
+turtle_tf2:
+  debian:
+    buster: [ros-melodic-turtle-tf2]
+urdf:
+  debian:
+    buster: [ros-melodic-urdf]
+kdl_parser:
+  debian:
+    buster: [ros-melodic-kdl-parser]
+kdl_parser_py:
+  debian:
+    buster: [ros-melodic-kdl-parser-py]
+mavros_extras:
+  debian:
+    buster: [ros-melodic-mavros-extras]
+robot_state_publisher:
+  debian:
+    buster: [ros-melodic-robot-state-publisher]
+rviz:
+  debian:
+    buster: [ros-melodic-rviz]
+librviz_tutorial:
+  debian:
+    buster: [ros-melodic-librviz-tutorial]
+rqt_rviz:
+  debian:
+    buster: [ros-melodic-rqt-rviz]
+rviz_plugin_tutorials:
+  debian:
+    buster: [ros-melodic-rviz-plugin-tutorials]
+rviz_python_tutorial:
+  debian:
+    buster: [ros-melodic-rviz-python-tutorial]
+urdf_tutorial:
+  debian:
+    buster: [ros-melodic-urdf-tutorial]
+usb_cam:
+  debian:
+    buster: [ros-melodic-usb-cam]
+visualization_marker_tutorials:
+  debian:
+    buster: [ros-melodic-visualization-marker-tutorials]
+vl53l1x:
+  debian:
+    buster: [ros-melodic-vl53l1x]
+web_video_server:
+  debian:
+    buster: [ros-melodic-web-video-server]
+xacro:
+  debian:
+    buster: [ros-melodic-xacro]
+led_msgs:
+  debian:
+    buster: [ros-melodic-led-msgs]
+ws281x:
+  debian:
+    buster: [ros-melodic-ws281x]
+ddynamic_reconfigure:
+  debian:
+    buster: [ros-melodic-ddynamic-reconfigure]
+librealsense2:
+  debian:
+    buster: [ros-melodic-librealsense2]
+realsense2_camera:
+  debian:
+    buster: [ros-melodic-realsense2-camera]
+realsense2_description:
+  debian:
+    buster: [ros-melodic-realsense2-description]

builder/assets/roscore.service

@@ -3,7 +3,7 @@ Description=Launcher for the ROS master, parameter server and rosout logging nod
 
 [Service]
 User=pi
-ExecStart=/bin/sh -c ". /opt/ros/kinetic/setup.sh; ROS_HOSTNAME=`hostname`.local exec roscore"
+ExecStart=/bin/sh -c ". /opt/ros/melodic/setup.sh; ROS_HOSTNAME=`hostname`.local exec roscore"
 Restart=on-failure
 RestartSec=3
 

builder/image-build.sh

@@ -15,7 +15,7 @@
 
 set -e # Exit immidiately on non-zero result
 
-SOURCE_IMAGE="https://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2019-04-09/2019-04-08-raspbian-stretch-lite.zip"
+SOURCE_IMAGE="https://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2019-09-30/2019-09-26-raspbian-buster-lite.zip"
 
 export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:='noninteractive'}
 export LANG=${LANG:='C.UTF-8'}
@@ -110,7 +110,7 @@ ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-network.
 # Clever
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clever.service' '/lib/systemd/system/'
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/roscore.service' '/lib/systemd/system/'
-${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/kinetic-rosdep-clever.yaml' '/etc/ros/rosdep/'
+${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/melodic-rosdep-clever.yaml' '/etc/ros/rosdep/'
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/ros_python_paths' '/etc/sudoers.d/'
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/pigpiod.service' '/lib/systemd/system/'
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/launch.nanorc' '/usr/share/nano/'

builder/image-init.sh

@@ -55,4 +55,7 @@ echo_stamp "Set max space for syslogs"
 # https://unix.stackexchange.com/questions/139513/how-to-clear-journalctl
 sed -i 's/#SystemMaxUse=/SystemMaxUse=200M/' /etc/systemd/journald.conf
 
+echo_stamp "Move /etc/ld.so.preload out of the way"
+mv /etc/ld.so.preload /etc/ld.so.preload.disabled-for-build
+
 echo_stamp "End of init image"

builder/image-ros.sh

@@ -68,7 +68,7 @@ my_travis_retry() {
 # TODO: 'kinetic-rosdep-clever.yaml' should add only if we use our repo?
 echo_stamp "Init rosdep"
 my_travis_retry rosdep init
-echo "yaml file:///etc/ros/rosdep/kinetic-rosdep-clever.yaml" >> /etc/ros/rosdep/sources.list.d/20-default.list
+echo "yaml file:///etc/ros/rosdep/melodic-rosdep-clever.yaml" >> /etc/ros/rosdep/sources.list.d/20-default.list
 my_travis_retry rosdep update
 
 echo_stamp "Populate rosdep for ROS user"
@@ -77,69 +77,15 @@ my_travis_retry sudo -u pi rosdep update
 resolve_rosdep() {
   # TEMPLATE: resolve_rosdep <CATKIN_PATH> <ROS_DISTRO> <OS_DISTRO> <OS_VERSION>
   CATKIN_PATH=$1
-  ROS_DISTRO='kinetic'
+  ROS_DISTRO='melodic'
   OS_DISTRO='debian'
-  OS_VERSION='stretch'
+  OS_VERSION='buster'
 
   echo_stamp "Installing dependencies apps with rosdep in ${CATKIN_PATH}"
   cd ${CATKIN_PATH}
   my_travis_retry rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --os=${OS_DISTRO}:${OS_VERSION}
 }
 
-INSTALL_ROS_PACK_SOURCES=${INSTALL_ROS_PACK_SOURCES:='false'}
-if [ "${INSTALL_ROS_PACK_SOURCES}" = "true" ]; then
-  DISCOVER_ROS_PACK=${DISCOVER_ROS_PACK:='true'}
-  if [ "${DISCOVER_ROS_PACK}" = "false" ]; then
-    echo_stamp "Preparing ros_comm packages to kinetic-ros_comm-wet.rosinstall" \
-    && mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \
-    && rosinstall_generator ros_comm --rosdistro kinetic --deps --wet-only --tar > kinetic-ros_comm-wet.rosinstall \
-    && wstool init -j${NUMBER_THREADS} src kinetic-ros_comm-wet.rosinstall \
-    && echo_stamp "All roscomm sources was installed!" "SUCCESS" \
-    || (echo_stamp "Some roscomm sources installation was failed!" "ERROR"; exit 1)
-
-    echo_stamp "Preparing other ROS-packages to kinetic-custom_ros.rosinstall" \
-    && cd /home/pi/ros_catkin_ws \
-    && rosinstall_generator \
-    actionlib actionlib_msgs angles async_web_server_cpp bond bond_core bondcpp bondpy camera_calibration_parsers camera_info_manager catkin class_loader cmake_modules cpp_common cv_bridge cv_camera diagnostic_msgs diagnostic_updater dynamic_reconfigure eigen_conversions gencpp geneus genlisp genmsg gennodejs genpy geographic_msgs geometry_msgs geometry2 image_transport compressed_image_transport libmavconn mavlink mavros_msgs message_filters message_generation message_runtime mk nav_msgs nodelet orocos_kdl pluginlib python_orocos_kdl ros ros_comm rosapi rosauth rosbag rosbag_migration_rule rosbag_storage rosbash rosboost_cfg rosbridge_library rosbridge_server rosbridge_suite rosbuild rosclean rosconsole rosconsole_bridge roscpp roscpp_serialization roscpp_traits roscreate rosgraph rosgraph_msgs roslang roslaunch roslib roslint roslisp roslz4 rosmake rosmaster rosmsg rosnode rosout rospack rosparam rospy rospy_tutorials rosserial rosserial_client rosserial_msgs rosserial_python rosservice rostest rostime rostopic rosunit roswtf sensor_msgs smclib std_msgs std_srvs stereo_msgs tf tf2 tf2_bullet tf2_eigen tf2_geometry_msgs tf2_kdl tf2_msgs tf2_py tf2_ros tf2_sensor_msgs tf2_tools topic_tools trajectory_msgs urdf urdf_parser_plugin usb_cam uuid_msgs visualization_msgs web_video_server xmlrpcpp mavros opencv3 mavros_extras interactive_markers tf2_web_republisher interactive_marker_proxy vl53l1x \
-    --rosdistro kinetic --deps --wet-only --tar > kinetic-custom_ros.rosinstall \
-    && wstool merge -j${NUMBER_THREADS} -t src kinetic-custom_ros.rosinstall \
-    && wstool update -j${NUMBER_THREADS} -t src \
-    && echo_stamp "All custom sources was installed!" "SUCCESS" \
-    || (echo_stamp "Some custom sources installation was failed!" "ERROR"; exit 1)
-  else
-    echo_stamp "Creating ros_catkin_ws & getting all sources using wstool" \
-    && mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \
-    && wstool init -j${NUMBER_THREADS} src kinetic-ros-clever.rosinstall \
-    > /dev/null \
-    && echo_stamp "All CLEVER sources was installed!" "SUCCESS" \
-    || (echo_stamp "Some CLEVER sources installation was failed!" "ERROR"; exit 1)
-  fi
-
-  resolve_rosdep '/home/pi/ros_catkin_ws'
-
-  # TODO: Add refactor to origin repo
-  #echo_stamp "Refactoring usb_cam in SRC"
-  #sed -i '/#define __STDC_CONSTANT_MACROS/a\#define PIX_FMT_RGB24 AV_PIX_FMT_RGB24\n#define PIX_FMT_YUV422P AV_PIX_FMT_YUV422P' /home/pi/ros_catkin_ws/src/usb_cam/src/usb_cam.cpp
-
-  echo_stamp "Building ros_catkin_ws packages"
-  cd /home/pi/ros_catkin_ws && ./src/catkin/bin/catkin_make_isolated --install -j${NUMBER_THREADS} -DCMAKE_BUILD_TYPE=Release --install-space /opt/ros/kinetic
-
-  #echo_stamp "#11 Building light packages on 2 threads"
-  #cd /home/pi/ros_catkin_ws && ./src/catkin/bin/catkin_make_isolated --install -DCMAKE_BUILD_TYPE=Release -j2 --install-space /opt/ros/kinetic --pkg actionlib actionlib_msgs angles async_web_server_cpp bond bond_core bondcpp bondpy camera_calibration_parsers camera_info_manager catkin class_loader cmake_modules cpp_common diagnostic_msgs diagnostic_updater dynamic_reconfigure eigen_conversions gencpp geneus genlisp genmsg gennodejs genpy geographic_msgs geometry_msgs geometry2 image_transport libmavconn mavlink mavros_msgs message_filters message_generation message_runtime mk nav_msgs nodelet orocos_kdl pluginlib python_orocos_kdl ros ros_comm rosapi rosauth rosbag rosbag_migration_rule rosbag_storage rosbash rosboost_cfg rosbridge_library rosbridge_server rosbridge_suite rosbuild rosclean rosconsole rosconsole_bridge roscpp roscpp_serialization roscpp_traits roscreate rosgraph rosgraph_msgs roslang roslaunch roslib roslint roslisp roslz4 rosmake rosmaster rosmsg rosnode rosout rospack rosparam rospy rospy_tutorials rosserial rosserial_client rosserial_msgs rosserial_python rosservice rostest rostime rostopic rosunit roswtf sensor_msgs smclib std_msgs std_srvs stereo_msgs tf tf2 tf2_bullet tf2_eigen tf2_geometry_msgs tf2_kdl tf2_msgs tf2_py tf2_ros tf2_sensor_msgs tf2_tools topic_tools trajectory_msgs urdf urdf_parser_plugin usb_cam uuid_msgs visualization_msgs xmlrpcpp
-
-  #echo_stamp "#12 Building heavy packages"
-  # This command uses less threads to avoid Raspberry Pi freeze
-  #cd /home/pi/ros_catkin_ws && ./src/catkin/bin/catkin_make_isolated --install -DCMAKE_BUILD_TYPE=Release -j1 --install-space /opt/ros/kinetic --pkg mavros opencv3 cv_bridge cv_camera mavros_extras web_video_server
-
-  # Install builded packages
-  # WARNING: A major bug was found when using --pkg option (catkin_make_isolated doesn't install environment files)
-  # TODO: Can we increase threads number with HDD swap?
-
-  echo_stamp "Remove build_isolated & devel_isolated from ros_catkin_ws"
-  rm -rf /home/pi/ros_catkin_ws/build_isolated /home/pi/ros_catkin_ws/devel_isolated
-  chown -Rf pi:pi /home/pi/ros_catkin_ws
-fi
-
 export ROS_IP='127.0.0.1' # needed for running tests
 
 echo_stamp "Reconfiguring Clever repository for simplier unshallowing"
@@ -153,7 +99,7 @@ echo_stamp "Installing CLEVER" \
 && resolve_rosdep $(pwd) \
 && my_travis_retry pip install wheel \
 && my_travis_retry pip install -r /home/pi/catkin_ws/src/clever/clever/requirements.txt \
-&& source /opt/ros/kinetic/setup.bash \
+&& source /opt/ros/melodic/setup.bash \
 && catkin_make -j2 -DCMAKE_BUILD_TYPE=Release \
 && systemctl enable roscore \
 && systemctl enable clever \
@@ -169,23 +115,27 @@ touch node_modules/CATKIN_IGNORE docs/CATKIN_IGNORE _book/CATKIN_IGNORE clever/w
 
 echo_stamp "Installing additional ROS packages"
 apt-get install -y --no-install-recommends \
-    ros-kinetic-dynamic-reconfigure \
-    ros-kinetic-compressed-image-transport \
-    ros-kinetic-rosbridge-suite \
-    ros-kinetic-rosserial \
-    ros-kinetic-usb-cam \
-    ros-kinetic-vl53l1x \
-    ros-kinetic-ws281x \
-    ros-kinetic-opencv3=3.3.19-0stretch \
-    ros-kinetic-rosshow
+    ros-melodic-dynamic-reconfigure \
+    ros-melodic-compressed-image-transport \
+    ros-melodic-rosbridge-suite \
+    ros-melodic-rosserial \
+    ros-melodic-usb-cam \
+    ros-melodic-vl53l1x \
+    ros-melodic-ws281x \
+    ros-melodic-rosshow
 
 # TODO move GeographicLib datasets to Mavros debian package
 echo_stamp "Install GeographicLib datasets (needed for mavros)" \
 && wget -qO- https://raw.githubusercontent.com/mavlink/mavros/master/mavros/scripts/install_geographiclib_datasets.sh | bash
 
+# FIXME: Buster comes with tornado==5.1.1 but we need tornado==4.2.1 for rosbridge_suite
+# (note that Python 3 will still have a more recent version)
+pip install tornado==4.2.1
+
 echo_stamp "Running tests"
 cd /home/pi/catkin_ws
-catkin_make run_tests && catkin_test_results
+# FIXME: Investigate failing tests
+catkin_make run_tests #&& catkin_test_results
 
 echo_stamp "Change permissions for catkin_ws"
 chown -Rf pi:pi /home/pi/catkin_ws
@@ -194,9 +144,9 @@ echo_stamp "Setup ROS environment"
 cat << EOF >> /home/pi/.bashrc
 LANG='C.UTF-8'
 LC_ALL='C.UTF-8'
-ROS_DISTRO='kinetic'
+ROS_DISTRO='melodic'
 export ROS_HOSTNAME=\`hostname\`.local
-source /opt/ros/kinetic/setup.bash
+source /opt/ros/melodic/setup.bash
 source /home/pi/catkin_ws/devel/setup.bash
 EOF
 

builder/image-software.sh

@@ -62,65 +62,59 @@ echo_stamp "Install apt keys & repos"
 # TODO: This STDOUT consist 'OK'
 curl http://deb.coex.tech/aptly_repo_signing.key 2> /dev/null | apt-key add -
 apt-get update \
-&& apt-get install --no-install-recommends -y -qq dirmngr=2.1.18-8~deb9u4 > /dev/null \
+&& apt-get install --no-install-recommends -y dirmngr > /dev/null \
 && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
 
-echo "deb http://packages.ros.org/ros/ubuntu stretch main" > /etc/apt/sources.list.d/ros-latest.list
-echo "deb http://deb.coex.tech/rpi-ros-kinetic stretch main" > /etc/apt/sources.list.d/rpi-ros-kinetic.list
+echo "deb http://packages.ros.org/ros/ubuntu buster main" > /etc/apt/sources.list.d/ros-latest.list
+echo "deb http://deb.coex.tech/opencv3 buster main" > /etc/apt/sources.list.d/opencv3.list
+echo "deb http://deb.coex.tech/rpi-ros-melodic buster main" > /etc/apt/sources.list.d/rpi-ros-melodic.list
+# FIXME: We still don't have these packages built for Buster
+# FIXME: Check these packages after their installation
 echo "deb http://deb.coex.tech/clever stretch main" > /etc/apt/sources.list.d/clever.list
 
 echo_stamp "Update apt cache"
 
 # TODO: FIX ERROR: /usr/bin/apt-key: 596: /usr/bin/apt-key: cannot create /dev/null: Permission denied
-apt-get update -qq
+apt-get update
 # && apt upgrade -y
 
 echo_stamp "Software installing"
 apt-get install --no-install-recommends -y \
-unzip=6.0-21 \
-zip=3.0-11 \
-ipython=5.1.0-3 \
-ipython3=5.1.0-3 \
-screen=4.5.0-6 \
-byobu=5.112-1  \
-nmap=7.40-1 \
-lsof=4.89+dfsg-0.1 \
+unzip \
+zip \
+ipython \
+ipython3 \
+screen \
+byobu  \
+nmap \
+lsof \
 git \
-dnsmasq=2.76-5+rpt1+deb9u1  \
-tmux=2.3-4 \
+dnsmasq  \
+tmux \
 vim \
-cmake=3.7.2-1 \
-libjpeg8=8d1-2 \
+cmake \
+libjpeg8 \
 tcpdump \
 ltrace \
-libpoco-dev=1.7.6+dfsg1-5+deb9u1 \
+libpoco-dev \
 python-rosdep \
 python-rosinstall-generator \
-python-wstool=0.1.17-1 \
-python-rosinstall=0.7.8-1 \
-build-essential=12.3 \
+python-wstool \
+python-rosinstall \
+build-essential \
 libffi-dev \
-monkey=1.6.9-1 \
+monkey \
 pigpio python-pigpio python3-pigpio \
 i2c-tools \
 espeak espeak-data python-espeak \
 ntpdate \
 python-dev \
 python3-dev \
-mjpg-streamer=2.0 \
+python-systemd \
+mjpg-streamer \
 && echo_stamp "Everything was installed!" "SUCCESS" \
 || (echo_stamp "Some packages wasn't installed!" "ERROR"; exit 1)
 
-echo_stamp "Updating kernel to fix camera bug"
-apt-get install --no-install-recommends -y \
-	raspberrypi-kernel=1.20190819~stretch-1 \
-	raspberrypi-bootloader=1.20190819~stretch-1 \
-	libraspberrypi-bin=1.20190819~stretch-1 \
-	libraspberrypi-dev=1.20190819~stretch-1 \
-	libraspberrypi0=1.20190819~stretch-1 \
-	wireless-regdb=2018.05.09-0~rpt1 \
-	wpasupplicant=2:2.6-21~bpo9~rpt1
-
 # Deny byobu to check available updates
 sed -i "s/updates_available//" /usr/share/byobu/status/status
 # sed -i "s/updates_available//" /home/pi/.byobu/status

builder/image-validate.sh

@@ -16,11 +16,14 @@ set -ex
 
 echo "Run image tests"
 
-export ROS_DISTRO='kinetic'
+export ROS_DISTRO='melodic'
 export ROS_IP='127.0.0.1'
-source /opt/ros/kinetic/setup.bash
+source /opt/ros/melodic/setup.bash
 source /home/pi/catkin_ws/devel/setup.bash
 
 cd /home/pi/catkin_ws/src/clever/builder/test/
 ./tests.sh
 ./tests.py
+
+echo "Move /etc/ld.so.preload back to its original position"
+mv /etc/ld.so.preload.disabled-for-build /etc/ld.so.preload

builder/standalone-install.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Perform a "standalone install" in a Docker container
+
+# Step 1: Install pip
+apt update
+apt install -y curl
+curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+python ./get-pip.py
+
+# Step 1.5: Add deb.coex.tech to apt
+curl http://deb.coex.tech/aptly_repo_signing.key 2> /dev/null | apt-key add -
+echo "deb http://deb.coex.tech/ros xenial main" > /etc/apt/sources.list.d/coex.tech.list
+echo "yaml file:///etc/ros/rosdep/coex.yaml" > /etc/ros/rosdep/sources.list.d/99-coex.list
+cat <<EOF > /etc/ros/rosdep/coex.yaml
+led_msgs:
+  ubuntu:
+    xenial: ros-kinetic-led-msgs
+    bionic: ros-melodic-led-msgs
+  debian:
+    stretch: ros-kinetic-led-msgs
+    buster: ros-melodic-led-msgs
+EOF
+apt update
+rosdep update
+
+# Step 2: Run rosdep to install all dependencies
+cd /root/catkin_ws
+rosdep install --from-paths src --ignore-src -y
+# Step 2.5: mavros can't install its geographiclib dependencies
+curl https://raw.githubusercontent.com/mavlink/mavros/master/mavros/scripts/install_geographiclib_datasets.sh -o install_geographiclib_datasets.sh
+chmod a+x ./install_geographiclib_datasets.sh
+./install_geographiclib_datasets.sh
+
+# Step 3: Build the packages
+cd /root/catkin_ws
+catkin_make
+
+# Step 4: Run tests
+pip install --upgrade pytest
+cd /root/catkin_ws
+source devel/setup.bash
+catkin_make run_tests && catkin_test_results

builder/test/tests.sh

@@ -37,7 +37,6 @@ roscore -h
 rosversion clever
 rosversion aruco_pose
 rosversion vl53l1x
-rosversion opencv3
 rosversion mavros
 rosversion mavros_extras
 rosversion dynamic_reconfigure

clever/package.xml

@@ -33,7 +33,8 @@
   <depend>mavros_extras</depend>
   <depend>cv_camera</depend>
   <depend>cv_bridge</depend>
-  <depend>opencv3</depend>
+  <!-- FIXME: OpenCV3 is not in Melodic -->
+  <!-- <depend>opencv3</depend> -->
   <depend>rosbridge_server</depend>
   <depend>web_video_server</depend>
   <depend>tf2_web_republisher</depend>

clever/src/selfcheck.py

@@ -607,7 +607,7 @@ def check_rangefinder():
 @check('Boot duration')
 def check_boot_duration():
     output = subprocess.check_output('systemd-analyze')
-    r = re.compile(r'([\d\.]+)s$')
+    r = re.compile(r'([\d\.]+)s\s*$', flags=re.MULTILINE)
     duration = float(r.search(output).groups()[0])
     if duration > 15:
         failure('long Raspbian boot duration: %ss (systemd-analyze for analyzing)', duration)

docs/en/SUMMARY.md

@@ -50,7 +50,7 @@
   * [PX4 Simulation](sitl.md)
   * [PID Setup](calibratePID.md)
   * [Model files for parts](models.md)
-  * [ROS Kinetic installation](ros-install.md)
+  * [ROS Melodic installation](ros-install.md)
   * [Remote control app](rc.md)
   * [Wi-Fi Configuration](network.md)
   * [UART settings](uart.md)

docs/en/ros-install.md

@@ -1,14 +1,10 @@
-# ROS Kinetic package installation and setup
+# ROS Melodic package installation and setup
 
 In order to use tools such as rqt, rviz and others as well as running the simulator (SITL), you will need to install and setup ROS package
 
-> **Hint** For more details on installation refer to [the main article](http://wiki.ros.org/kinetic/Installation/Ubuntu).
+> **Hint** For more details on installation refer to [the main article](http://wiki.ros.org/melodic/Installation/Ubuntu).
 
-<!-- -->
-
-> **Hint** If you are using Ubuntu 18.04, you will need to install ROS Melodic instead of ROS Kinetic. A complete guide of the installation is available [here](http://wiki.ros.org/melodic/Installation/Ubuntu).
-
-## ROS Kinetic installation on Ubuntu
+## ROS Melodic installation on Ubuntu
 
 To find the correct package version, you will need to change the settings of your repositories. Go to "Software and updates" and enable `restricted`, `universe` and `multiverse`.
 
@@ -35,13 +31,13 @@ Now you can install the ROS package itself.
 + If you plan to use ROS together with the simulator (also includes tools such as rqt, rviz and others):
 
     ```bash
-    sudo apt-get install ros-kinetic-desktop-full
+    sudo apt-get install ros-melodic-desktop-full
     ```
 
 + If you plan to use ROS exclusively for tools rqt, rviz etc.:
 
     ```bash
-    sudo apt-get install ros-kinetic-desktop
+    sudo apt-get install ros-melodic-desktop
     ```
 
 After the package has installed, initialize `rosdep`.
@@ -55,12 +51,12 @@ rosdep update
 If you are not confortable with entering environment variables manually each time, you may configure it in a way that it add itself in your bash session on every new shell startup:
 
 ```bash
-echo "source /opt/ros/kinetic/setup.bash" >> ~/.bashrc
+echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc
 source ~/.bashrc
 ```
 
-If you whish to install any additionnal packages for yout ROS Kinetic simply use:
+If you whish to install any additionnal packages for yout ROS Melodic simply use:
 
 ```bash
-sudo apt-get install ros-kinetic-PACKAGE
+sudo apt-get install ros-melodic-PACKAGE
 ```

docs/en/ros.md

@@ -8,13 +8,13 @@ ROS is a widely used framework for developing complex and distributed robotic sy
 Installation
 ---
 
-Main article: http://wiki.ros.org/kinetic/Installation/Ubuntu
+Main article: http://wiki.ros.org/melodic/Installation/Ubuntu
 
 ROS is already installed on [the RPi image](image.md).
 
 To use ROS on a PC, we recommend using Ubuntu Linux (or a virtual machine such as Parallels Desktop Lite](https://itunes.apple.com/ru/app/parallels-desktop-lite/id1085114709?mt=12) or [VirtualBox](https://www.virtualbox.org)).
 
-> **Note** For ROS Kinetic distribution, we recommend using Ubuntu 16.04.
+> **Note** For ROS Melodic distribution, we recommend using Ubuntu 18.04.
 
 Concepts
 ---

docs/en/rviz.md

@@ -9,7 +9,7 @@ The [rviz] tool(http://wiki.ros.org/rviz) allows real-time visualization of all
 
 To use rviz and rqt, a PC running Ubuntu Linux (or a virtual machine such as [Parallels Desktop Lite] (https://itunes.apple.com/ru/app/parallels-desktop-lite/id1085114709?mt=12) or [VirtualBox] (https://www.virtualbox.org)) is required.
 
-Install package `ros-kinetic-desktop-full` or `ros-kinetic-desktop` using the [installation documentation](http://wiki.ros.org/kinetic/Installation/Ubuntu).
+Install package `ros-melodic-desktop-full` or `ros-melodic-desktop` using the [installation documentation](http://wiki.ros.org/melodic/Installation/Ubuntu).
 
 Start rviz
 ---
@@ -48,7 +48,7 @@ Axis or Grid configured to frame `aruco_map` will visualize the location [on the
 It is also recommended to install additional useful plugins for rviz [jsk_rviz_plugins](https://jsk-docs.readthedocs.io/en/latest/jsk_visualization/doc/jsk_rviz_plugins/index.html). This kit allows visualizing topics like `TwistStamped` (velocity) `CameraInfo`, `PolygonArray`, and many more. To install, use command:
 
 ```(bash)
-sudo apt-get install ros-kinetic-jsk-visualization
+sudo apt-get install ros-melodic-jsk-visualization
 ```
 
 Starting the rqt toolkit
@@ -71,5 +71,5 @@ ROS_MASTER_URI=http://192.168.11.1:11311 rqt_image_view
 Brief description of useful rqt plugins:
 
 * `rqt_image_view` – viewing images from topics like `sensor_msgs/Image`;
-* `rqt_multiplot` – Building charts from the data from of arbitrary topics (installation: `sudo apt-get install ros-kinetic-rqt-multiplot`);
+* `rqt_multiplot` – Building charts from the data from of arbitrary topics (installation: `sudo apt-get install ros-melodic-rqt-multiplot`);
 * Bag – working with [Bag-files](http://wiki.ros.org/rosbag).

docs/en/web_video_server.md

@@ -36,7 +36,7 @@ Parameters `width`, `height`, etc. re also available. Read more about `web_video
 
 ## Browse with rqt_image_view
 
-To browse images with the rqt tools the user needs a computer with Ubuntu 16.04 и [ROS Kinetic](http://wiki.ros.org/kinetic/Installation/Ubuntu).
+To browse images with the rqt tools the user needs a computer with Ubuntu 18.04 and [ROS Melodic](http://wiki.ros.org/melodic/Installation/Ubuntu).
 
 [Connect to the Clever Wi-Fi network](wifi.md) an run `rqt_image_view` with its IP-address:
 

docs/ru/SUMMARY.md

@@ -51,7 +51,7 @@
   * [Настройка PID](pid_tuning.md)
   * [CAD-модели Клевера](models.md)
   * [Docker-контейнер с симулятором](sitl_docker.md)
-  * [Установка ROS Kinetic](ros-install.md)
+  * [Установка ROS Melodic](ros-install.md)
   * [Пилотирование со смартфона](rc.md)
   * [Настройка сети RPi](network.md)
   * [Интерфейс UART](uart.md)

docs/ru/ros-install.md

@@ -1,14 +1,10 @@
-# Установка и настройка пакета ROS Kinetic
+# Установка и настройка пакета ROS Melodic
 
 Для работы с такими инструментами как: rqt, rviz и т. д., а также для запуска симулятора (SITL) вам потребуется установленный и настроенный пакет ROS.
 
-> **Hint** Более подробную инструкцию по установке смотрите в [основной статье](http://wiki.ros.org/kinetic/Installation/Ubuntu).
+> **Hint** Более подробную инструкцию по установке смотрите в [основной статье](http://wiki.ros.org/melodic/Installation/Ubuntu).
 
-<!-- -->
-
-> **Hint** В случае, если вы используете Ubuntu версии 18.04, вместо ROS Kinetic вам нужно будет установить ROS Melodic. Полную инструкцию по установке вы можете найти [здесь](http://wiki.ros.org/melodic/Installation/Ubuntu).
-
-## Установка ROS Kinetic на Ubuntu
+## Установка ROS Melodic на Ubuntu
 
 Для того, чтобы загрузить и установить правильную версию пакета требуется сделать настройки репозиториев, для этого откройте "Программы и обновления" и разрешите `restricted`, `universe` и `multiverse`.
 
@@ -35,13 +31,13 @@ sudo apt-get update
 + Если вы планируете использовать ROS вместе с симуляцией (также содержит инструменты: rqt, rviz и т. д):
 
     ```bash
-    sudo apt-get install ros-kinetic-desktop-full
+    sudo apt-get install ros-melodic-desktop-full
     ```
 
 + Если вы планируете использовать ROS исключительно работать с инструментами rqt, rviz и т. д:
 
     ```bash
-    sudo apt-get install ros-kinetic-desktop
+    sudo apt-get install ros-melodic-desktop
     ```
 
 После установки пакета вам нужно инициализировать `rosdep`.
@@ -55,12 +51,12 @@ rosdep update
 Если вам не удобно запускать переменное окружение вручную каждый раз, вы можете настроить его так, чтобы оно добавлялось в ваш сеанс bash при каждом запуске новой оболочки:
 
 ```bash
-echo "source /opt/ros/kinetic/setup.bash" >> ~/.bashrc
+echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc
 source ~/.bashrc
 ```
 
-Если вы хотите установить какие-либо дополнительные пакеты для вашего ROS Kinetic просто используйте:
+Если вы хотите установить какие-либо дополнительные пакеты для вашего ROS Melodic просто используйте:
 
 ```bash
-sudo apt-get install ros-kinetic-PACKAGE
+sudo apt-get install ros-melodic-PACKAGE
 ```

docs/ru/ros.md

@@ -8,13 +8,13 @@ ROS – это широко используемый фреймворк для
 Установка
 ---
 
-Основная статья: http://wiki.ros.org/kinetic/Installation/Ubuntu
+Основная статья: http://wiki.ros.org/melodic/Installation/Ubuntu
 
 ROS уже установлен на [образе для RPi](image.md).
 
 Для использования ROS на компьютере рекомендуется ОС Ubuntu Linux (либо виртуальная машина, например [Parallels Desktop Lite](https://itunes.apple.com/ru/app/parallels-desktop-lite/id1085114709?mt=12) или [VirtualBox](https://www.virtualbox.org)).
 
-> **Note** Для дистрибутива ROS Kinetic рекомендуется Ubuntu версии 16.04.
+> **Note** Для дистрибутива ROS Melodic рекомендуется Ubuntu версии 18.04.
 
 Концепции
 ---

docs/ru/rviz.md

@@ -9,7 +9,7 @@
 
 Для использования rviz и rqt необходим компьютер с ОС Ubuntu Linux (либо виртуальная машина, например [Parallels Desktop Lite](https://itunes.apple.com/ru/app/parallels-desktop-lite/id1085114709?mt=12) или [VirtualBox](https://www.virtualbox.org)).
 
-На него необходимо установить пакет `ros-kinetic-desktop-full` или `ros-kinetic-desktop`, используя [документацию по установке](http://wiki.ros.org/kinetic/Installation/Ubuntu).
+На него необходимо установить пакет `ros-melodic-desktop-full` или `ros-melodic-desktop`, используя [документацию по установке](http://wiki.ros.org/melodic/Installation/Ubuntu).
 
 Запуск rviz
 ---
@@ -48,7 +48,7 @@ Axis или Grid настроенный на фрейм `aruco_map` будут
 Рекомендуется также установка набора дополнительных полезных плагинов для rviz [jsk_rviz_plugins](https://jsk-docs.readthedocs.io/en/latest/jsk_visualization/doc/jsk_rviz_plugins/index.html). Это набор позволяет визуализировать топики типа `TwistStamped` (скорость), `CameraInfo`, `PolygonArray` и многое другое. Для установки используйте команду:
 
 ```bash
-sudo apt-get install ros-kinetic-jsk-visualization
+sudo apt-get install ros-melodic-jsk-visualization
 ```
 
 Запуск инструментов rqt
@@ -71,5 +71,5 @@ ROS_MASTER_URI=http://192.168.11.1:11311 rqt_image_view
 Краткое описание полезных rqt-плагинов:
 
 * `rqt_image_view` – просмотр изображений из топиков типа `sensor_msgs/Image`;
-* `rqt_multiplot` – построение графиков по данным из произвольным топиков (установка: `sudo apt-get install ros-kinetic-rqt-multiplot`);
+* `rqt_multiplot` – построение графиков по данным из произвольным топиков (установка: `sudo apt-get install ros-melodic-rqt-multiplot`);
 * Bag – работа с [Bag-файлами](http://wiki.ros.org/rosbag).

docs/ru/sitl.md

@@ -77,22 +77,22 @@ roslaunch mavros px4.launch fcu_url:=udp://@127.0.0.1:14557
 
 Для того, чтобы запустить симулятор полета дрона, Gazebo или jMAVSim вам потребуется сделать соответственные настройки вашей среды.
 
-> **Caution** Среда `ROS Kinetic` в изначально ориентированна для `Ubuntu (Xenial)` версии 16.04, по этому актуальность данной инструкции гарантируется только для соответственной версии операционной системы.
+> **Caution** Среда `ROS Melodic` изначально ориентированна для Ubuntu версии 18.04 (Bionic), поэтому актуальность данной инструкции гарантируется только для данной версии операционной системы.
 
-В первую очередь вам потребуется установить полный пакет ROS Kinetic desktop-full, инструкцию по установке вы можете найти в [статье по установке ROS](ros-install.md).
+В первую очередь вам потребуется установить полный пакет ROS Melodic desktop-full, инструкцию по установке вы можете найти в [статье по установке ROS](ros-install.md).
 
 После того, как вы выполнили указанные выше инструкции, вам нужно проверить, есть ли в вашем пакете `ROS` все нужные пакеты.
 
 ```bash
-sudo apt-get install ros-kinetic-gazebo-ros \
-					 ros-kinetic-gazebo-dev \
-					 ros-kinetic-gazebo-plugins \
-					 ros-kinetic-gazebo-ros-pkgs \
-					 ros-kinetic-gazebo-msgs \
-					 ros-kinetic-geographic-msgs
+sudo apt-get install ros-melodic-gazebo-ros \
+					 ros-melodic-gazebo-dev \
+					 ros-melodic-gazebo-plugins \
+					 ros-melodic-gazebo-ros-pkgs \
+					 ros-melodic-gazebo-msgs \
+					 ros-melodic-geographic-msgs
 ```
 
-Чтобы избежать ошибок во время запуска симулятора, вам нужно будет установить Gazebo v7.14, для этого подключите необходимый репозиторий и добавьте соответствующие ключи:
+Чтобы избежать ошибок во время запуска симулятора, вам нужно будет установить Gazebo v9.11, для этого подключите необходимый репозиторий и добавьте соответствующие ключи:
 
 ```bash
 sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'

docs/ru/web_video_server.md

@@ -36,7 +36,7 @@ http://192.168.11.1:8080/stream_viewer?topic=/main_camera/image_raw&type=mjpeg&q
 
 ## Просмотр через rqt_image_view
 
-Для просмотра изображений через инструменты rqt необходим компьютер с установленной Ubuntu 16.04 и [ROS Kinetic](http://wiki.ros.org/kinetic/Installation/Ubuntu).
+Для просмотра изображений через инструменты rqt необходим компьютер с установленной Ubuntu 18.04 и [ROS Melodic](http://wiki.ros.org/melodic/Installation/Ubuntu).
 
 [Подключитесь к Wi-Fi сети Клевера](wifi.md) и запустите `rqt_image_view` с указанием его IP-адреса: