From 44d115ae1031c261df446e935f5d0822a17d2df9 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom Date: Mon, 8 Jul 2024 22:26:35 -0400 Subject: [PATCH 1/3] update timer.oy --- src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py b/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py index 2d4c9330..513ea555 100644 --- a/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py +++ b/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py @@ -50,7 +50,10 @@ def do_tick(self) -> None: timestamp = self.get_clock().now() if self.is_running and self.last_timestamp is not None: - self.time_left = self.last_timestamp + self.time_left - timestamp + # Michael upstream typing oopsy + time_left = self.last_timestamp + self.time_left - timestamp + assert isinstance(time_left, Duration) + self.time_left = time_left if self.time_left < Duration(seconds=0): self.is_running = False From 52b0761a02674f97ea88bc640ccf8303bdf90717 Mon Sep 17 00:00:00 2001 From: Michael Carlstrom Date: Tue, 9 Jul 2024 10:58:27 -0400 Subject: [PATCH 2/3] Update timer.py --- src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py b/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py index 513ea555..3217fd43 100644 --- a/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py +++ b/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py @@ -51,6 +51,7 @@ def do_tick(self) -> None: if self.is_running and self.last_timestamp is not None: # Michael upstream typing oopsy + # https://github.com/ros2/rclpy/pull/1312 time_left = self.last_timestamp + self.time_left - timestamp assert isinstance(time_left, Duration) self.time_left = time_left From cc3b6690f2515f68a3c3f8e44507ac1375b03efd Mon Sep 17 00:00:00 2001 From: Benjamin Poulin <90342856+benjaminwp18@users.noreply.github.com> Date: Tue, 9 Jul 2024 11:29:11 -0400 Subject: [PATCH 3/3] Update src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py --- src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py b/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py index 3217fd43..aaecd963 100644 --- a/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py +++ b/src/surface/gui/gui/gui_nodes/auxiliary_nodes/timer.py @@ -50,7 +50,7 @@ def do_tick(self) -> None: timestamp = self.get_clock().now() if self.is_running and self.last_timestamp is not None: - # Michael upstream typing oopsy + # TODO: Michael upstream typing oopsy # https://github.com/ros2/rclpy/pull/1312 time_left = self.last_timestamp + self.time_left - timestamp assert isinstance(time_left, Duration)