From bb41d2e3866c32ba58a414accbf04da961ed0cec Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Thu, 16 May 2024 22:22:21 -0400 Subject: [PATCH] CSLC: Hyundai: Fix upstream conflicts --- selfdrive/car/hyundai/carcontroller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/car/hyundai/carcontroller.py b/selfdrive/car/hyundai/carcontroller.py index 4c891fbe81..173694d116 100644 --- a/selfdrive/car/hyundai/carcontroller.py +++ b/selfdrive/car/hyundai/carcontroller.py @@ -269,11 +269,11 @@ class CarController(CarControllerBase): # send resume at a max freq of 10Hz if (self.frame - self.last_button_frame) * DT_CTRL > 0.1 * send_freq: # send 25 messages at a time to increases the likelihood of cruise buttons being accepted - can_sends.extend([hyundaican.create_clu11(self.packer, self.frame, CS.clu11, self.cruise_button, self.CP.carFingerprint)] * 25) + can_sends.extend([hyundaican.create_clu11(self.packer, self.frame, CS.clu11, self.cruise_button, self.CP)] * 25) if (self.frame - self.last_button_frame) * DT_CTRL >= 0.15 * send_freq: self.last_button_frame = self.frame elif self.frame % 2 == 0: - can_sends.extend([hyundaican.create_clu11(self.packer, (self.frame // 2) + 1, CS.clu11, self.cruise_button, self.CP.carFingerprint)] * 25) + can_sends.extend([hyundaican.create_clu11(self.packer, (self.frame // 2) + 1, CS.clu11, self.cruise_button, self.CP)] * 25) # Parse lead distance from radarState and display the corresponding distance in the car's cluster if self.CP.openpilotLongitudinalControl and self.sm.updated['radarState'] and self.frame % 5 == 0: