Skip to content

Commit fd9adb8

Browse files
adding API change for spin_until_complete (#3328)
Signed-off-by: stevemacenski <[email protected]>
1 parent c20285e commit fd9adb8

File tree

7 files changed

+13
-6
lines changed

7 files changed

+13
-6
lines changed

source/Releases/Release-Iron-Irwini.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ To come.
4141
New features in this ROS 2 release
4242
----------------------------------
4343

44+
Rename ``spin_until_future_complete`` to ``spin_until_complete``
45+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
46+
47+
`PR 1874 <https://github.com/ros2/rclcpp/pull/1874>`_ renames ``spin_until_future_complete`` to ``spin_until_complete`` to represent the semantics of being able to spin on values that are not exclusively futures.
48+
The API can now spin until arbitrary conditions.
49+
A deprecation warning will appear for migration.
50+
4451
ros2topic
4552
^^^^^^^^^
4653

source/The-ROS2-Project/Contributing/Migration-Guide-Python.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@ In ROS 2:
121121
while not add_two_ints.wait_for_service(timeout_sec=1.0):
122122
node.get_logger().info('service not available, waiting again...')
123123
resp = add_two_ints.call_async(req)
124-
rclpy.spin_until_future_complete(node, resp)
124+
rclpy.spin_until_complete(node, resp)

source/Tutorials/Advanced/FastDDS-Configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ Create the client in a file named ``src/ping_client.cpp`` with the following con
679679
auto result = client->async_send_request(request);
680680

681681
// Wait for the result and log it to the console
682-
if (rclcpp::spin_until_future_complete(node, result) ==
682+
if (rclcpp::spin_until_complete(node, result) ==
683683
rclcpp::FutureReturnCode::SUCCESS)
684684
{
685685
RCLCPP_INFO(rclcpp::get_logger("ping_client"), "Response received");

source/Tutorials/Beginner-Client-Libraries/Custom-ROS2-Interfaces.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ Client:
647647

648648
auto result = client->async_send_request(request);
649649
// Wait for the result.
650-
if (rclcpp::spin_until_future_complete(node, result) ==
650+
if (rclcpp::spin_until_complete(node, result) ==
651651
rclcpp::FutureReturnCode::SUCCESS)
652652
{
653653
RCLCPP_INFO(rclcpp::get_logger("rclcpp"), "Sum: %ld", result.get()->sum);

source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Service-And-Client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ Inside the ``ros2_ws/src/cpp_srvcli/src`` directory, create a new file called ``
228228

229229
auto result = client->async_send_request(request);
230230
// Wait for the result.
231-
if (rclcpp::spin_until_future_complete(node, result) ==
231+
if (rclcpp::spin_until_complete(node, result) ==
232232
rclcpp::FutureReturnCode::SUCCESS)
233233
{
234234
RCLCPP_INFO(rclcpp::get_logger("rclcpp"), "Sum: %ld", result.get()->sum);

source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Service-And-Client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Inside the ``ros2_ws/src/py_srvcli/py_srvcli`` directory, create a new file call
197197
self.req.a = a
198198
self.req.b = b
199199
self.future = self.cli.call_async(self.req)
200-
rclpy.spin_until_future_complete(self, self.future)
200+
rclpy.spin_until_complete(self, self.future)
201201
return self.future.result()
202202
203203

source/Tutorials/Intermediate/Writing-an-Action-Server-Client/scripts/client_0.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def main(args=None):
2727

2828
future = action_client.send_goal(10)
2929

30-
rclpy.spin_until_future_complete(action_client, future)
30+
rclpy.spin_until_complete(action_client, future)
3131

3232

3333
if __name__ == '__main__':

0 commit comments

Comments
 (0)