diff --git a/install/setup.bash b/install/setup.bash index da36e7c200..4e927c619c 100644 --- a/install/setup.bash +++ b/install/setup.bash @@ -17,15 +17,10 @@ _colcon_prefix_chain_bash_source_script() { fi } -# source chained prefixes -# setting COLCON_CURRENT_PREFIX avoids determining the prefix in the sourced script -COLCON_CURRENT_PREFIX="/opt/ros/humble" -_colcon_prefix_chain_bash_source_script "$COLCON_CURRENT_PREFIX/local_setup.bash" - # source this prefix # setting COLCON_CURRENT_PREFIX avoids determining the prefix in the sourced script COLCON_CURRENT_PREFIX="$(builtin cd "`dirname "${BASH_SOURCE[0]}"`" > /dev/null && pwd)" _colcon_prefix_chain_bash_source_script "$COLCON_CURRENT_PREFIX/local_setup.bash" unset COLCON_CURRENT_PREFIX -unset _colcon_prefix_chain_bash_source_script \ No newline at end of file +unset _colcon_prefix_chain_bash_source_script diff --git a/install/setup.zsh b/install/setup.zsh index a1ba46044b..2901efe685 100644 --- a/install/setup.zsh +++ b/install/setup.zsh @@ -17,15 +17,10 @@ _colcon_prefix_chain_zsh_source_script() { fi } -# source chained prefixes -# setting COLCON_CURRENT_PREFIX avoids determining the prefix in the sourced script -COLCON_CURRENT_PREFIX="/opt/ros/humble" -_colcon_prefix_chain_zsh_source_script "$COLCON_CURRENT_PREFIX/local_setup.zsh" - # source this prefix # setting COLCON_CURRENT_PREFIX avoids determining the prefix in the sourced script COLCON_CURRENT_PREFIX="$(builtin cd -q "`dirname "${(%):-%N}"`" > /dev/null && pwd)" _colcon_prefix_chain_zsh_source_script "$COLCON_CURRENT_PREFIX/local_setup.zsh" unset COLCON_CURRENT_PREFIX -unset _colcon_prefix_chain_zsh_source_script \ No newline at end of file +unset _colcon_prefix_chain_zsh_source_script diff --git a/src/rj_strategy/src/agent/position/waller.cpp b/src/rj_strategy/src/agent/position/waller.cpp index 76f364a346..44e618cbb1 100644 --- a/src/rj_strategy/src/agent/position/waller.cpp +++ b/src/rj_strategy/src/agent/position/waller.cpp @@ -36,6 +36,7 @@ std::optional Waller::get_task(RobotIntent intent, const WorldState rj_geometry::Point mid_point{(goal_pos) + (ball_dir_vector * min_wall_rad)}; auto wall_spacing = kRobotDiameterMultiplier * kRobotDiameter + kBallRadius; + wall_spacing *= 2; rj_geometry::Point target_point{}; auto angle = (mid_point - goal_pos).angle();