diff --git a/selfdrive/car/honda/carcontroller.py b/selfdrive/car/honda/carcontroller.py index 3635a9e1e0..bd5488bd31 100644 --- a/selfdrive/car/honda/carcontroller.py +++ b/selfdrive/car/honda/carcontroller.py @@ -153,8 +153,7 @@ class CarController(): can_sends.append(hondacan.create_bosch_supplemental_1(self.packer, CS.CP.carFingerprint, idx)) # If using stock ACC, spam cancel command to kill gas when OP disengages. if pcm_cancel_cmd: - # can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.CANCEL, idx, CS.CP.carFingerprint)) - pass + can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.CANCEL, idx, CS.CP.carFingerprint)) elif CS.out.cruiseState.standstill: can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.RES_ACCEL, idx, CS.CP.carFingerprint)) diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index 86c39b1246..b144552b0b 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -144,6 +144,9 @@ class CarInterface(CarInterfaceBase): ret.enableCruise = not ret.enableGasInterceptor ret.communityFeature = ret.enableGasInterceptor + if not ret.openpilotLongitudinalControl: # make sure if car is controlling ACC that we don't have pedal, I'm not sure how Honda works + assert ret.enableCruise + # Certain Hondas have an extra steering sensor at the bottom of the steering rack, # which improves controls quality as it removes the steering column torsion from feedback. # Tire stiffness factor fictitiously lower if it includes the steering column torsion effect.