From 4948aecc6e428de565f4bd840ce1e82bd35ce569 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 9 Feb 2024 16:29:56 -0600 Subject: [PATCH] wip --- selfdrive/car/hyundai/carcontroller.py | 8 ++++++-- selfdrive/car/hyundai/hyundaicanfd.py | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/hyundai/carcontroller.py b/selfdrive/car/hyundai/carcontroller.py index 93f39cc..619bfab 100644 --- a/selfdrive/car/hyundai/carcontroller.py +++ b/selfdrive/car/hyundai/carcontroller.py @@ -135,6 +135,8 @@ class CarController: if hda2 and self.CP.flags & HyundaiFlags.ENABLE_BLINKERS: can_sends.extend(hyundaicanfd.create_spas_messages(self.packer, self.CAN, self.frame, CC.leftBlinker, CC.rightBlinker)) + # can_sends.append(hyundaicanfd.create_misc_messages(self.packer, self.CAN, self.frame)) + if self.CP.openpilotLongitudinalControl: if hda2: can_sends.extend(hyundaicanfd.create_adrv_messages(self.packer, self.CAN, self.frame)) @@ -209,7 +211,6 @@ class CarController: def create_button_messages(self, CC: car.CarControl, CS: car.CarState, use_clu11: bool): can_sends = [] - # Test me. # can_sends.append(hyundaicanfd.create_buttons(self.packer, self.CP, self.CAN, 1, Buttons.RES_ACCEL)) @@ -234,9 +235,12 @@ class CarController: if (self.frame - self.last_button_frame) * DT_CTRL > 0.25: if CS.oscar_lane_center_btn_pressed: - CS.oscar_lane_center_btn_pressed= False + CS.oscar_lane_center_btn_pressed = False # CC.cruiseControl.resume = True CC.cruiseControl.cancel = True + # Test this... + # ?? can_sends.append(hyundaicanfd.create_acc_control(self.packer, self.CAN, CC.enabled, self.accel_last, accel, stopping, CC.cruiseControl.override, + # set_speed_in_units, CS.personality_profile)) # cruise cancel if CC.cruiseControl.cancel: diff --git a/selfdrive/car/hyundai/hyundaicanfd.py b/selfdrive/car/hyundai/hyundaicanfd.py index 639870a..674ed22 100644 --- a/selfdrive/car/hyundai/hyundaicanfd.py +++ b/selfdrive/car/hyundai/hyundaicanfd.py @@ -152,7 +152,6 @@ def create_acc_control(packer, CAN, enabled, accel_last, accel, stopping, gas_ov return packer.make_can_msg("SCC_CONTROL", CAN.ECAN, values) - def create_spas_messages(packer, CAN, frame, left_blink, right_blink): ret = []