From 5e880620922bf834a9ced3d92c9a8b01f8b353c8 Mon Sep 17 00:00:00 2001 From: Tommy Persson <tommmy.persson@liu.se> Date: Wed, 12 May 2021 16:57:31 +0200 Subject: [PATCH] Fix of timeout. --- screen/screen_depot | 2 +- screen/screen_dji | 2 +- screen/screen_dji_sim | 2 +- screen/screen_dji_sim_morse | 2 +- screen/screen_dji_sim_ros2 | 2 +- screen/screen_dji_sim_scql | 2 +- screen/screen_dji_sim_zmq | 2 +- screen/screen_dji_simple | 2 +- screen/screen_dji_wasp_mpc | 2 +- screen/screen_dji_zmq | 2 +- screen/screen_examples_zmq | 2 +- screen/screen_fw | 2 +- screen/screen_husky_sim2 | 2 +- screen/screen_op | 4 ++-- screen/screen_op_min | 2 +- screen/screen_op_vpn | 2 +- screen/screen_op_wara | 2 +- screen/screen_op_wara_oc | 2 +- screen/screen_op_zmq | 2 +- screen/screen_op_zmq_min | 2 +- screen/screen_rmax | 2 +- screen/screen_rmax_sim | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/screen/screen_depot b/screen/screen_depot index 2364eb7a..0c63fab8 100644 --- a/screen/screen_depot +++ b/screen/screen_depot @@ -25,7 +25,7 @@ stuff "rosrun lrs_depot depot.py __ns:=${NS}\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 10 title "communication launch" diff --git a/screen/screen_dji b/screen/screen_dji index 0de66bd8..ca71eb38 100644 --- a/screen/screen_dji +++ b/screen/screen_dji @@ -39,7 +39,7 @@ stuff "sleep 10; rosrun lrs_dji gimbalcontrol.sh __ns:=${NS} _gimbal_mode:=follo screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Interaction" diff --git a/screen/screen_dji_sim b/screen/screen_dji_sim index 0fbd2dfc..b82f991c 100644 --- a/screen/screen_dji_sim +++ b/screen/screen_dji_sim @@ -41,7 +41,7 @@ stuff "sleep 10; rosrun lrs_dji gimbalcontrol.sh __ns:=${NS}\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Interaction" diff --git a/screen/screen_dji_sim_morse b/screen/screen_dji_sim_morse index 89d60b2d..85fa74c4 100644 --- a/screen/screen_dji_sim_morse +++ b/screen/screen_dji_sim_morse @@ -40,7 +40,7 @@ stuff "sleep 10; rosrun lrs_dji gimbalcontrol.py __ns:=${NS}\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Interaction" diff --git a/screen/screen_dji_sim_ros2 b/screen/screen_dji_sim_ros2 index 853525ec..2f246571 100644 --- a/screen/screen_dji_sim_ros2 +++ b/screen/screen_dji_sim_ros2 @@ -37,7 +37,7 @@ stuff "rosrun lrs_dji gimbalcontrol.py __ns:=${NS}\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Takeoff position info server" diff --git a/screen/screen_dji_sim_scql b/screen/screen_dji_sim_scql index e60dee29..98db3f98 100644 --- a/screen/screen_dji_sim_scql +++ b/screen/screen_dji_sim_scql @@ -35,7 +35,7 @@ stuff "roslaunch lrs_launch rviz_outside.launch" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Interaction" diff --git a/screen/screen_dji_sim_zmq b/screen/screen_dji_sim_zmq index 4dc6537c..5577b364 100644 --- a/screen/screen_dji_sim_zmq +++ b/screen/screen_dji_sim_zmq @@ -39,7 +39,7 @@ stuff "sleep 10; rosrun lrs_dji gimbalcontrol.py __ns:=${NS}\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Takeoff position info server" diff --git a/screen/screen_dji_simple b/screen/screen_dji_simple index b87988eb..4d212125 100644 --- a/screen/screen_dji_simple +++ b/screen/screen_dji_simple @@ -27,7 +27,7 @@ stuff "sleep 10; roslaunch lrs_launch delegation.launch __ns:=${NS} --wait\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Takeoff position info server" diff --git a/screen/screen_dji_wasp_mpc b/screen/screen_dji_wasp_mpc index da0f5f9d..e1e7e4e2 100644 --- a/screen/screen_dji_wasp_mpc +++ b/screen/screen_dji_wasp_mpc @@ -39,7 +39,7 @@ stuff "sleep 10; rosrun lrs_dji gimbalcontrol.py __ns:=${NS} _gimbal_mode:=follo screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Takeoff position info server" diff --git a/screen/screen_dji_zmq b/screen/screen_dji_zmq index 17434bb1..1829ac59 100644 --- a/screen/screen_dji_zmq +++ b/screen/screen_dji_zmq @@ -39,7 +39,7 @@ stuff "sleep 10; rosrun lrs_dji gimbalcontrol.py __ns:=${NS} _gimbal_mode:=follo screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Takeoff position info server" diff --git a/screen/screen_examples_zmq b/screen/screen_examples_zmq index 2b52978e..b730c82d 100644 --- a/screen/screen_examples_zmq +++ b/screen/screen_examples_zmq @@ -25,7 +25,7 @@ stuff "sleep 10; roslaunch lrs_launch delegation.launch __ns:=${NS} --wait\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Team launch" diff --git a/screen/screen_fw b/screen/screen_fw index 043c7101..8dee6fb6 100644 --- a/screen/screen_fw +++ b/screen/screen_fw @@ -39,7 +39,7 @@ stuff "sleep 10; roslaunch lrs_launch delegation.launch __ns:=${NS} --wait\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Interaction" diff --git a/screen/screen_husky_sim2 b/screen/screen_husky_sim2 index 37fb4693..d47babd2 100644 --- a/screen/screen_husky_sim2 +++ b/screen/screen_husky_sim2 @@ -38,7 +38,7 @@ stuff "sleep 10; rosrun lrs_dji gimbalcontrol.py __ns:=${NS}\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Interaction" diff --git a/screen/screen_op b/screen/screen_op index 4e0fb4c9..088b9ff9 100644 --- a/screen/screen_op +++ b/screen/screen_op @@ -41,8 +41,8 @@ stuff "roslaunch lrs_launch rviz_outside.launch" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" -#stuff "valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes lrs_ws/devel/lib/lrs_com_manager/com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" +#stuff "valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes lrs_ws/devel/lib/lrs_com_manager/com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Interaction" diff --git a/screen/screen_op_min b/screen/screen_op_min index 8827df0e..95ce846b 100644 --- a/screen/screen_op_min +++ b/screen/screen_op_min @@ -26,7 +26,7 @@ stuff "roslaunch lrs_launch delegation.launch __ns:=${NS} --wait\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 10 title "communication launch" diff --git a/screen/screen_op_vpn b/screen/screen_op_vpn index 9a5e7ef5..87775286 100644 --- a/screen/screen_op_vpn +++ b/screen/screen_op_vpn @@ -39,7 +39,7 @@ stuff "roslaunch lrs_launch rviz_outside.launch" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Interaction" diff --git a/screen/screen_op_wara b/screen/screen_op_wara index 528fd659..c37cac1b 100644 --- a/screen/screen_op_wara +++ b/screen/screen_op_wara @@ -45,7 +45,7 @@ stuff "rviz_gpu roslaunch lrs_launch rviz_outside.launch rvizui:=true" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Test partitioner, do not use for real" diff --git a/screen/screen_op_wara_oc b/screen/screen_op_wara_oc index e88d2d74..db22e13a 100644 --- a/screen/screen_op_wara_oc +++ b/screen/screen_op_wara_oc @@ -41,7 +41,7 @@ stuff "roslaunch lrs_launch rviz_outside.launch" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}" screen 9 title "Test partitioner, do not use for real" diff --git a/screen/screen_op_zmq b/screen/screen_op_zmq index f925f066..0b1bc5dd 100644 --- a/screen/screen_op_zmq +++ b/screen/screen_op_zmq @@ -45,7 +45,7 @@ stuff "roslaunch lrs_launch rviz_outside.launch" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Interaction" diff --git a/screen/screen_op_zmq_min b/screen/screen_op_zmq_min index d5975079..667f1d70 100644 --- a/screen/screen_op_zmq_min +++ b/screen/screen_op_zmq_min @@ -25,7 +25,7 @@ stuff "roslaunch lrs_launch delegation.launch __ns:=${NS} --wait\015" screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=5.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=5.0 __ns:=${NS}\015" screen 10 title "communication launch" diff --git a/screen/screen_rmax b/screen/screen_rmax index 733ece73..3b489d34 100644 --- a/screen/screen_rmax +++ b/screen/screen_rmax @@ -40,7 +40,7 @@ stuff "rosrun lrs_tools lrs_local_to_geo pose:=${NS}/pose geopose:=${NS}/geopose screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 11 title "proxy launch" diff --git a/screen/screen_rmax_sim b/screen/screen_rmax_sim index 5308bac8..6cd517ef 100644 --- a/screen/screen_rmax_sim +++ b/screen/screen_rmax_sim @@ -33,7 +33,7 @@ stuff "rosrun lrs_rmax rmaxtool.py __ns:=${NS} --flyto -x 34 -y 54 -z 20 --speed screen 8 title "Communication Manager" -stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 _gc_timeout:=20.0 __ns:=${NS}\015" +stuff "rosrun lrs_com_manager com_manager _resend_timeout:=10.0 __ns:=${NS}\015" screen 9 title "Pfc connect (needed for landing)" -- GitLab