GAC: check state properly (commaai#181)

opgm · Jun 25, 2023 · 8eb936d · 8eb936d
1 parent afb4462
commit 8eb936d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py
@@ -473,7 +473,7 @@ def get_sp_distance(self, gac_tr, gac_max, gac_dict=None):
     return next((key for key, value in gac_dict.items() if value == gac_tr), gac_max)
 
   def toggle_gac(self, cs_out, CS, gac_button, gac_min, gac_max, gac_default, inc_dec):
-    if not (self.CP.openpilotLongitudinalControl or self.gac):
+    if not self.CP.openpilotLongitudinalControl or not self.gac:
       cs_out.gapAdjustCruiseTr = 4
       CS.gac_tr = gac_default
       return

diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py
@@ -279,7 +279,7 @@ def _update(self, c):
               (self.CS.prev_lkas_enabled == 1 and not self.CS.lkas_enabled):
               self.CS.madsEnabled = not self.CS.madsEnabled
         self.CS.madsEnabled = self.get_acc_mads(ret.cruiseState.enabled, self.CS.accEnabled, self.CS.madsEnabled)
-      if not (self.CP.openpilotLongitudinalControl or self.gac):
+      if not self.CP.openpilotLongitudinalControl or not self.gac:
         ret.gapAdjustCruiseTr = 3
       else:
         if self.gac_min != 1: