From 45739d199cc16a7888dca243762e1de6f56225a2 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Mon, 16 Sep 2024 10:19:54 -0400 Subject: [PATCH] fixes --- .../controllers.py | 1 - .../controller.py | 4 ++-- .../custom_stock_longitudinal_controller/helpers.py | 11 +++-------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/sunnypilot/controls/lib/custom_stock_longitudinal_controller/controllers.py b/sunnypilot/controls/lib/custom_stock_longitudinal_controller/controllers.py index 0ed2045668..7bccb2a3e8 100644 --- a/sunnypilot/controls/lib/custom_stock_longitudinal_controller/controllers.py +++ b/sunnypilot/controls/lib/custom_stock_longitudinal_controller/controllers.py @@ -109,7 +109,6 @@ class CustomStockLongitudinalControllerBase(ABC): ready = CS.cruiseState.enabled and not CC.cruiseControl.cancel and not CC.cruiseControl.resume button_pressed = any(self.cruise_buttons[k] > 0 for k in self.cruise_buttons) - self.is_ready = ready and not button_pressed self.cruise_button = self.button_states[self.button_state]() diff --git a/sunnypilot/selfdrive/car/chrysler/custom_stock_longitudinal_controller/controller.py b/sunnypilot/selfdrive/car/chrysler/custom_stock_longitudinal_controller/controller.py index 03a1438c35..37a34f9a06 100644 --- a/sunnypilot/selfdrive/car/chrysler/custom_stock_longitudinal_controller/controller.py +++ b/sunnypilot/selfdrive/car/chrysler/custom_stock_longitudinal_controller/controller.py @@ -25,8 +25,8 @@ class CustomStockLongitudinalController(CustomStockLongitudinalControllerBase): if self.cruise_button is not None: if ram_cars: - can_sends.append(helpers.create_cruise_buttons(self.car_controller.packer, self.car_state.button_counter, das_bus, self.CP, self.cruise_button)) + can_sends.append(helpers.create_cruise_buttons(self.car_controller.packer, self.car_state.button_counter, das_bus, self.cruise_button)) elif button_counter_offset is not None: - can_sends.append(helpers.create_cruise_buttons(self.car_controller.packer, self.car_state.button_counter + button_counter_offset, das_bus, self.CP, self.cruise_button)) + can_sends.append(helpers.create_cruise_buttons(self.car_controller.packer, self.car_state.button_counter + button_counter_offset, das_bus, self.cruise_button)) return can_sends diff --git a/sunnypilot/selfdrive/car/chrysler/custom_stock_longitudinal_controller/helpers.py b/sunnypilot/selfdrive/car/chrysler/custom_stock_longitudinal_controller/helpers.py index 3ecea45509..779929d3f6 100644 --- a/sunnypilot/selfdrive/car/chrysler/custom_stock_longitudinal_controller/helpers.py +++ b/sunnypilot/selfdrive/car/chrysler/custom_stock_longitudinal_controller/helpers.py @@ -1,14 +1,9 @@ -def create_cruise_buttons(packer, frame, bus, CP, buttons=0): - - acc_accel = 1 if buttons == 1 else 0 - acc_decel = 1 if buttons == 2 else 0 +def create_cruise_buttons(packer, frame, bus, buttons=0): values = { - "ACC_Accel": acc_accel, - "ACC_Decel": acc_decel, + "ACC_Accel": 1 if buttons == 1 else 0, + "ACC_Decel": 1 if buttons == 2 else 0, "COUNTER": frame % 0x10, } - if buttons == 0 and not (cancel or resume) and CP.carFingerprint in RAM_CARS: - values = cruise_buttons_msg.copy() return packer.make_can_msg("CRUISE_BUTTONS", bus, values)