From 9e2b0344379c9995490b1e9c3c7ca6a5d39ff89b Mon Sep 17 00:00:00 2001 From: Vivek Date: Wed, 5 Feb 2025 08:47:27 -0500 Subject: [PATCH] Fixes to readme and repo. url fixes. --- README.md | 4 +- packages_https.rosinstall | 4 - packages_https_robot.rosinstall | 5 +- packages_ssh.rosinstall | 78 ------------------- .../include/planner_common/graph_manager.h | 2 +- smb_path_tracker/CATKIN_IGNORE | 0 smb_teleop_twist_joy/CATKIN_IGNORE | 0 7 files changed, 5 insertions(+), 88 deletions(-) delete mode 100644 packages_ssh.rosinstall create mode 100644 smb_path_tracker/CATKIN_IGNORE create mode 100644 smb_teleop_twist_joy/CATKIN_IGNORE diff --git a/README.md b/README.md index 27eb825..23203e2 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,11 @@ Clone and update the required packages: ```bash cd wstool init -wstool merge ./src/exploration/mggplanner/packages_https.rosinstall +wstool merge ./src/exploration/MGGPlanner/packages_https.rosinstall wstool update ``` -`Note: ./src/exploration/mggplanner_ros/packages_https.rosinstall can be used for https based urls.` +`Note: ./src/exploration/MGGPlanner/packages_https.rosinstall is for https urls.` Build: ```bash diff --git a/packages_https.rosinstall b/packages_https.rosinstall index 52ff8cb..f8a428e 100644 --- a/packages_https.rosinstall +++ b/packages_https.rosinstall @@ -47,10 +47,6 @@ version: dev/noetic #EXPLORATION -- git: - local-name: src/exploration/mggplanner/ - uri: http://git.mistlab.ca/vvaradharajan/gbplanner2.git - version: mggplanner - git: local-name: src/exploration/pci_general/ uri: https://github.com/ntnu-arl/pci_general.git diff --git a/packages_https_robot.rosinstall b/packages_https_robot.rosinstall index 48bb7be..53d0ba6 100644 --- a/packages_https_robot.rosinstall +++ b/packages_https_robot.rosinstall @@ -48,9 +48,8 @@ #EXPLORATION - git: - local-name: src/exploration/gbplanner2/ - uri: http://git.mistlab.ca/vvaradharajan/gbplanner2.git - version: gbplanner2 + local-name: src/exploration/MGGPlanner/ + uri: https://github.com/MISTLab/MGGPlanner.git - git: local-name: src/exploration/pci_general/ uri: https://github.com/ntnu-arl/pci_general.git diff --git a/packages_ssh.rosinstall b/packages_ssh.rosinstall deleted file mode 100644 index a1b045d..0000000 --- a/packages_ssh.rosinstall +++ /dev/null @@ -1,78 +0,0 @@ -#MISC -- git: - local-name: src/misc/catkin_simple/ - uri: git@github.com:catkin/catkin_simple.git - version: 0e62848b12da76c8cc58a1add42b4f894d1ac21e -- git: - local-name: src/misc/eigen_catkin/ - uri: git@github.com:ethz-asl/eigen_catkin.git - version: 00b5eb254bad8de9cd68d238aa994e443062cf30 -- git: - local-name: src/misc/eigen_checks/ - uri: git@github.com:ethz-asl/eigen_checks.git - version: 22a6247a3df11bc285d43d1a030f4e874a413997 -- git: - local-name: src/misc/gflags_catkin/ - uri: git@github.com:ethz-asl/gflags_catkin.git - version: 5324e74119996a6e2da12d20e5388c17480ebd79 -- git: - local-name: src/misc/glog_catkin/ - uri: git@github.com:ethz-asl/glog_catkin.git - version: dcb4559be6b9f9248c543df6789d46271c13efcf -- git: - local-name: src/misc/minkindr/ - uri: git@github.com:ethz-asl/minkindr.git - version: bc4503c34970a13b7ef06f62505e3333395ce02c -- git: - local-name: src/misc/minkindr_ros/ - uri: git@github.com:ethz-asl/minkindr_ros.git - version: 88e0bd476f82027453f04fdf7c40c7c9a358aa1b -- git: - local-name: src/misc/mav_comm/ - uri: git@github.com:ethz-asl/mav_comm.git - version: master -- git: - local-name: src/misc/yaml_cpp_catkin/ - uri: git@github.com:ethz-asl/yaml_cpp_catkin.git - version: master -- git: - local-name: src/misc/protobuf_catkin/ - uri: git@github.com:ethz-asl/protobuf_catkin.git - version: master - -# MAPPING -- git: - local-name: src/mapping/voxblox/ - uri: git@github.com:ntnu-arl/voxblox.git - version: dev/noetic - -#EXPLORATION -- git: - local-name: src/exploration/gbplanner_ros/ - uri: git@github.com:ntnu-arl/gbplanner_ros.git - version: gbplanner2 -- git: - local-name: src/exploration/pci_general/ - uri: git@github.com:ntnu-arl/pci_general.git - version: main -- git: - local-name: src/exploration/adaptive_obb_ros/ - uri: git@github.com:ntnu-arl/adaptive_obb_ros.git - -# sim -- git: - local-name: src/sim/rotors_simulator/ - uri: git@github.com:ntnu-arl/rotors_simulator.git - version: dev/rmf_obelix -- git: - local-name: src/sim/lidar_simulator/ - uri: git@github.com:ntnu-arl/lidar_simulator.git - version: psuedo_bpearl -- git: - local-name: src/sim/smb_simulator/ - uri: git@github.com:ntnu-arl/smb_simulator.git -- git: - local-name: src/sim/subt_cave_sim/ - uri: git@github.com:ntnu-arl/subt_cave_sim.git - version: master - diff --git a/planner_common/include/planner_common/graph_manager.h b/planner_common/include/planner_common/graph_manager.h index 71ca862..340166b 100644 --- a/planner_common/include/planner_common/graph_manager.h +++ b/planner_common/include/planner_common/graph_manager.h @@ -74,7 +74,7 @@ class GraphManager { Vertex** v_res); bool getNearestVertices(const StateVec* state, double range, std::vector* v_res); - bool GraphManager::updatePoseIdToNearestVertices(const StateVec* state, + bool updatePoseIdToNearestVertices(const StateVec* state, double range, int pose_id); bool existVertexInRange(const StateVec* state, double range); diff --git a/smb_path_tracker/CATKIN_IGNORE b/smb_path_tracker/CATKIN_IGNORE new file mode 100644 index 0000000..e69de29 diff --git a/smb_teleop_twist_joy/CATKIN_IGNORE b/smb_teleop_twist_joy/CATKIN_IGNORE new file mode 100644 index 0000000..e69de29