Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
larm-astro
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Inès EL HADRI
larm-astro
Commits
dae43a08
Commit
dae43a08
authored
Jan 23, 2024
by
Lucas NAURY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Automatic map discovery
parent
4d3b175e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
131 additions
and
20 deletions
+131
-20
CMakeLists.txt
grp_astro/CMakeLists.txt
+1
-0
auto_simulation_launch.yaml
grp_astro/launch/auto_simulation_launch.yaml
+25
-0
auto_discovery
grp_astro/src/auto_discovery
+105
-20
No files found.
grp_astro/CMakeLists.txt
View file @
dae43a08
...
@@ -55,6 +55,7 @@ install( PROGRAMS
...
@@ -55,6 +55,7 @@ install( PROGRAMS
src/reactive_move
src/reactive_move
src/scan2point_cloud
src/scan2point_cloud
src/bottle_mapping
src/bottle_mapping
src/auto_discovery
DESTINATION lib/
${
PROJECT_NAME
}
DESTINATION lib/
${
PROJECT_NAME
}
)
)
\ No newline at end of file
grp_astro/launch/auto_simulation_launch.yaml
0 → 100644
View file @
dae43a08
launch
:
# Include the challenge 1 simulation launch file
-
include
:
file
:
"
$(find-pkg-share
tbot_sim)/launch/challenge-1.launch.py"
# Lidar conversion to point cloud
-
node
:
pkg
:
"
grp_astro"
exec
:
"
scan2point_cloud"
name
:
"
scan2point_cloud"
# Go to goal points
-
include
:
file
:
"
$(find-pkg-share
nav2_bringup)/launch/navigation_launch.py"
# Send goal points
# - node:
# pkg: "grp_astro"
# exec: "auto_discovery"
# name: "auto_discovery"
# Launch a SLAM algorithm
-
include
:
file
:
"
$(find-pkg-share
slam_toolbox)/launch/online_sync_launch.py"
\ No newline at end of file
grp_astro/src/auto_discovery
View file @
dae43a08
...
@@ -3,10 +3,14 @@
...
@@ -3,10 +3,14 @@
# Imports
# Imports
import
rclpy
import
rclpy
from
rclpy.node
import
Node
from
rclpy.node
import
Node
from
geometry_msgs.msg
import
PoseStamped
,
Twist
from
geometry_msgs.msg
import
PoseStamped
,
Twist
,
Pose
from
nav_msgs.msg
import
OccupancyGrid
from
nav_msgs.msg
import
OccupancyGrid
from
nav_msgs.msg
import
Odometry
from
tf2_ros.transform_listener
import
TransformListener
from
tf2_ros.buffer
import
Buffer
from
random
import
random
,
sample
from
random
import
random
,
sample
import
math
as
m
,
numpy
as
np
# Class
# Class
...
@@ -14,63 +18,144 @@ class AutoDisco(Node):
...
@@ -14,63 +18,144 @@ class AutoDisco(Node):
def
__init__
(
self
,
name
=
"auto_disco"
,
timerFreq
=
1.0
/
60
):
def
__init__
(
self
,
name
=
"auto_disco"
,
timerFreq
=
1.0
/
60
):
super
()
.
__init__
(
name
)
super
()
.
__init__
(
name
)
# Initialiaze subscribers / publishers
self
.
init_publishers
(
timerFreq
)
self
.
init_publishers
(
timerFreq
)
self
.
init_subscribers
()
self
.
init_subscribers
()
# Node variables
self
.
_robot_speed
=
Twist
()
self
.
_robot_speed
=
Twist
()
self
.
_map
=
None
self
.
_map
=
None
self
.
_canPublishGoal
=
True
self
.
_robotPose
=
None
# Transform frames
self
.
_tf_buffer
=
Buffer
()
self
.
_tf_listener
=
TransformListener
(
self
.
_tf_buffer
,
self
)
def
init_publishers
(
self
,
timerFreq
):
def
init_publishers
(
self
,
timerFreq
):
self
.
_goal_publisher
=
self
.
create_publisher
(
PoseStamped
,
'goal_pose'
,
10
)
self
.
_goal_publisher
=
self
.
create_publisher
(
PoseStamped
,
'goal_pose'
,
10
)
self
.
create_timer
(
timerFreq
,
self
.
loop
)
self
.
create_timer
(
timerFreq
,
self
.
loop
)
def
init_subscribers
(
self
):
def
init_subscribers
(
self
):
self
.
create_subscription
(
Twist
,
'/cmd_vel'
,
self
.
s
can
_callback
,
10
)
self
.
create_subscription
(
Twist
,
'/cmd_vel'
,
self
.
s
peed
_callback
,
10
)
self
.
create_subscription
(
OccupancyGrid
,
'/map'
,
self
.
map_callback
,
10
)
self
.
create_subscription
(
OccupancyGrid
,
'/map'
,
self
.
map_callback
,
10
)
self
.
create_subscription
(
Odometry
,
'/odom'
,
self
.
odom_callback
,
10
)
def
scan_callback
(
self
,
msg
):
def
speed_callback
(
self
,
msg
):
"""
Get robot speed
"""
self
.
_robot_speed
=
msg
self
.
_robot_speed
=
msg
def
map_callback
(
self
,
msg
):
def
map_callback
(
self
,
msg
):
"""
Get map data
"""
self
.
_map
=
msg
self
.
_map
=
msg
def
loop
(
self
):
def
odom_callback
(
self
,
odom
):
print
(
f
'{self._robot_speed.linear.x=}'
)
"""
if
self
.
_robot_speed
==
Twist
():
Get robot pose on the map, thanks to SLAM
rdx
,
rdy
=
random
(),
random
()
"""
pose
=
PoseStamped
()
self
.
_robotPose
=
odom
.
pose
.
pose
# Map view
def
loop
(
self
):
if
self
.
_map
is
None
:
# Map view
return
if
self
.
_map
is
None
or
self
.
_robotPose
is
None
:
return
if
self
.
_robot_speed
!=
Twist
():
self
.
_canPublishGoal
=
True
elif
self
.
_canPublishGoal
:
pose
=
PoseStamped
()
# Get map settings
resolution
=
self
.
_map
.
info
.
resolution
resolution
=
self
.
_map
.
info
.
resolution
width
=
self
.
_map
.
info
.
width
width
=
self
.
_map
.
info
.
width
height
=
self
.
_map
.
info
.
height
height
=
self
.
_map
.
info
.
height
pose_origin
=
self
.
_map
.
info
.
origi
n
origin_position
=
self
.
_map
.
info
.
origin
.
positio
n
data
=
self
.
_map
.
data
data
=
self
.
_map
.
data
print
(
type
(
data
))
# Save unknown points' coordinates
values
=
[]
values
=
[]
for
x
in
range
(
width
):
for
x
in
range
(
width
):
for
y
in
range
(
height
):
for
y
in
range
(
height
):
if
data
[
x
+
y
*
width
]
==
-
1
:
if
data
[
x
+
y
*
width
]
==
-
1
:
values
.
append
((
x
,
y
))
values
.
append
((
x
,
y
))
values
=
sample
(
values
,
1
)
# Define a distance to check around the robot
xDist
=
int
(
0.5
/
resolution
)
# 50cm in px
pose
.
pose
.
position
.
x
=
values
[
0
][
0
]
*
resolution
yDist
=
int
(
0.5
/
resolution
)
# 50cm in px
pose
.
pose
.
position
.
y
=
values
[
0
][
1
]
*
resolution
print
(
f
'{pose.pose.position.x=}
\n
{pose.pose.position.y=}'
)
# Filter the points to only get the ones without any neighbours in a square around them
filteredValues
=
[(
x
,
y
)
for
x
,
y
in
values
if
x
>
xDist
and
x
<
width
-
xDist
and
y
>
yDist
and
y
<
height
-
yDist
]
pointsWithoutNeighbour
=
[]
for
x
,
y
in
filteredValues
:
hasKnownNeighbour
=
False
for
xOffset
in
range
(
-
xDist
,
xDist
+
1
):
for
yOffset
in
range
(
-
yDist
,
yDist
+
1
):
if
data
[(
x
+
xOffset
)
+
(
y
+
yOffset
)
*
width
]
!=
-
1
:
hasKnownNeighbour
=
True
break
if
hasKnownNeighbour
:
break
if
not
hasKnownNeighbour
:
pointsWithoutNeighbour
.
append
((
x
,
y
))
# Get robot position in map
trans
=
self
.
_tf_buffer
.
lookup_transform
(
"map"
,
"odom"
,
rclpy
.
time
.
Time
())
robotX
=
trans
.
transform
.
translation
.
x
robotY
=
trans
.
transform
.
translation
.
y
yaw
=
self
.
quaternionToYaw
(
trans
.
transform
.
rotation
)
robotX
+=
self
.
_robotPose
.
position
.
x
*
m
.
cos
(
yaw
)
-
self
.
_robotPose
.
position
.
y
*
m
.
sin
(
yaw
)
robotY
+=
self
.
_robotPose
.
position
.
x
*
m
.
sin
(
yaw
)
+
self
.
_robotPose
.
position
.
y
*
m
.
cos
(
yaw
)
# Order all the points without neighbours by distance relative to the robot
pointsWithoutNeighbour
=
[(
x
,
y
,
(
x
*
resolution
+
origin_position
.
x
-
robotX
)
**
2
+
(
y
*
resolution
+
origin_position
.
y
-
robotY
)
**
2
)
for
x
,
y
in
pointsWithoutNeighbour
]
pointsWithoutNeighbour
.
sort
(
key
=
lambda
x
:
x
[
2
])
# If there is at least one point without neighbour, go to the closest one
if
len
(
pointsWithoutNeighbour
)
>
0
:
x
,
y
,
_
=
pointsWithoutNeighbour
[
0
]
# Otherwise if there are still unknown points, pick one of them at random
elif
len
(
values
)
>
0
:
x
,
y
=
sample
(
values
,
1
)[
0
]
# If all the map is known, go to a random point
else
:
x
,
y
=
int
(
random
()
*
width
),
int
(
random
()
*
height
)
# Transform the map coordinates into real world coordinates
pose
.
pose
.
position
.
x
=
x
*
resolution
+
origin_position
.
x
pose
.
pose
.
position
.
y
=
y
*
resolution
+
origin_position
.
y
pose
.
header
.
frame_id
=
"map"
pose
.
header
.
frame_id
=
"map"
pose
.
header
.
stamp
=
self
.
get_clock
()
.
now
()
.
to_msg
()
pose
.
header
.
stamp
=
self
.
get_clock
()
.
now
()
.
to_msg
()
# Publish goal pose
self
.
_goal_publisher
.
publish
(
pose
)
self
.
_goal_publisher
.
publish
(
pose
)
self
.
_canPublishGoal
=
False
def
quaternionToYaw
(
self
,
q
):
# Convert quaternion to yaw
x
=
q
.
x
y
=
q
.
y
z
=
q
.
z
w
=
q
.
w
siny_cosp
=
2
*
(
w
*
z
+
x
*
y
)
cosy_cosp
=
1
-
2
*
(
y
*
y
+
z
*
z
)
yaw
=
np
.
arctan2
(
siny_cosp
,
cosy_cosp
)
return
yaw
def
main
():
def
main
():
"""
"""
Main loop
Main loop
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment