Merge branch 'master' into melodic-devel

2026-06-07 10:04:33 +00:00 · 2021-05-12 10:20:24 -07:00
parent a2c3b77c62 cdd6000c58
commit 03b87ee336
27 changed files with 4327 additions and 36 deletions
--- a/aruco_pose/CMakeLists.txt
+++ b/aruco_pose/CMakeLists.txt
@@ -111,7 +111,7 @@ generate_messages(

 ## Generate dynamic reconfigure parameters in the 'cfg' folder
 generate_dynamic_reconfigure_options(
-  cfg/DetectorParams.cfg
+  cfg/Detector.cfg
 )

 ###################################
--- a/aruco_pose/cfg/DetectorParams.cfg
+++ b/aruco_pose/cfg/DetectorParams.cfg