Merge branch 'mads-hkg-available-fix' into master-dev-c3

# Conflicts:
#	selfdrive/car/hyundai/interface.py
This commit is contained in:
Jason Wen
2024-07-29 15:46:37 -04:00
+2
View File
@@ -218,6 +218,8 @@ class CarInterface(CarInterfaceBase):
self.CS.mads_enabled = self.get_sp_cruise_main_state(ret, self.CS)
self.CS.mads_enabled = self.get_sp_cruise_main_state(ret, self.CS)
self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, self.CS.accEnabled,
self.CS.button_events, c.vCruise)