Skip to content

Commit

Permalink
[infra] update deprecated set_parameters_callback
Browse files Browse the repository at this point in the history
Now renamed to add_on_set_parameters_callback. Also
ensure we use single threaded executors where multi is not needed.
  • Loading branch information
stonier committed Aug 2, 2020
1 parent e6a34c8 commit 7c25040
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions py_trees_ros/programs/tree_watcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def main():
####################
rclpy.init(args=None)
try:
tree_watcher.setup(timeout_sec=2.0)
tree_watcher.setup(timeout_sec=5.0)
# setup discovery fails
except py_trees_ros.exceptions.NotFoundError as e:
print(console.red + "\nERROR: {}\n".format(str(e)) + console.reset)
Expand All @@ -210,6 +210,8 @@ def main():
####################
# Execute
####################
executor = rclpy.executors.SingleThreadedExecutor()
executor.add_node(node=tree_watcher.node)
try:
while True:
if not rclpy.ok():
Expand All @@ -221,7 +223,7 @@ def main():
elif tree_watcher.xdot_process.poll() is not None:
# xdot running, wait for it to terminate
break
rclpy.spin_once(tree_watcher.node, timeout_sec=0.1)
executor.spin_once(timeout_sec=0.1)
except KeyboardInterrupt:
pass
finally:
Expand Down
2 changes: 1 addition & 1 deletion py_trees_ros/trees.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def setup(
################################################################################
# Parameters
################################################################################
self.node.set_parameters_callback(
self.node.add_on_set_parameters_callback(
callback=self._set_parameters_callback
)

Expand Down

0 comments on commit 7c25040

Please sign in to comment.