Merge pull request #248 from arne182/chryselermad

Chryselermad
arne182 · Apr 29, 2019 · 26deb17 · 26deb17
2 parents 41d9d17 + 7bb24fc
commit 26deb17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/selfdrive/car/chrysler/carstate.py b/selfdrive/car/chrysler/carstate.py
@@ -163,7 +163,7 @@ def init_ui_buttons(self):
     btns = []
     btns.append(UIButton("sound", "SND", 0, "", 0))
     btns.append(UIButton("alca", "ALC", 0, self.alcaLabels[self.alcaMode], 1))
-    btns.append(UIButton("","",0,"",2))
+    btns.append(UIButton("mad","",0,"MAD",2))
     btns.append(UIButton("","",0,"",3))
     btns.append(UIButton("gas","GAS",1,self.gasLabels[self.gasMode],4))
     btns.append(UIButton("lka","LKA",1,"",5))

diff --git a/selfdrive/car/chrysler/interface.py b/selfdrive/car/chrysler/interface.py
@@ -251,8 +251,9 @@ def update(self, c):
 
     # disable on gas pedal and speed isn't zero. Gas pedal is used to resume ACC
     # from a 3+ second stop.
-    if (ret.gasPressed and (not self.gas_pressed_prev) and ret.vEgo > 2.0):
-      events.append(create_event('pedalPressed', [ET.NO_ENTRY, ET.USER_DISABLE]))
+    if self.CS.cstm_btns.get_button_status("mad") == 0:
+      if (ret.gasPressed and (not self.gas_pressed_prev) and ret.vEgo > 2.0):
+        events.append(create_event('pedalPressed', [ET.NO_ENTRY, ET.USER_DISABLE]))
 
     if self.low_speed_alert:
       events.append(create_event('belowSteerSpeed', [ET.WARNING]))