Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
fred-labs committed Jun 6, 2019
1 parent f2dc51e commit b864da9
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions carla_ros_bridge/src/carla_ros_bridge/ego_vehicle.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,13 @@ def __init__(self, carla_actor, parent):

self.control_subscriber = rospy.Subscriber(
self.topic_name() + "/vehicle_control_cmd",
CarlaEgoVehicleControl, lambda data: self.control_command_updated(data, manual_override=False))
CarlaEgoVehicleControl,
lambda data: self.control_command_updated(data, manual_override=False))

self.manual_control_subscriber = rospy.Subscriber(
self.topic_name() + "/vehicle_control_cmd_manual",
CarlaEgoVehicleControl, lambda data: self.control_command_updated(data, manual_override=True))
CarlaEgoVehicleControl,
lambda data: self.control_command_updated(data, manual_override=True))

self.control_override_subscriber = rospy.Subscriber(
self.topic_name() + "/vehicle_control_manual_override",
Expand Down Expand Up @@ -192,6 +194,7 @@ def destroy(self):

def control_command_override(self, enable):
"""
Set the vehicle control mode according to ros topic
"""
self.vehicle_control_override = enable.data

Expand Down

0 comments on commit b864da9

Please sign in to comment.