Skip to content

Commit

Permalink
Fix bug for displaying all controllers (#1259)
Browse files Browse the repository at this point in the history
(cherry picked from commit 3be3fe9)

# Conflicts:
#	rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py
  • Loading branch information
fmrico authored and mergify[bot] committed Aug 26, 2024
1 parent fe71689 commit 976dffc
Showing 1 changed file with 8 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 976dffc

Please sign in to comment.