Remove unneeded code and move flag

opgm · Aug 10, 2024 · c9205dc · c9205dc
1 parent c06460f
commit c9205dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/selfdrive/car/gm/carcontroller.py b/selfdrive/car/gm/carcontroller.py
@@ -189,9 +189,7 @@ def update(self, CC, CS, now_nanos):
         can_sends += gmcan.create_adas_keepalive(CanBus.POWERTRAIN)
 
       # TODO: integrate this with the code block below?
-      if (
-          (self.CP.flags & GMFlags.PEDAL_LONG.value)  # Always cancel stock CC when using pedal interceptor
-          or (self.CP.flags & GMFlags.CC_LONG.value and not CC.enabled)  # Cancel stock CC if OP is not active
+      if ((self.CP.flags & GMFlags.PEDAL_LONG.value)  # Always cancel stock CC when using pedal interceptor
       ) and CS.out.cruiseState.enabled:
         if (self.frame - self.last_button_frame) * DT_CTRL > 0.04:
           self.last_button_frame = self.frame

diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py
@@ -261,10 +261,10 @@ def _get_params(ret, candidate, fingerprint, car_fw, experimental_long, docs):
 
     elif candidate in CC_ONLY_CAR:
       ret.experimentalLongitudinalAvailable = True
-      ret.flags |= GMFlags.CC_LONG.value
       ret.safetyConfigs[0].safetyParam |= Panda.FLAG_GM_CC_LONG
       if experimental_long:
         ret.openpilotLongitudinalControl = True
+        ret.flags |= GMFlags.CC_LONG.value
       ret.radarUnavailable = True
       ret.minEnableSpeed = 24 * CV.MPH_TO_MS
       ret.pcmCruise = True