fix error in pr merge

Signed-off-by: tkhmy <[email protected]>
tier4 · Nov 22, 2024 · 270035a · 270035a
1 parent 8eb8237
commit 270035a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 145 deletions.
diff --git a/src/signage/src/signage/autoware_interface.py b/src/signage/src/signage/autoware_interface.py
@@ -99,9 +99,8 @@ def __init__(self, node):
             self.sub_active_schedule_callback,
             sub_qos,
         )
-        if not self._parameter.debug_mode:
-            self._autoware_connection_time = self._node.get_clock().now()
-            self._node.create_timer(1, self.reset_timer)
+        self._autoware_connection_time = self._node.get_clock().now()
+        self._node.create_timer(1, self.reset_timer)
 
     def reset_timer(self):
         if utils.check_timeout(

diff --git a/src/signage/src/signage/external_signage.py b/src/signage/src/signage/external_signage.py
diff --git a/src/signage/src/signage/route_handler.py b/src/signage/src/signage/route_handler.py
@@ -27,15 +27,13 @@ def __init__(
         autoware_interface,
         parameter_interface,
         ros_service_interface,
-        external_signage,
     ):
         self._node = node
         self._viewController = viewController
         self._announce_interface = announceController
         self._autoware = autoware_interface
         self._parameter = parameter_interface.parameter
         self._service_interface = ros_service_interface
-        self._external_signage = external_signage
         self._schedule_details = utils.init_ScheduleDetails()
         self._display_details = utils.init_DisplayDetails()
         self._current_task_details = utils.init_CurrentTask()
@@ -272,7 +270,7 @@ def route_checker_callback(self):
                     self._trigger_external_signage = True
                 if not self._announce_engage and self._parameter.signage_stand_alone:
                     self._announce_interface.send_announce("engage")
-                    self._external_signage.trigger()
+                    self._service_interface.trigger_external_signage(True)
                     self._trigger_external_signage = True
                     self._announce_engage = True
             elif self._autoware.information.route_state == RouteState.ARRIVED:

diff --git a/src/signage/src/signage/signage.py b/src/signage/src/signage/signage.py
@@ -14,7 +14,6 @@
 from signage.parameter_interface import ParameterInterface
 from signage.route_handler import RouteHandler
 from signage.ros_service_interface import RosServiceInterface
-from signage.external_signage import ExternalSignage
 from ament_index_python.packages import get_package_share_directory
 
 
@@ -34,15 +33,13 @@ def main(args=None):
     ros_service_interface = RosServiceInterface(node, parameter_interface)
     viewController = ViewControllerProperty(node, parameter_interface)
     announceController = AnnounceControllerProperty(node, autoware_interface, parameter_interface)
-    external_signage = ExternalSignage(node)
     route_handler = RouteHandler(
         node,
         viewController,
         announceController,
         autoware_interface,
         parameter_interface,
         ros_service_interface,
-        external_signage,
     )
 
     ctx = engine.rootContext()