Skip to content

Commit 01a1e0a

Browse files
XuRoboticsclaude
andcommitted
cleanup: sweep ROS1 leftovers missed by the per-package subagents
A comprehensive grep audit after the first port pass turned up files and lines that the per-package subagents didn't touch because they were outside each subagent's declared scope. This commit sweeps them all up in one cleanup pass. Shell scripts inside docker/ directories that were NOT run.sh: - autonomy_core/{base,client,control,estimation,interface,map_plan, state_machine}/docker/entrypoint.sh (7 files) source /opt/ros/noetic/setup.bash -> source /opt/ros/jazzy/setup.bash. - autonomy_core/client/docker/deploy.sh + deploy2.sh --name client -> --name client_ros2; image kumarrobotics/autonomy: client -> client-jazzy; roslaunch client_launch client.launch -> ros2 launch client_launch client.launch.py. Other shell scripts the sim subagent missed: - autonomy_sim/unity_sim/dcist_utils/script/unity_sim.sh Full tmux orchestration rewrite: roslaunch -> ros2 launch, rosrun rosflight_offboard.py __ns:=X -> ros2 run arl_unity_ros_air rosflight_offboard --ros-args -r __ns:=X, roscore -> echo stub. - autonomy_sim/unity_sim/dcist_utils/script/takeoff.bash rosrun -> ros2 run; commented rosservice call lines updated to ros2 service call form with explicit std_srvs/Trigger + std_srvs/SetBool types. tf2 .h -> .hpp header renames (ROS2 Jazzy renamed tf2_ros headers): - autonomy_core/map_plan/mapper/src/tf_listener.cpp: tf2/exceptions.h - autonomy_core/map_plan/mapper/include/mapper/tf_listener.h: tf2_ros/buffer.h, tf2_ros/transform_listener.h - autonomy_core/estimation/fla_ukf/src/fla_ukf_nodelet.cpp: tf2_ros/buffer.h, tf2_ros/transform_broadcaster.h, tf2_ros/transform_listener.h - autonomy_core/state_machine/state_machine_core/include/state_machine/ local_global_replan_server.hpp: tf2_ros/buffer.h, tf2_ros/transform_listener.h - autonomy_sim/unity_sim/dcist_utils/src/odom2tf.cpp: tf2_ros/{buffer,static_transform_broadcaster,transform_broadcaster, transform_listener}.h - autonomy_sim/unity_sim/dcist_utils/src/msckf_calib_gen.cpp: tf2_ros/{buffer,transform_listener}.h - autonomy_sim/unity_sim/fake_lidar/src/fake_lidar_node.cpp + node2.cpp: tf2_ros/{buffer,transform_listener}.h Dead dynamic_reconfigure artifact: - autonomy_core/map_plan/action_planner/cfg/ActionPlanner.cfg deleted. ROS2 has no drop-in dynamic_reconfigure replacement (use parameter callbacks). Subagent D's earlier commit already removed the `#include <action_planner/ActionPlannerConfig.h>` reference from every source file that used it; the .cfg was orphaned dead code. Package-level README drift: - autonomy_core/map_plan/action_planner/README.md: update "roslaunch planner_standalone.launch" -> "ros2 launch planner_standalone.launch.py", "rosrun action_planner publish_plantwopointaction.py" -> "ros2 run action_planner publish_plantwopointaction.py", "rviz" -> "rviz2", and the wiki.ros.org/actionlib link -> the ROS2 Jazzy action server tutorial. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 68c02f4 commit 01a1e0a

15 files changed

Lines changed: 35 additions & 78 deletions

File tree

autonomy_core/base/docker/entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ set -e
33

44
# setup ros environment
55
echo "Setting up ros"
6-
echo "source /opt/ros/noetic/setup.bash" >> /$HOME/.bashrc
6+
echo "source /opt/ros/jazzy/setup.bash" >> /$HOME/.bashrc
77
source /$HOME/.bashrc
88

9-
source /opt/ros/noetic/setup.bash
9+
source /opt/ros/jazzy/setup.bash
1010

1111
if [ "$#" -eq 0 ]; then
1212
exec bash

autonomy_core/client/docker/deploy.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ docker run --gpus all -it \
2525
--rm \
2626
--privileged \
2727
--network=host \
28-
--name client \
29-
kumarrobotics/autonomy:client \
30-
roslaunch client_launch client.launch
28+
--name client_ros2 \
29+
kumarrobotics/autonomy:client-jazzy \
30+
ros2 launch client_launch client.launch.py

autonomy_core/client/docker/deploy2.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ docker run --gpus all -it \
99
--rm \
1010
--privileged \
1111
--network=host \
12-
--name client \
13-
kumarrobotics/autonomy:client \
14-
roslaunch client_launch client.launch
12+
--name client_ros2 \
13+
kumarrobotics/autonomy:client-jazzy \
14+
ros2 launch client_launch client.launch.py

autonomy_core/estimation/fla_ukf/src/fla_ukf_nodelet.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include <tf2/utils.hpp>
1515
#include <tf2_eigen/tf2_eigen.hpp>
1616
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
17-
#include <tf2_ros/buffer.h>
18-
#include <tf2_ros/transform_broadcaster.h>
19-
#include <tf2_ros/transform_listener.h>
17+
#include <tf2_ros/buffer.hpp>
18+
#include <tf2_ros/transform_broadcaster.hpp>
19+
#include <tf2_ros/transform_listener.hpp>
2020

2121
#include <Eigen/Geometry>
2222
#include <algorithm>

autonomy_core/map_plan/action_planner/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[Laura](mailto:laurajar@seas.upenn.edu)
55

66
## Overview
7-
This package bring together different planners into one place and launches a [action server](http://wiki.ros.org/actionlib) for motion planning.
7+
This package brings together different planners into one place and launches a [ROS2 action server](https://docs.ros.org/en/jazzy/Tutorials/Intermediate/Writing-an-Action-Server-Client/Cpp.html) for motion planning.
88

99
## Slides
1010
Add a link to the slides here
@@ -13,7 +13,7 @@ Add a link to the slides here
1313
See the kr_autonomous_flight for installation instructions, some of the dependencies are from Laura's fork
1414

1515
## Running
16-
`autonomy_core/map_plan/map_plan_launch/launch/planner_standalone.launch` launches the planner by itself. It will launch the action server and a rviz node for visualization. Additionally `rosrun action_planner publish_plantwopointaction.py` can be used to publish a start and goal to the action server.
16+
`autonomy_core/map_plan/map_plan_launch/launch/planner_standalone.launch.py` launches the planner by itself. It will launch the action server and an rviz2 node for visualization. Additionally `ros2 run action_planner publish_plantwopointaction.py` can be used to publish a start and goal to the action server.
1717

1818
JPS and GCOPTER running togeher can crash.
1919

autonomy_core/map_plan/action_planner/cfg/ActionPlanner.cfg

Lines changed: 0 additions & 43 deletions
This file was deleted.

autonomy_core/map_plan/mapper/include/mapper/tf_listener.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include <geometry_msgs/msg/pose.hpp>
44
#include <rclcpp/rclcpp.hpp>
5-
#include <tf2_ros/buffer.h>
6-
#include <tf2_ros/transform_listener.h>
5+
#include <tf2_ros/buffer.hpp>
6+
#include <tf2_ros/transform_listener.hpp>
77

88
#include <memory>
99
#include <optional>

autonomy_core/map_plan/mapper/src/tf_listener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "mapper/tf_listener.h"
22

33
#include <geometry_msgs/msg/transform_stamped.hpp>
4-
#include <tf2/exceptions.h>
4+
#include <tf2/exceptions.hpp>
55

66
namespace mapper {
77

autonomy_core/state_machine/state_machine_core/include/state_machine/local_global_replan_server.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <std_msgs/msg/int64.hpp>
1919
#include <tf2/utils.hpp>
2020
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
21-
#include <tf2_ros/buffer.h>
22-
#include <tf2_ros/transform_listener.h>
21+
#include <tf2_ros/buffer.hpp>
22+
#include <tf2_ros/transform_listener.hpp>
2323

2424
#include "std_msgs/msg/string.hpp"
2525

autonomy_sim/unity_sim/dcist_utils/script/takeoff.bash

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ fi
88
echo "robot name ${ROBOT}"
99

1010
# echo "Enable motors..."
11-
# rosservice call /$ROBOT/mav_services/motors true
11+
# ros2 service call /$ROBOT/mav_services/motors std_srvs/srv/SetBool "{data: true}"
1212
# sleep 1
1313

1414
# echo "Takeoff..."
15-
# rosservice call /$ROBOT/mav_services/takeoff
15+
# ros2 service call /$ROBOT/mav_services/takeoff std_srvs/srv/Trigger "{}"
1616
# sleep 1
1717

18-
rosrun arl_unity_ros_air rosflight_offboard.py __ns:=${ROBOT}
18+
ros2 run arl_unity_ros_air rosflight_offboard --ros-args -r __ns:=${ROBOT}
1919

2020
# read -p "Press [Enter] to go to [1, 1, 1]"
21-
# rosservice call /$ROBOT/mav_services/goTo "goal: [1.0, 1.0, 1.0, 0.0]"
21+
# ros2 service call /$ROBOT/mav_services/goTo kr_mav_msgs/srv/Vec4 "{goal: [1.0, 1.0, 1.0, 0.0]}"
2222
# sleep 1

0 commit comments

Comments
 (0)