mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-08-22 02:33:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Jason Wen
2024-09-16 10:19:54 -04:00
parent 29c143e6ee
commit 45739d199c
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sunnypilot/controls/lib/custom_stock_longitudinal_controller/controllers.py
-1
View File
@@ -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]()
sunnypilot/selfdrive/car/chrysler/custom_stock_longitudinal_controller/controller.py
+2 -2
View File
@@ -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
sunnypilot/selfdrive/car/chrysler/custom_stock_longitudinal_controller/helpers.py
+3 -8
View File
@@ -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)