Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding new mission profile for row operation #182

Draft
wants to merge 32 commits into
base: humble-dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
246f35e
adding row operation action
GPrathap Feb 8, 2024
3ea7a15
updating qos values
GPrathap Feb 8, 2024
453890c
Merge pull request #1 from GPrathap/row_operation
GPrathap Feb 9, 2024
e821ef9
adding row operation mission profile
GPrathap Feb 9, 2024
2c0307e
Adding workaround for https://github.com/ros2/rclpy/issues/878
GPrathap Feb 10, 2024
d029a5a
Adding workaround for https://github.com/ros2/rclpy/issues/878
GPrathap Feb 11, 2024
c2ddc30
Merge pull request #2 from GPrathap/row_operation
GPrathap Feb 11, 2024
4e631d3
fixing next goal obtaining logic
GPrathap Feb 12, 2024
893b05c
if navigation is aborted terminated inrow navigation
GPrathap Feb 13, 2024
00c62e0
setting proper id for param processing node
GPrathap Feb 15, 2024
33f8e6e
adding inrow recovery behavior
GPrathap Feb 16, 2024
9292e62
fixing several bugs in row operations
GPrathap Feb 23, 2024
0c75e28
fixing several bugs in row operations
GPrathap Feb 23, 2024
3e85853
adding current robot status
GPrathap Mar 12, 2024
1418468
fixing issues with tf
GPrathap Mar 13, 2024
49c3015
Merge branch 'humble-dev' into humble-dev
Iranaphor Mar 28, 2024
f4b9ece
trying to fix ros spin issue
GPrathap Mar 29, 2024
5ca30e4
wrap edge action type
GPrathap Apr 7, 2024
59069ce
retrieving path for reverse route navigation
GPrathap Apr 9, 2024
f0ed2cb
enable reverse edge traversal
GPrathap Apr 9, 2024
f09a306
fixing typo
GPrathap Apr 22, 2024
8c7a104
publish current nav area
GPrathap Apr 23, 2024
07a4f96
adding pole poses finder
GPrathap Apr 24, 2024
db33d37
removing pole finder
GPrathap Apr 25, 2024
b97db4a
inrow preparation make it optional
GPrathap Jun 6, 2024
5de9a8e
extract boundary row edges
GPrathap Jun 13, 2024
d99fdd1
change type
GPrathap Jun 16, 2024
31cec2d
Add manual population node for topological navigation nodes [ROS2]
ibrahimhroob Jul 13, 2024
881f2a8
adding launch file
ibrahimhroob Jul 13, 2024
f59c07f
Merge pull request #3 from LCAS/poop_topo_nodes
GPrathap Jul 15, 2024
8b1c001
Update manual_topomapping.py with rotation
ibrahimhroob Jul 19, 2024
f457e62
Update manual_topomapping.py - bug fix
ibrahimhroob Jul 19, 2024
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
2 changes: 1 addition & 1 deletion topological_navigation/config/bt_tree_default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RecoveryNode number_of_retries="0" name="ComputePathThroughPoses">
<ReactiveSequence>
<RemovePassedGoals input_goals="{goals}" output_goals="{goals}" radius="1.5"/>
<ComputePathThroughPoses goals="{goals}" path="{path}" planner_id="GoalAligned"/>
<ComputePathThroughPoses goals="{goals}" path="{path}" planner_id="GridBased"/>
</ReactiveSequence>
<ReactiveFallback name="ComputePathThroughPosesRecoveryFallback">
<GoalUpdated/>
Expand Down
10 changes: 10 additions & 0 deletions topological_navigation/config/bt_tree_in_row_operation.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<root main_tree_to_execute="MainTree">
<BehaviorTree ID="MainTree">
<RecoveryNode number_of_retries="0" name="Harvesting">
<Wait wait_duration="5"/>
<ReactiveFallback name="ComputePathToPoseRecoveryFallback">
<ClearEntireCostmap name="ClearGlobalCostmap-Context" service_name="global_costmap/clear_entirely_global_costmap"/>
</ReactiveFallback>
</RecoveryNode>
</BehaviorTree>
</root>
10 changes: 10 additions & 0 deletions topological_navigation/config/bt_tree_in_row_recovery.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<root main_tree_to_execute="MainTree">
<BehaviorTree ID="MainTree">
<RecoveryNode number_of_retries="0" name="Harvesting">
<Wait wait_duration="5"/>
<ReactiveFallback name="ComputePathToPoseRecoveryFallback">
<ClearEntireCostmap name="ClearGlobalCostmap-Context" service_name="global_costmap/clear_entirely_global_costmap"/>
</ReactiveFallback>
</RecoveryNode>
</BehaviorTree>
</root>
15 changes: 15 additions & 0 deletions topological_navigation/config/template_edge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
action: move_base
action_type: move_base_msgs/MoveBaseGoal
config: []
edge_id: origin_destination
fail_policy: fail
fluid_navigation: True
goal:
target_pose:
header:
frame_id: $node.parent_frame
pose: $node.pose
node: destination
recovery_behaviours_config: ''
restrictions_planning: 'True'
restrictions_runtime: 'True'
41 changes: 41 additions & 0 deletions topological_navigation/config/template_node_2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
meta:
map: map_2d
node: NodeName
pointset: PointSet
node:
edges: []
localise_by_topic: ''
name: NodeName
parent_frame: map
pose:
orientation:
w: 1.0
x: 0.0
y: 0.0
z: 0.0
position:
x: 0.0
y: 0.0
z: 0.0
properties:
xy_goal_tolerance: 0.3
yaw_goal_tolerance: 6.29
restrictions_planning: 'True'
restrictions_runtime: 'True'
verts:
- x: 0.689999997616
y: 0.287000000477
- x: 0.287000000477
y: 0.490000009537
- x: -0.287000000477
y: 0.490000009537
- x: -0.689999997616
y: 0.287000000477
- x: -0.689999997616
y: -0.287000000477
- x: -0.287000000477
y: -0.490000009537
- x: 0.287000000477
y: -0.490000009537
- x: 0.689999997616
y: -0.287000000477
19,889 changes: 19,889 additions & 0 deletions topological_navigation/cyclonedds.log

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions topological_navigation/launch/manual_topomapping.launch.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
'''
Author: Ibrahim Hroob <ihroob@lincoln.ac.uk> 2024
'''
import os
from launch import LaunchDescription
from launch.actions import DeclareLaunchArgument
from launch.substitutions import LaunchConfiguration
from launch_ros.actions import Node

def generate_launch_description():
return LaunchDescription([
# Declare the launch arguments
DeclareLaunchArgument('tmap', default_value='test.yaml'),
DeclareLaunchArgument('tmap_dir', default_value='/home/ros/tmap'),
DeclareLaunchArgument('node_thresh', default_value='0.5'),
DeclareLaunchArgument('lock_btn', default_value='6'),
DeclareLaunchArgument('add_btn', default_value='1'),
DeclareLaunchArgument('remove_btn', default_value='2'),
DeclareLaunchArgument('gen_map_btn', default_value='3'),
DeclareLaunchArgument('topic_joy', default_value='/joy'),
DeclareLaunchArgument('topic_pose', default_value='/gps_base/odometry'),

# Launch the manual_topomapping node
Node(
package='topological_navigation',
executable='manual_topomapping.py',
name='manual_topomapping',
output='screen',
parameters=[{
'tmap' : LaunchConfiguration('tmap'),
'tmap_dir' : LaunchConfiguration('tmap_dir'),
'site_name' : LaunchConfiguration('tmap'),
'node_thresh': LaunchConfiguration('node_thresh'),
'lock_btn' : LaunchConfiguration('lock_btn'),
'add_btn' : LaunchConfiguration('add_btn'),
'remove_btn' : LaunchConfiguration('remove_btn'),
'gen_map_btn': LaunchConfiguration('gen_map_btn'),
'topic_joy' : LaunchConfiguration('topic_joy'),
'topic_pose' : LaunchConfiguration('topic_pose'),
}]
),
])
3 changes: 2 additions & 1 deletion topological_navigation/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
'visualise_map_ros2.py = topological_navigation.scripts.visualise_map_ros2:main',
'topomap_marker.py = topological_navigation.topomap_marker:main',
'topomap_marker2.py = topological_navigation.topomap_marker2:main',
'policy_marker.py = topological_navigation.policy_marker:main'
'policy_marker.py = topological_navigation.policy_marker:main',
'manual_topomapping.py = topological_navigation.scripts.manual_topomapping:main'
],
},

Expand Down
Loading
Loading