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

Merge branch 'master-priv' into master-priv-ford

Browse Source
This commit is contained in:
Jason Wen
2024-06-27 00:35:51 -04:00
parent cb23843162 3442e8b65f
commit 0341490541
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/chrysler/interface.py
+1 -1
View File
@@ -129,7 +129,7 @@ class CarInterface(CarInterfaceBase):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
if self.get_sp_pedal_disengage(ret):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
ret.cruiseState.enabled = False if self.CP.pcmCruise else self.CS.accEnabled
ret.cruiseState.enabled = ret.cruiseState.enabled if not self.enable_mads else False if self.CP.pcmCruise else self.CS.accEnabled
if self.CP.pcmCruise and self.CP.minEnableSpeed > 0 and self.CP.pcmCruiseSpeed:
if ret.gasPressed and not ret.cruiseState.enabled:
selfdrive/car/ford/interface.py
+1 -1
View File
@@ -108,7 +108,7 @@ class CarInterface(CarInterfaceBase):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
if self.get_sp_pedal_disengage(ret):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
ret.cruiseState.enabled = False if self.CP.pcmCruise else self.CS.accEnabled
ret.cruiseState.enabled = ret.cruiseState.enabled if not self.enable_mads else False if self.CP.pcmCruise else self.CS.accEnabled
if self.CP.pcmCruise and self.CP.minEnableSpeed > 0 and self.CP.pcmCruiseSpeed:
if ret.gasPressed and not ret.cruiseState.enabled:
selfdrive/car/gm/interface.py
+1 -1
View File
@@ -238,7 +238,7 @@ class CarInterface(CarInterfaceBase):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
if self.get_sp_pedal_disengage(ret):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
ret.cruiseState.enabled = False if self.CP.pcmCruise else self.CS.accEnabled
ret.cruiseState.enabled = ret.cruiseState.enabled if not self.enable_mads else False if self.CP.pcmCruise else self.CS.accEnabled
if self.CP.pcmCruise and self.CP.minEnableSpeed > 0 and self.CP.pcmCruiseSpeed:
if ret.gasPressed and not ret.cruiseState.enabled:
selfdrive/car/honda/interface.py
+1 -1
View File
@@ -293,7 +293,7 @@ class CarInterface(CarInterfaceBase):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
if self.get_sp_pedal_disengage(ret):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
ret.cruiseState.enabled = False if self.CP.pcmCruise else self.CS.accEnabled
ret.cruiseState.enabled = ret.cruiseState.enabled if not self.enable_mads else False if self.CP.pcmCruise else self.CS.accEnabled
if self.CP.pcmCruise and self.CP.minEnableSpeed > 0 and self.CP.pcmCruiseSpeed:
if ret.gasPressed and not ret.cruiseState.enabled:
selfdrive/car/hyundai/interface.py
+1 -1
View File
@@ -238,7 +238,7 @@ class CarInterface(CarInterfaceBase):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
if self.get_sp_pedal_disengage(ret):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
ret.cruiseState.enabled = False if self.CP.pcmCruise else self.CS.accEnabled
ret.cruiseState.enabled = ret.cruiseState.enabled if not self.enable_mads else False if self.CP.pcmCruise else self.CS.accEnabled
ret, self.CS = self.get_sp_common_state(ret, self.CS, gap_button=(self.CS.cruise_buttons[-1] == 3))
selfdrive/car/mazda/interface.py
+1 -1
View File
@@ -70,7 +70,7 @@ class CarInterface(CarInterfaceBase):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
if self.get_sp_pedal_disengage(ret):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
ret.cruiseState.enabled = False if self.CP.pcmCruise else self.CS.accEnabled
ret.cruiseState.enabled = ret.cruiseState.enabled if not self.enable_mads else False if self.CP.pcmCruise else self.CS.accEnabled
if self.CP.pcmCruise and self.CP.minEnableSpeed > 0 and self.CP.pcmCruiseSpeed:
if ret.gasPressed and not ret.cruiseState.enabled:
selfdrive/car/nissan/interface.py
+1 -1
View File
@@ -49,7 +49,7 @@ class CarInterface(CarInterfaceBase):
if (not ret.cruiseState.enabled and self.CS.out.cruiseState.enabled) or \
self.get_sp_pedal_disengage(ret):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
ret.cruiseState.enabled = False if self.CP.pcmCruise else self.CS.accEnabled
ret.cruiseState.enabled = ret.cruiseState.enabled if not self.enable_mads else False if self.CP.pcmCruise else self.CS.accEnabled
ret, self.CS = self.get_sp_common_state(ret, self.CS, gap_button=bool(self.CS.distance_button))
selfdrive/car/subaru/interface.py
+1 -1
View File
@@ -141,7 +141,7 @@ class CarInterface(CarInterfaceBase):
self.CS.madsEnabled = False
if self.get_sp_pedal_disengage(ret):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
ret.cruiseState.enabled = False if self.CP.pcmCruise else self.CS.accEnabled
ret.cruiseState.enabled = ret.cruiseState.enabled if not self.enable_mads else False if self.CP.pcmCruise else self.CS.accEnabled
ret, self.CS = self.get_sp_common_state(ret, self.CS)
selfdrive/car/volkswagen/interface.py
+1 -1
View File
@@ -148,7 +148,7 @@ class CarInterface(CarInterfaceBase):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
if self.get_sp_pedal_disengage(ret):
self.CS.madsEnabled, self.CS.accEnabled = self.get_sp_cancel_cruise_state(self.CS.madsEnabled)
ret.cruiseState.enabled = False if self.CP.pcmCruise else self.CS.accEnabled
ret.cruiseState.enabled = ret.cruiseState.enabled if not self.enable_mads else False if self.CP.pcmCruise else self.CS.accEnabled
if self.CP.pcmCruise and self.CP.minEnableSpeed > 0 and self.CP.pcmCruiseSpeed:
if ret.gasPressed and not ret.cruiseState.enabled: