Skip to content

Commit 3ffb779

Browse files
modified AutowareTick message
1 parent f6986f0 commit 3ffb779

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

docker/autoware_cawsr_msgs.tar.xz

0 Bytes
Binary file not shown.

srunner/autoagents/autoware_agent.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def setup(self, config: EnvironmentConfig | None = None) -> None:
4040
self.autoware_state = autoware_state.AutowareState("ego_vehicle", None)
4141

4242
self.state_node = state_node.StateNode(self.autoware_state)
43-
self.state_node.reset_autoware(self.config.town)
43+
self.state_node.reset_autoware(self.config.town, self.config.ego_name)
4444

4545
self.route_node = route_node.RouteNode(self.autoware_state)
4646
self.autoware_node = autoware_node.AutowareNode(self.autoware_state)
@@ -103,7 +103,7 @@ def _convert_to_waypoint(self, point):
103103
def destroy(self) -> None:
104104
"""Cleanup"""
105105
logger.info("Sending shutdown signal to autoware...")
106-
self.state_node.reset_autoware(self.config.town)
106+
self.state_node.reset_autoware(self.config.town, self.config.ego_name)
107107
logger.info("Waiting for shutdown. Starting Node cleanup")
108108
time.sleep(1) # sleep for 1 second for sanity
109109
try:

srunner/autoagents/autoware_nodes/state_node.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ def localize_state_cb(
6868
self.autoware_state.localize_state = localize_state_msg.state
6969
logger.info(f"Localization state: {self.autoware_state.localize_state}")
7070

71-
def reset_autoware(self, carla_map: str):
71+
def reset_autoware(self, carla_map: str, ego_name: str):
7272
"""Publishes an empty message to reset autoware."""
73+
7374
msg = AutowareRestart()
74-
msg.carla_map = carla_map
75+
msg.carla_map = str(carla_map)
76+
msg.ego_name = str(ego_name)
7577

7678
self.restart_autoware_pub.publish(msg)

0 commit comments

Comments
 (0)