Skip to content

Commit 8f30bd4

Browse files
committed
refactor(husky_ws): Rename ros2_ws to husky_driver_ws for clarity
1 parent e9c2a97 commit 8f30bd4

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

husky_ws/docker/.bashrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if [ ! -f $ROS2_WS/install/setup.bash ]; then
2727
fi
2828
# TODO: Source other workspace environments as underlay
2929
# Source Clearpath robot environment
30-
source ~/ros2_ws/install/local_setup.bash
30+
source ~/husky_driver_ws/install/local_setup.bash
3131
# Source Clearpath default environment installed by `clearpath_computer_installer.sh`
3232
source /etc/clearpath/setup.bash
3333
# Source workspace environment

husky_ws/docker/script/install-clearpath-robot.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ sudo bash -c 'echo "deb https://packages.clearpathrobotics.com/stable/ubuntu $(l
77
sudo apt-get update
88

99
# Create custom global workspace
10-
mkdir -p ~/ros2_ws/src
11-
cd ~/ros2_ws/src
10+
mkdir -p ~/husky_driver_ws/src
11+
cd ~/husky_driver_ws/src
1212
# `clearpath_computer_installer.sh` requires `ros-humble-clearpath-robot`.
1313
# Install from source since package doesn't exist on arm64, error message:
1414
#
@@ -24,31 +24,31 @@ cd ..
2424
# Ref: https://github.com/clearpathrobotics/clearpath_robot/pull/19
2525
# Ref: https://github.com/clearpathrobotics/clearpath_robot/pull/22
2626
# I think this package isn't used anyway.
27-
sed -i 's/<exec_depend>micro_ros_agent<\/exec_depend>/<!-- <exec_depend>micro_ros_agent<\/exec_depend> -->/' ~/ros2_ws/src/clearpath_robot/clearpath_generator_robot/package.xml
27+
sed -i 's/<exec_depend>micro_ros_agent<\/exec_depend>/<!-- <exec_depend>micro_ros_agent<\/exec_depend> -->/' ~/husky_driver_ws/src/clearpath_robot/clearpath_generator_robot/package.xml
2828

2929
# Temporarily remove `sevcon_traction` dependency
3030
# Ref: https://github.com/clearpathrobotics/clearpath_robot/commit/2ef406f30c074e578db6ea799f5c2714bce1c15d
3131
# This package is only used for W200, so it isn't required for Husky.
3232
# Ref: https://github.com/clearpathrobotics/clearpath_robot/blob/40b1c40a7d229ede7a674cb0fb359fc83c754adb/clearpath_generator_robot/clearpath_generator_robot/launch/generator.py#L220
3333
# On the other hand, we don't have access to the source code anyway.
3434
# Ref: https://github.com/clearpathrobotics/public-rosdistro/blob/master/humble/distribution.yaml#L262-L279
35-
sed -i 's/<exec_depend>sevcon_traction<\/exec_depend>/<!-- <exec_depend>sevcon_traction<\/exec_depend> -->/' ~/ros2_ws/src/clearpath_robot/clearpath_generator_robot/package.xml
35+
sed -i 's/<exec_depend>sevcon_traction<\/exec_depend>/<!-- <exec_depend>sevcon_traction<\/exec_depend> -->/' ~/husky_driver_ws/src/clearpath_robot/clearpath_generator_robot/package.xml
3636

3737
# Temporarily remove `umx_driver` dependency
3838
# This package is only used for redshift and chrobotics, so it isn't required for our case.
3939
# Ref: https://github.com/clearpathrobotics/clearpath_robot/blob/40b1c40a7d229ede7a674cb0fb359fc83c754adb/clearpath_sensors/launch/redshift_um7.launch.py#L69
4040
# Ref: https://github.com/clearpathrobotics/clearpath_robot/blob/40b1c40a7d229ede7a674cb0fb359fc83c754adb/clearpath_sensors/launch/chrobotics_um6.launch.py#L69
41-
sed -i 's/<exec_depend>umx_driver<\/exec_depend>/<!-- <exec_depend>umx_driver<\/exec_depend> -->/' ~/ros2_ws/src/clearpath_robot/clearpath_sensors/package.xml
41+
sed -i 's/<exec_depend>umx_driver<\/exec_depend>/<!-- <exec_depend>umx_driver<\/exec_depend> -->/' ~/husky_driver_ws/src/clearpath_robot/clearpath_sensors/package.xml
4242

4343
# Temporarily remove `valence_bms_driver` dependency
4444
# Ref: https://github.com/clearpathrobotics/clearpath_robot/pull/47
4545
# This type of batteries are only used in W200, so they aren't required for Husky.
4646
# Ref: https://github.com/clearpathrobotics/clearpath_robot/blob/40b1c40a7d229ede7a674cb0fb359fc83c754adb/clearpath_generator_robot/clearpath_generator_robot/launch/generator.py#L152-L156
4747
# Ref: https://github.com/clearpathrobotics/clearpath_config/blob/996eb50d0b05c87b65b8ffddcddd33239abd422e/clearpath_config/platform/battery.py#L51-L54
48-
sed -i 's/<exec_depend>valence_bms_driver<\/exec_depend>/<!-- <exec_depend>valence_bms_driver<\/exec_depend> -->/' ~/ros2_ws/src/clearpath_robot/clearpath_generator_robot/package.xml
48+
sed -i 's/<exec_depend>valence_bms_driver<\/exec_depend>/<!-- <exec_depend>valence_bms_driver<\/exec_depend> -->/' ~/husky_driver_ws/src/clearpath_robot/clearpath_generator_robot/package.xml
4949

5050
# Continue building the workspace
51-
cd ~/ros2_ws
51+
cd ~/husky_driver_ws
5252
rosdep update
5353
rosdep install -i --from-path src --rosdistro humble -y
5454
colcon build

0 commit comments

Comments
 (0)