Skip to content

Commit a9b492b

Browse files
committed
Merge branch 'debug-drawer-expansion' of https://github.com/RoboJackets/robocup-software into debug-drawer-expansion
2 parents 0429365 + 88574e1 commit a9b492b

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

src/rj_strategy/src/agent/position/offense.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ Offense::Offense(Position&& other) : Position{std::move(other)}, seeker_{robot_i
1212
}
1313

1414
std::optional<RobotIntent> Offense::derived_get_task(RobotIntent intent) {
15-
16-
1715
// Get next state, and if different, reset clock
1816
State new_state = next_state();
1917

src/rj_strategy/src/agent/position/robot_factory_position.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ RobotFactoryPosition::RobotFactoryPosition(int r_id, rclcpp::Node::SharedPtr nod
88
client_handles_->marking = std::make_unique<MarkingClient>(node, r_id);
99
client_handles_->waller = std::make_unique<WallerClient>(node, r_id);
1010

11-
auto debug_draw_pub = node->create_publisher<rj_drawing_msgs::msg::DebugDraw>(
12-
viz::topics::kDebugDrawTopic, 10);
11+
auto debug_draw_pub =
12+
node->create_publisher<rj_drawing_msgs::msg::DebugDraw>(viz::topics::kDebugDrawTopic, 10);
1313
strategy_debug_drawer_ = std::make_shared<rj_drawing::RosDebugDrawer>(
1414
debug_draw_pub, fmt::format("strategy_{}", r_id));
1515

0 commit comments

Comments
 (0)