Merge branch 'main' into fix_task_start

open-rmf · Feb 24, 2025 · 83077b4 · 83077b4
2 parents 0e5380a + 0eb5bee
commit 83077b4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rmf_fleet_adapter/src/rmf_fleet_adapter/agv/EasyFullControl.cpp b/rmf_fleet_adapter/src/rmf_fleet_adapter/agv/EasyFullControl.cpp
@@ -1085,7 +1085,7 @@ void EasyCommandHandle::follow_new_path(
             {
               const double dist =
                 (*l.location() - wp.position().block<2, 1>(0, 0)).norm();
-              if (dist <= nav_params->max_merge_waypoint_distance)
+              if (dist <= nav_params->max_merge_lane_distance)
               {
                 found_connection = true;
                 i0 = 0;