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

Merge branch 'mads-button-event-modern' into master-dev-c3

Browse Source
This commit is contained in:
Jason Wen
2024-07-20 20:54:03 -04:00
parent 0ff60c8adf b62682f108
commit 499654cb3b
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/chrysler/interface.py
+1 -1
View File
@@ -139,7 +139,7 @@ class CarInterface(CarInterfaceBase):
ret.buttonEvents = [
*ret.buttonEvents,
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled, self.mads_event_lock) # MADS BUTTON
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled) # MADS BUTTON
]
# events
selfdrive/car/ford/interface.py
+1 -1
View File
@@ -119,7 +119,7 @@ class CarInterface(CarInterfaceBase):
ret.buttonEvents = [
*ret.buttonEvents,
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled, self.mads_event_lock) # MADS BUTTON
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled) # MADS BUTTON
]
events = self.create_common_events(ret, c, extra_gears=[GearShifter.manumatic], pcm_enable=False)
selfdrive/car/gm/interface.py
+1 -1
View File
@@ -253,7 +253,7 @@ class CarInterface(CarInterfaceBase):
ret.buttonEvents = [
*ret.buttonEvents,
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled, self.mads_event_lock) # MADS BUTTON
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled) # MADS BUTTON
]
# The ECM allows enabling on falling edge of set, but only rising edge of resume
selfdrive/car/honda/interface.py
+1 -1
View File
@@ -305,7 +305,7 @@ class CarInterface(CarInterfaceBase):
ret.buttonEvents = [
*ret.buttonEvents,
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled, self.mads_event_lock) # MADS BUTTON
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled) # MADS BUTTON
]
# events
selfdrive/car/hyundai/interface.py
+1 -1
View File
@@ -249,7 +249,7 @@ class CarInterface(CarInterfaceBase):
ret.buttonEvents = [
*ret.buttonEvents,
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled, self.mads_event_lock) # MADS BUTTON
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled) # MADS BUTTON
]
# On some newer model years, the CANCEL button acts as a pause/resume button based on the PCM state
selfdrive/car/mazda/interface.py
+1 -1
View File
@@ -75,7 +75,7 @@ class CarInterface(CarInterfaceBase):
ret.buttonEvents = [
*ret.buttonEvents,
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled, self.mads_event_lock) # MADS BUTTON
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled) # MADS BUTTON
]
# events
selfdrive/car/nissan/interface.py
+1 -1
View File
@@ -56,7 +56,7 @@ class CarInterface(CarInterfaceBase):
ret.buttonEvents = [
*self.CS.button_events,
*self.button_events.create_cancel_event(ret.cruiseState.enabled, self.CS.out.cruiseState.enabled),
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled, self.mads_event_lock) # MADS BUTTON
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled) # MADS BUTTON
]
events = self.create_common_events(ret, c, extra_gears=[GearShifter.sport, GearShifter.low, GearShifter.brake],
selfdrive/car/subaru/interface.py
+1 -1
View File
@@ -146,7 +146,7 @@ class CarInterface(CarInterfaceBase):
ret.buttonEvents = [
*self.CS.button_events,
*self.button_events.create_cancel_event(ret.cruiseState.enabled, self.CS.out.cruiseState.enabled),
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled, self.mads_event_lock) # MADS BUTTON
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled) # MADS BUTTON
]
events = self.create_common_events(ret, c, extra_gears=[GearShifter.sport, GearShifter.low], pcm_enable=False)
selfdrive/car/toyota/interface.py
+1 -1
View File
@@ -247,7 +247,7 @@ class CarInterface(CarInterfaceBase):
ret.buttonEvents = [
*ret.buttonEvents,
*self.button_events.create_cancel_event(ret.cruiseState.enabled, self.CS.out.cruiseState.enabled),
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled, self.mads_event_lock) # MADS BUTTON
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled) # MADS BUTTON
]
# events
selfdrive/car/volkswagen/interface.py
+1 -1
View File
@@ -146,7 +146,7 @@ class CarInterface(CarInterfaceBase):
ret.buttonEvents = [
*ret.buttonEvents,
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled, self.mads_event_lock) # MADS BUTTON
*self.button_events.create_mads_event(self.CS.madsEnabled, self.CS.out.madsEnabled) # MADS BUTTON
]
events = self.create_common_events(ret, c, extra_gears=[GearShifter.eco, GearShifter.sport, GearShifter.manumatic],