From 976dffc6b6fbff67cd5bcb24ac8fa4f5fef3882b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Mart=C3=ADn=20Rico?= Date: Mon, 26 Aug 2024 14:52:27 +0200 Subject: [PATCH] Fix bug for displaying all controllers (#1259) (cherry picked from commit 3be3fe95c3eb2a6a7e07bde2b96a9b8acc558d9a) # Conflicts: # rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py --- .../joint_trajectory_controller.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py b/rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py index 72c11625e4..547fcb6a25 100644 --- a/rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py +++ b/rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py @@ -238,7 +238,15 @@ def _update_jtc_list(self): # for _all_ their joints running_jtc = self._running_jtc_info() if running_jtc and not self._robot_joint_limits: +<<<<<<< HEAD self._robot_joint_limits = get_joint_limits(self._node) # Lazy evaluation +======= + self._robot_joint_limits = {} + for jtc_info in running_jtc: + self._robot_joint_limits.update( + get_joint_limits(self._node, _jtc_joint_names(jtc_info)) + ) +>>>>>>> 3be3fe9 (Fix bug for displaying all controllers (#1259)) valid_jtc = [] if self._robot_joint_limits: for jtc_info in running_jtc: