Nantes Université
Skip to content
GitLab
Explorer
Connexion
S'inscrire
Navigation principale
Rechercher ou aller à…
Projet
L
ls2n_drone_command_center
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Wiki
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Extraits de code
Compilation
Pipelines
Jobs
Planifications de pipeline
Artéfacts
Déploiement
Releases
Registre de paquets
Registre de conteneurs
Registre de modèles
Opération
Environnements
Modules Terraform
Surveillance
Incidents
Service d'assistance
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse CI/CD
Données d'analyse du dépôt
Expériences du modèle
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
LS2N-drones
ls2n_drone_command_center
Validations
642a3a19
Valider
642a3a19
rédigé
2 months ago
par
Damien SIX
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
fix: multicontrol_node
parent
b3e4302b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Pipeline
#104635
réussi
2 months ago
Étape : build
Étape : test
Modifications
1
Pipelines
1
Masquer les modifications d'espaces
En ligne
Côte à côte
Affichage de
1 fichier modifié
ls2n_drone_command_center/multi_control.py
+54
-40
54 ajouts, 40 suppressions
ls2n_drone_command_center/multi_control.py
avec
54 ajouts
et
40 suppressions
ls2n_drone_command_center/multi_control.py
+
54
−
40
Voir le fichier @
642a3a19
...
@@ -37,15 +37,17 @@ class MultiControl(Node):
...
@@ -37,15 +37,17 @@ class MultiControl(Node):
type
=
ParameterType
.
PARAMETER_STRING_ARRAY
,
type
=
ParameterType
.
PARAMETER_STRING_ARRAY
,
description
=
"
Array of drone names (namespaces) you want to control
"
,
description
=
"
Array of drone names (namespaces) you want to control
"
,
)
)
self
.
declare_parameter
(
"
drones_to_control
"
,
None
,
descriptor
=
drones_to_control_descr
)
self
.
declare_parameter
(
"
drones_to_control
"
,
[
""
],
descriptor
=
drones_to_control_descr
)
self
.
drones
=
self
.
get_parameter
(
"
drones_to_control
"
).
value
self
.
drones
=
self
.
get_parameter
(
"
drones_to_control
"
).
value
self
.
drone_request_client
=
[]
# Request client for each drone
self
.
drone_request_client
=
[]
# Request client for each drone
self
.
drone_keep_alive_pub
=
[]
# KeepAlive message publisher for each drone
self
.
drone_keep_alive_pub
=
[]
# KeepAlive message publisher for each drone
self
.
status_drone_sub
=
[]
# DroneStatus message subscriber for each drone
self
.
status_drone_sub
=
[]
# DroneStatus message subscriber for each drone
self
.
drone_status
=
[]
# Drone status
self
.
drone_status
=
[]
# Drone status
self
.
drone_start_traj_client
=
[]
# Start trajectory client for each drone
self
.
drone_start_traj_client
=
[]
# Start trajectory client for each drone
self
.
drone_reset_traj_client
=
[]
# Reset trajectory client for each drone
self
.
drone_reset_traj_client
=
[]
# Reset trajectory client for each drone
self
.
status
=
DroneStatus
()
self
.
status
=
DroneStatus
()
self
.
status
.
status
=
DroneStatus
.
IDLE
self
.
status
.
status
=
DroneStatus
.
IDLE
self
.
arming_time_init
=
None
self
.
arming_time_init
=
None
...
@@ -56,7 +58,10 @@ class MultiControl(Node):
...
@@ -56,7 +58,10 @@ class MultiControl(Node):
self
.
conditions
=
[
None
]
*
DroneRequest
.
Request
.
LAST
self
.
conditions
=
[
None
]
*
DroneRequest
.
Request
.
LAST
self
.
conditions
[
DroneRequest
.
Request
.
ARM
]
=
{
DroneStatus
.
IDLE
}
self
.
conditions
[
DroneRequest
.
Request
.
ARM
]
=
{
DroneStatus
.
IDLE
}
self
.
conditions
[
DroneRequest
.
Request
.
TAKE_OFF
]
=
{
DroneStatus
.
ARMED
}
self
.
conditions
[
DroneRequest
.
Request
.
TAKE_OFF
]
=
{
DroneStatus
.
ARMED
}
self
.
conditions
[
DroneRequest
.
Request
.
LAND
]
=
{
DroneStatus
.
FLYING
,
DroneStatus
.
TAKE_OFF
}
self
.
conditions
[
DroneRequest
.
Request
.
LAND
]
=
{
DroneStatus
.
FLYING
,
DroneStatus
.
TAKE_OFF
,
}
self
.
actions
=
[
None
]
*
DroneRequest
.
Request
.
LAST
self
.
actions
=
[
None
]
*
DroneRequest
.
Request
.
LAST
self
.
actions
[
DroneRequest
.
Request
.
ARM
]
=
self
.
start_arm
self
.
actions
[
DroneRequest
.
Request
.
ARM
]
=
self
.
start_arm
...
@@ -64,15 +69,17 @@ class MultiControl(Node):
...
@@ -64,15 +69,17 @@ class MultiControl(Node):
self
.
actions
[
DroneRequest
.
Request
.
LAND
]
=
self
.
start_land
self
.
actions
[
DroneRequest
.
Request
.
LAND
]
=
self
.
start_land
# Create publishers / subscribers and services / clients
# Create publishers / subscribers and services / clients
self
.
status_pub
=
self
.
create_publisher
(
DroneStatus
,
"
Status
"
,
qos_profile_sensor_data
)
self
.
status_pub
=
self
.
create_publisher
(
DroneStatus
,
"
Status
"
,
qos_profile_sensor_data
)
self
.
keep_alive_sub
=
self
.
create_subscription
(
self
.
keep_alive_sub
=
self
.
create_subscription
(
KeepAlive
,
"
keep_alive
"
,
self
.
keep_alive
,
qos_profile_sensor_data
KeepAlive
,
"
keep_alive
"
,
self
.
keep_alive
,
qos_profile_sensor_data
)
)
self
.
create_service
(
DroneRequest
,
"
request
"
,
self
.
handle_request
)
self
.
create_service
(
DroneRequest
,
"
request
"
,
self
.
handle_request
)
#self.create_service(Empty, "StartTrajectory", self.start_trajectory)
#
self.create_service(Empty, "StartTrajectory", self.start_trajectory)
#self.create_service(Empty, "ResetTrajectory", self.start_trajectory) # Combined with StopExperiment service
#
self.create_service(Empty, "ResetTrajectory", self.start_trajectory) # Combined with StopExperiment service
# Create publishers / subscribers and services / clients for each drone
# Create publishers / subscribers and services / clients for each drone
for
index
,
drone_namespace
in
enumerate
(
self
.
drones
):
for
index
,
drone_namespace
in
enumerate
(
self
.
drones
):
self
.
drone_status
.
append
(
DroneStatus
.
IDLE
)
self
.
drone_status
.
append
(
DroneStatus
.
IDLE
)
...
@@ -110,7 +117,9 @@ class MultiControl(Node):
...
@@ -110,7 +117,9 @@ class MultiControl(Node):
self
.
loop_land_timer
=
self
.
create_timer
(
3
,
self
.
repeat_land
)
self
.
loop_land_timer
=
self
.
create_timer
(
3
,
self
.
repeat_land
)
self
.
loop_land_timer
.
cancel
()
self
.
loop_land_timer
.
cancel
()
def
handle_request
(
self
,
request
:
DroneRequest
.
Request
,
response
:
DroneRequest
.
Response
):
def
handle_request
(
self
,
request
:
DroneRequest
.
Request
,
response
:
DroneRequest
.
Response
):
"""
"""
This function manages user requests
This function manages user requests
:return response:
:return response:
...
@@ -156,18 +165,17 @@ class MultiControl(Node):
...
@@ -156,18 +165,17 @@ class MultiControl(Node):
Returns:
Returns:
Empty: empty response
Empty: empty response
"""
"""
self
.
get_logger
().
info
(
'
Start trajectory request made
'
)
self
.
get_logger
().
info
(
"
Start trajectory request made
"
)
for
i
in
range
(
len
(
self
.
drones
)):
for
i
in
range
(
len
(
self
.
drones
)):
if
self
.
drone_status
[
i
]
in
{
DroneStatus
.
FLYING
}:
if
self
.
drone_status
[
i
]
in
{
DroneStatus
.
FLYING
}:
self
.
drone_start_traj_client
[
i
].
call_async
(
Empty
.
Request
())
self
.
drone_start_traj_client
[
i
].
call_async
(
Empty
.
Request
())
return
response
return
response
def
reset_trajectory
(
self
)
->
None
:
def
reset_trajectory
(
self
)
->
None
:
"""
Function used to send a service call to reset the trajectory for each drone
"""
Function used to send a service call to reset the trajectory for each drone
"""
"""
self
.
get_logger
().
info
(
"
Reset trajectory request made
"
)
self
.
get_logger
().
info
(
'
Reset trajectory request made
'
)
for
i
in
range
(
len
(
self
.
drones
)):
for
i
in
range
(
len
(
self
.
drones
)):
self
.
drone_reset_traj_client
[
i
].
call_async
(
Empty
.
Request
())
self
.
drone_reset_traj_client
[
i
].
call_async
(
Empty
.
Request
())
...
@@ -187,8 +195,10 @@ class MultiControl(Node):
...
@@ -187,8 +195,10 @@ class MultiControl(Node):
This function monitors the status of the drones and applies the associated procedure and the
This function monitors the status of the drones and applies the associated procedure and the
updates the status of the node.
updates the status of the node.
"""
"""
if
self
.
status
.
status
in
{
DroneStatus
.
ARMED
,
DroneStatus
.
STOPPING
}
\
if
self
.
status
.
status
in
{
DroneStatus
.
ARMED
,
DroneStatus
.
STOPPING
}
and
all
(
and
all
(
self
.
drone_status
[
i
]
==
DroneStatus
.
IDLE
for
i
in
range
(
len
(
self
.
drone_status
))):
self
.
drone_status
[
i
]
==
DroneStatus
.
IDLE
for
i
in
range
(
len
(
self
.
drone_status
))
):
self
.
status
.
status
=
DroneStatus
.
IDLE
self
.
status
.
status
=
DroneStatus
.
IDLE
if
self
.
status
.
status
==
DroneStatus
.
PRE_ARMED
:
if
self
.
status
.
status
==
DroneStatus
.
PRE_ARMED
:
...
@@ -200,9 +210,10 @@ class MultiControl(Node):
...
@@ -200,9 +210,10 @@ class MultiControl(Node):
if
self
.
status
.
status
==
DroneStatus
.
LANDING
:
if
self
.
status
.
status
==
DroneStatus
.
LANDING
:
self
.
land_process
()
self
.
land_process
()
if
self
.
status
.
status
!=
DroneStatus
.
IDLE
\
if
self
.
status
.
status
!=
DroneStatus
.
IDLE
and
any
(
and
any
(
self
.
drone_status
[
i
]
==
DroneStatus
.
EMERGENCY_STOP
\
self
.
drone_status
[
i
]
==
DroneStatus
.
EMERGENCY_STOP
for
i
in
range
(
len
(
self
.
drone_status
))):
for
i
in
range
(
len
(
self
.
drone_status
))
):
self
.
status
.
status
=
DroneStatus
.
EMERGENCY_STOP
self
.
status
.
status
=
DroneStatus
.
EMERGENCY_STOP
self
.
update_status
()
self
.
update_status
()
...
@@ -247,7 +258,7 @@ class MultiControl(Node):
...
@@ -247,7 +258,7 @@ class MultiControl(Node):
:return response: The response of the service.
:return response: The response of the service.
"""
"""
self
.
get_logger
().
info
(
'
Start ARM request made
'
)
self
.
get_logger
().
info
(
"
Start ARM request made
"
)
response
=
DroneRequest
.
Response
()
response
=
DroneRequest
.
Response
()
self
.
arming_time_init
=
self
.
get_clock
().
now
().
nanoseconds
self
.
arming_time_init
=
self
.
get_clock
().
now
().
nanoseconds
...
@@ -267,7 +278,10 @@ class MultiControl(Node):
...
@@ -267,7 +278,10 @@ class MultiControl(Node):
"""
"""
This procedure is executed when the status of the node is PRE_ARMED
This procedure is executed when the status of the node is PRE_ARMED
"""
"""
if
all
(
self
.
drone_status
[
i
]
==
DroneStatus
.
ARMED
for
i
in
range
(
len
(
self
.
drone_status
))):
if
all
(
self
.
drone_status
[
i
]
==
DroneStatus
.
ARMED
for
i
in
range
(
len
(
self
.
drone_status
))
):
self
.
loop_arm_timer
.
cancel
()
self
.
loop_arm_timer
.
cancel
()
self
.
status
.
status
=
DroneStatus
.
ARMED
self
.
status
.
status
=
DroneStatus
.
ARMED
self
.
get_logger
().
info
(
"
Arming was successful!
"
)
self
.
get_logger
().
info
(
"
Arming was successful!
"
)
...
@@ -276,7 +290,9 @@ class MultiControl(Node):
...
@@ -276,7 +290,9 @@ class MultiControl(Node):
self
.
drone_status
[
i
]
in
{
DroneStatus
.
IDLE
,
DroneStatus
.
PRE_ARMED
}
self
.
drone_status
[
i
]
in
{
DroneStatus
.
IDLE
,
DroneStatus
.
PRE_ARMED
}
for
i
in
range
(
len
(
self
.
drone_status
))
for
i
in
range
(
len
(
self
.
drone_status
))
):
):
arming_time
=
(
self
.
get_clock
().
now
().
nanoseconds
-
self
.
arming_time_init
)
/
1e9
arming_time
=
(
self
.
get_clock
().
now
().
nanoseconds
-
self
.
arming_time_init
)
/
1e9
# if arming_time > 5.0:
# if arming_time > 5.0:
# if self.status.status != DroneStatus.ARMED:
# if self.status.status != DroneStatus.ARMED:
# self.get_logger().warn(
# self.get_logger().warn(
...
@@ -308,7 +324,7 @@ class MultiControl(Node):
...
@@ -308,7 +324,7 @@ class MultiControl(Node):
:return response: The response of the service
:return response: The response of the service
"""
"""
self
.
get_logger
().
info
(
'
Start TAKE-OFF request made
'
)
self
.
get_logger
().
info
(
"
Start TAKE-OFF request made
"
)
response
=
DroneRequest
.
Response
()
response
=
DroneRequest
.
Response
()
self
.
takeoff_time_init
=
self
.
get_clock
().
now
().
nanoseconds
self
.
takeoff_time_init
=
self
.
get_clock
().
now
().
nanoseconds
...
@@ -329,15 +345,13 @@ class MultiControl(Node):
...
@@ -329,15 +345,13 @@ class MultiControl(Node):
self
.
status
.
status
=
DroneStatus
.
FLYING
self
.
status
.
status
=
DroneStatus
.
FLYING
self
.
get_logger
().
info
(
"
Take-off was successful!
"
)
self
.
get_logger
().
info
(
"
Take-off was successful!
"
)
take_off_time
=
(
self
.
get_clock
().
now
().
nanoseconds
-
self
.
takeoff_time_init
)
/
1e9
take_off_time
=
(
if
(
self
.
get_clock
().
now
().
nanoseconds
-
self
.
takeoff_time_init
any
(
)
/
1e9
self
.
drone_status
[
i
]
if
any
(
not
in
{
DroneStatus
.
TAKE_OFF
,
DroneStatus
.
FLYING
}
self
.
drone_status
[
i
]
not
in
{
DroneStatus
.
TAKE_OFF
,
DroneStatus
.
FLYING
}
for
i
in
range
(
len
(
self
.
drone_status
))
for
i
in
range
(
len
(
self
.
drone_status
))
)
)
and
(
take_off_time
>
4.0
):
and
(
take_off_time
>
4.0
)
):
self
.
get_logger
().
warn
(
"
Take-off failure!
"
)
self
.
get_logger
().
warn
(
"
Take-off failure!
"
)
self
.
emergency_landing
()
self
.
emergency_landing
()
...
@@ -346,7 +360,7 @@ class MultiControl(Node):
...
@@ -346,7 +360,7 @@ class MultiControl(Node):
:return: response: The response of the service
:return: response: The response of the service
"""
"""
self
.
get_logger
().
info
(
'
Start LAND request made
'
)
self
.
get_logger
().
info
(
"
Start LAND request made
"
)
response
=
DroneRequest
.
Response
()
response
=
DroneRequest
.
Response
()
self
.
land_time_init
=
self
.
get_clock
().
now
().
nanoseconds
self
.
land_time_init
=
self
.
get_clock
().
now
().
nanoseconds
...
@@ -373,7 +387,7 @@ class MultiControl(Node):
...
@@ -373,7 +387,7 @@ class MultiControl(Node):
for
i
in
range
(
len
(
self
.
drone_status
))
for
i
in
range
(
len
(
self
.
drone_status
))
):
):
land_time
=
(
self
.
get_clock
().
now
().
nanoseconds
-
self
.
land_time_init
)
/
1e9
land_time
=
(
self
.
get_clock
().
now
().
nanoseconds
-
self
.
land_time_init
)
/
1e9
#if 4 < land_time < 15:
#
if 4 < land_time < 15:
# self.loop_land_timer.reset()
# self.loop_land_timer.reset()
if
land_time
>
15
:
if
land_time
>
15
:
self
.
loop_land_timer
.
cancel
()
self
.
loop_land_timer
.
cancel
()
...
@@ -409,5 +423,5 @@ def main(args=None):
...
@@ -409,5 +423,5 @@ def main(args=None):
rclpy
.
try_shutdown
()
rclpy
.
try_shutdown
()
if
__name__
==
'
__main__
'
:
if
__name__
==
"
__main__
"
:
main
()
main
()
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter