Skip to content

Commit

Permalink
Undo changes
Browse files Browse the repository at this point in the history
Signed-off-by: Yadunund <yadunund@openrobotics.org>
  • Loading branch information
Yadunund committed Aug 1, 2022
1 parent 6c221b4 commit 2e51e13
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
2 changes: 2 additions & 0 deletions rmf_fleet_adapter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ target_include_directories(rmf_fleet_adapter
${rmf_dispenser_msgs_INCLUDE_DIRS}
${rmf_ingestor_msgs_INCLUDE_DIRS}
${rmf_api_msgs_INCLUDE_DIRS}
${rmf_websocket_INCLUDE_DIR}
${rmf_traffic_ros2_INCLUDE_DIRS}
${rmf_building_map_msgs_INCLUDE_DIRS}
${nlohmann_json_schema_validator_INCLUDE_DIRS}
)
Expand Down
11 changes: 1 addition & 10 deletions rmf_traffic_ros2/src/rmf_traffic_ros2/convert_Graph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
#include <proj.h>
#include <nlohmann/json.hpp>

#include <rclcpp/rclcpp.hpp>

#include <rmf_traffic_ros2/agv/Graph.hpp>

#include <rmf_building_map_msgs/msg/graph_node.hpp>
Expand All @@ -35,13 +33,6 @@

namespace rmf_traffic_ros2 {

namespace {

static const rclcpp::Logger LOGGER =
rclcpp::get_logger("rmf_traffic_ros2::ConvertGraph");

} // anonymous namespace

// Usage map[level_idx][truncated_x][truncated_y] = id;
// Truncation is to 1e-3 meters by default
using CoordsIdxHashMap = std::unordered_map<std::size_t, std::unordered_map<
Expand Down Expand Up @@ -340,7 +331,7 @@ rmf_traffic::agv::Graph json_to_graph(
}

// dock_name is only applied to the lane going to the waypoint, not exiting
const rmf_traffic::Duration duration = std::chrono::nanoseconds(5);
const rmf_traffic::Duration duration = std::chrono::seconds(5);
if (dock_name.has_value())
entry_event = Event::make(Lane::Dock(dock_name.value(), duration));
auto& lane = graph.add_lane({start_wp, entry_event},
Expand Down

0 comments on commit 2e51e13

Please sign in to comment.