Skip to content

Commit 0209dee

Browse files
yconstclaude
andcommitted
Merge infrastructure improvements from diffbot_spec
- Add complete Docker dependency list (xacro, robot-state-publisher, etc) - Fix launch files: remove incorrect PathJoinSubstitution wrapper around FindExecutable - Add velocity limits to my_robot config for safety (max 0.5 m/s linear, 1.0 rad/s angular) - Update docker_run.sh to handle both 'docker compose' and 'docker-compose' commands Protocol-specific changes remain on diffbot_spec branch only. Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 1e72a0b commit 0209dee

5 files changed

Lines changed: 26 additions & 3 deletions

File tree

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@ docker exec -it tinymovr_ros2 bash
123123

124124
# Inside container: Install dependencies
125125
apt update && apt install -y \
126+
python3-pip \
127+
python3-colcon-common-extensions \
128+
iproute2 \
129+
ros-humble-ament-package \
130+
ros-humble-rosidl-typesupport-c \
131+
ros-humble-rosidl-typesupport-cpp \
132+
ros-humble-rosidl-default-generators \
126133
ros-humble-ros2-control \
127134
ros-humble-ros2-controllers \
128135
ros-humble-xacro \

config/my_robot_config.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,19 @@ diff_drive_controller:
4242
use_stamped_vel: false
4343
velocity_rolling_window_size: 10
4444
position_feedback: false
45+
46+
# Velocity limits (SAFETY)
47+
linear:
48+
x:
49+
has_velocity_limits: true
50+
max_velocity: 0.5 # m/s - adjust based on your robot
51+
min_velocity: -0.5
52+
has_acceleration_limits: true
53+
max_acceleration: 1.0 # m/s^2
54+
min_acceleration: -1.0
55+
angular:
56+
z:
57+
has_velocity_limits: true
58+
max_velocity: 1.0 # rad/s - adjust based on your robot
59+
has_acceleration_limits: true
60+
max_acceleration: 2.0 # rad/s^2

docker_run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ echo "Container started. To enter the container:"
3232
echo " docker exec -it tinymovr_ros2 bash"
3333
echo ""
3434
echo "Once inside, build and run your robot:"
35-
echo " apt update && apt install -y ros-humble-ros2-control ros-humble-ros2-controllers ros-humble-xacro ros-humble-robot-state-publisher ros-humble-teleop-twist-keyboard"
35+
echo " apt update && apt install -y python3-pip python3-colcon-common-extensions iproute2 ros-humble-ament-package ros-humble-rosidl-typesupport-c ros-humble-rosidl-typesupport-cpp ros-humble-rosidl-default-generators ros-humble-ros2-control ros-humble-ros2-controllers ros-humble-xacro ros-humble-robot-state-publisher ros-humble-teleop-twist-keyboard"
3636
echo " cd /workspace"
3737
echo " source /opt/ros/humble/setup.bash"
3838
echo " colcon build --packages-select tinymovr_ros"

launch/my_robot.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def generate_launch_description():
2323
# Get URDF via xacro - using MY_ROBOT configuration
2424
robot_description_content = Command(
2525
[
26-
PathJoinSubstitution([FindExecutable(name="xacro")]),
26+
FindExecutable(name="xacro"),
2727
" ",
2828
PathJoinSubstitution(
2929
[FindPackageShare("tinymovr_ros"), "urdf", "my_robot.urdf.xacro"]

launch/tinymovr_diffbot_demo.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def generate_launch_description():
2323
# Get URDF via xacro
2424
robot_description_content = Command(
2525
[
26-
PathJoinSubstitution([FindExecutable(name="xacro")]),
26+
FindExecutable(name="xacro"),
2727
" ",
2828
PathJoinSubstitution(
2929
[FindPackageShare("tinymovr_ros"), "urdf", "tinymovr_diffbot.urdf.xacro"]

0 commit comments

Comments
 (0)