Merge branch 'master' of github.com:introlab/rtabmap_ros into ros2

.github/workflows/docker.yml

@@ -4,9 +4,13 @@ on:
   push:
     branches:
       - 'master'
+  workflow_dispatch:
 
 jobs:
   docker:
+    # Built and pushed only from master (push or manual dispatch), since it
+    # pushes the introlab3it/rtabmap_ros tags to Docker Hub.
+    if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     
     strategy:

rtabmap_conversions/CMakeLists.txt

@@ -30,7 +30,7 @@ find_package(tf2_eigen REQUIRED)
 find_package(tf2_geometry_msgs REQUIRED)
 find_package(tf2_ros REQUIRED)
 
-find_package(RTABMap 0.23.5 REQUIRED)
+find_package(RTABMap 0.23.10 REQUIRED)
 
 # libraries
 SET(Libraries

rtabmap_odom/src/RGBDOdometryNode.cpp

@@ -71,7 +71,9 @@ int main(int argc, char **argv)
 	}
 
 #ifdef RTABMAP_PYTHON
-	rtabmap::PythonInterface pythonInterface;
+	// Initialize the embedded python interpreter on the main thread, as
+	// the nodelet below is loaded in a worker thread.
+	rtabmap::PythonInterface::instance("rgbd_odometry");
 #endif
 	rclcpp::init(argc, argv);
 	rclcpp::NodeOptions options;

rtabmap_odom/src/StereoOdometryNode.cpp

@@ -71,7 +71,9 @@ int main(int argc, char **argv)
 	}
 
 #ifdef RTABMAP_PYTHON
-	rtabmap::PythonInterface pythonInterface;
+	// Initialize the embedded python interpreter on the main thread, as
+	// the nodelet below is loaded in a worker thread.
+	rtabmap::PythonInterface::instance("stereo_odometry");
 #endif
 	rclcpp::init(argc, argv);
 	rclcpp::NodeOptions options;

rtabmap_slam/src/CoreNode.cpp

@@ -29,6 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "rclcpp/rclcpp.hpp"
 #include <rtabmap/utilite/UStl.h>
 #include <rtabmap/utilite/UDirectory.h>
+#include <rtabmap/core/Version.h>
+#ifdef RTABMAP_PYTHON
+#include <rtabmap/core/PythonInterface.h>
+#endif
 
 int main(int argc, char** argv)
 {
@@ -81,6 +85,12 @@ int main(int argc, char** argv)
 		arguments.push_back(argv[i]);
 	}
 
+#ifdef RTABMAP_PYTHON
+	// Initialize the embedded python interpreter on the main thread, as
+	// the nodelet below is loaded in a worker thread.
+	rtabmap::PythonInterface::instance("rtabmap");
+#endif	
+
 	rclcpp::init(argc, argv);
 	rclcpp::NodeOptions options;
 	options.arguments(arguments);

rtabmap_slam/src/CoreWrapper.cpp

@@ -3742,10 +3742,10 @@ void CoreWrapper::globalBundleAdjustmentCallback(
 	UTimer timer;
 	int optimizer = (int)Optimizer::kTypeG2O; // g2o
 	int iterations = Parameters::defaultOptimizerIterations();
-	float pixelVariance = Parameters::defaultg2oPixelVariance();
+	float pixelVariance = Parameters::defaultOptimizerPixelVariance();
 	bool rematchFeatures = true;
 	Parameters::parse(parameters_, Parameters::kOptimizerIterations(), iterations);
-	Parameters::parse(parameters_, Parameters::kg2oPixelVariance(), pixelVariance);
+	Parameters::parse(parameters_, Parameters::kOptimizerPixelVariance(), pixelVariance);
 	if(req->type == 1.0f)
 	{
 		optimizer = (int)Optimizer::kTypeCVSBA;