Merge branch 'SP-138-cslc-gm' into master-dev-c3

This commit is contained in:
Jason Wen
2024-07-11 21:47:26 -04:00
+1 -1
View File
@@ -239,7 +239,7 @@ class CarController(CarControllerBase):
# multikyd methods, sunnyhaibin logic
def get_cruise_buttons_status(self, CS):
if not CS.out.cruiseState.enabled or CS.cruise_buttons != CruiseButtons.UNPRESS or CS.cruise_buttons != CruiseButtons.INIT:
if not CS.out.cruiseState.enabled or CS.cruise_buttons != CruiseButtons.UNPRESS:
self.timer = 40
elif self.timer:
self.timer -= 1