Merge branch 'mads-hkg-main-race' into master-dev-c3

This commit is contained in:
Jason Wen
2024-08-10 11:00:18 -04:00
+2 -2
View File
@@ -248,8 +248,8 @@ class CarInterface(CarInterfaceBase):
self.CS.accEnabled = True
if self.enable_mads:
if not self.CS.prev_mads_enabled and self.CS.mads_enabled and \
(any(b.type == ButtonType.altButton3 for b in self.CS.button_events) and not self.CP.pcmCruise):
if not self.CS.prev_mads_enabled and self.CS.mads_enabled and (self.CP.pcmCruise or
(any(b.type == ButtonType.altButton3 for b in self.CS.button_events) and not self.CP.pcmCruise)):
self.CS.madsEnabled = True
if any(b.type == ButtonType.altButton1 and b.pressed for b in self.CS.button_events):
self.CS.madsEnabled = not self.CS.madsEnabled