Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,10 @@ SerestController::update_rt(NavState & nav_state)
if (nav_state.has("goal_tolerance.yaw")) {
goal_yaw_tol = nav_state.get<double>("goal_tolerance.yaw");
}
// Propagate the resolved tolerances to the members consumed by compute_goal_zone()
// and maybe_final_align_and_publish(), so a GoalManager override actually takes effect.
goal_pos_tol_ = goal_pos_tol;
goal_yaw_tol_deg_ = goal_yaw_tol * (180.0 / M_PI);

// 2) Robot state (position + yaw)
Vec2 robot_xy; double yaw = 0.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ AMCLLocalizer::on_initialize()
auto node = get_node();
const auto & plugin_name = get_plugin_name();

int num_particles;
int num_particles = 100;
double x_init, y_init, yaw_init, std_dev_xy, std_dev_yaw;

node->declare_parameter<int>(plugin_name + ".num_particles", 100);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@ class FusionLocalizerInitialPoseTest : public ::testing::Test

TEST_F(FusionLocalizerInitialPoseTest, SubscribesToInitialPoseWithDefaultCallbackGroup)
{
const double x0 = 1.5;
const double y0 = -0.25;
const double yaw0 = 0.7;

const double x1 = -0.8;
const double y1 = 2.1;
const double yaw1 = -1.2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ AMCLLocalizer::on_initialize()
auto node = get_node();
const auto & plugin_name = get_plugin_name();

int num_particles;
int num_particles = 100;
double x_init, y_init, yaw_init, std_dev_xy, std_dev_yaw;

node->declare_parameter<int>(plugin_name + ".num_particles", 100);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,8 @@ InflationFilter::update(NavState & nav_state)

updateCosts(dynamic_map, min_i, min_j, max_i, max_j);

for (int i = 0; i < dynamic_map.getSizeInCellsX(); i++) {
for (int j = 0; j < dynamic_map.getSizeInCellsY(); j++) {
int index = static_cast<int>(dynamic_map.getIndex(i, j));
for (int i = 0; i < size_x; i++) {
for (int j = 0; j < size_y; j++) {
unsigned char cost = std::max(
dynamic_map.getCost(i, j), base_inflated_.getCost(i, j));
dynamic_map.setCost(i, j, cost);
Expand Down