Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.
Draft
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
9 changes: 5 additions & 4 deletions code/acting/src/acting/acc.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from ros_compatibility.node import CompatibleNode
from ros_compatibility.qos import QoSProfile, DurabilityPolicy
from rospy import Publisher, Subscriber, Duration
from sensor_msgs.msg import Range
from simple_pid import PID
from std_msgs.msg import Float32, Bool

Expand All @@ -22,8 +23,8 @@ def __init__(self):
self.role_name = self.get_param('role_name', 'ego_vehicle')

self.dist_sub: Subscriber = self.new_subscription(
Float32,
f"/paf/{self.role_name}/acc_distance",
Range,
"/carla/hero/LIDAR_range",
self.__get_current_dist,
qos_profile=1)

Expand Down Expand Up @@ -137,8 +138,8 @@ def loop(timer_event=None):
self.new_timer(self.control_loop_rate, loop)
self.spin()

def __get_current_dist(self, data: Float32):
self.__dist = data.data
def __get_current_dist(self, data: Range):
self.__dist = data.range
self.__dist_last_received_at = rospy.get_rostime()

def __get_velocity(self, data: CarlaSpeedometer):
Expand Down