Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix error in pr merge #138

Merged
merged 1 commit into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/signage/src/signage/autoware_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import rclpy
from dataclasses import dataclass
from autoware_adapi_v1_msgs.msg import (

Check warning on line 6 in src/signage/src/signage/autoware_interface.py

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (adapi)
RouteState,
MrmState,
OperationModeState,
Expand Down Expand Up @@ -81,7 +81,7 @@
self._sub_motion_state = node.create_subscription(
MotionState, "/api/motion/state", self.sub_motion_state_callback, api_qos
)
self._sub_localiztion_initializtion_state = node.create_subscription(

Check warning on line 84 in src/signage/src/signage/autoware_interface.py

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (localiztion)

Check warning on line 84 in src/signage/src/signage/autoware_interface.py

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (initializtion)
LocalizationInitializationState,
"/api/localization/initialization_state",
self.sub_localization_initialization_state_callback,
Expand All @@ -99,9 +99,8 @@
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(
Expand Down
136 changes: 0 additions & 136 deletions src/signage/src/signage/external_signage.py

This file was deleted.

4 changes: 1 addition & 3 deletions src/signage/src/signage/route_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import signage.signage_utils as utils
from tier4_external_api_msgs.msg import DoorStatus
from autoware_adapi_v1_msgs.msg import (

Check warning on line 12 in src/signage/src/signage/route_handler.py

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (adapi)
RouteState,
MrmState,
OperationModeState,
Expand All @@ -27,15 +27,13 @@
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()
Expand Down Expand Up @@ -272,7 +270,7 @@
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:
Expand Down
3 changes: 0 additions & 3 deletions src/signage/src/signage/signage.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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()
Expand Down
Loading