From b499ada25ee2b32b2ec18224ea443e565afae452 Mon Sep 17 00:00:00 2001 From: menwenliang Date: Thu, 26 Nov 2020 16:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=83=A8=E5=88=86=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=92=8C=E6=81=A2=E5=A4=8D=E5=8E=9F=E6=9C=89=E9=83=A8?= =?UTF-8?q?=E5=88=86dp=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- selfdrive/car/honda/carcontroller.py | 7 ++----- selfdrive/car/honda/carstate.py | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/selfdrive/car/honda/carcontroller.py b/selfdrive/car/honda/carcontroller.py index c482fcf43..368e2ffd0 100644 --- a/selfdrive/car/honda/carcontroller.py +++ b/selfdrive/car/honda/carcontroller.py @@ -203,17 +203,14 @@ class CarController(): can_sends.append( hondacan.spam_buttons_command(self.packer, CruiseButtons.RES_ACCEL, idx, CS.CP.carFingerprint, CS.CP.isPandaBlack)) - # print("spamming") - # print(self.stopped_lead_distance, CS.lead_distance, rough_lead_speed) elif CS.CP.carFingerprint in (CAR.CIVIC_BOSCH, CAR.CRV_HYBRID): if CS.hud_lead == 1: can_sends.append( hondacan.spam_buttons_command(self.packer, CruiseButtons.RES_ACCEL, idx, CS.CP.carFingerprint, CS.CP.isPandaBlack)) else: - can_sends.append( - hondacan.spam_buttons_command(self.packer, CruiseButtons.RES_ACCEL, idx, CS.CP.carFingerprint, - CS.CP.isPandaBlack)) + + can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.RES_ACCEL, idx, CS.CP.carFingerprint,CS.CP.isPandaBlack)) else: self.stopped_lead_distance = CS.lead_distance self.prev_lead_distance = CS.lead_distance diff --git a/selfdrive/car/honda/carstate.py b/selfdrive/car/honda/carstate.py index a43456616..cd16e21f8 100644 --- a/selfdrive/car/honda/carstate.py +++ b/selfdrive/car/honda/carstate.py @@ -111,7 +111,7 @@ def get_can_signals(CP): signals += [("DRIVERS_DOOR_OPEN", "SCM_FEEDBACK", 1), ("LEAD_DISTANCE", "RADAR_HUD", 0)] checks += [("RADAR_HUD", 50)] - elif CP.carFingerprint in (CAR.CIVIC_BOSCH, CAR.CRV_HYBRID, CAR.CIVIC_BOSCH_DIESEL): + elif CP.carFingerprint in (CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.ACURA_RDX_3G): signals += [("DRIVERS_DOOR_OPEN", "SCM_FEEDBACK", 1)] checks += [("RADAR_HUD", 50)] elif CP.carFingerprint == CAR.ODYSSEY_CHN: @@ -201,7 +201,7 @@ class CarState(CarStateBase): ret.standstill = cp.vl["ENGINE_DATA"]['XMISSION_SPEED'] < 0.1 ret.doorOpen = bool(cp.vl["SCM_FEEDBACK"]['DRIVERS_DOOR_OPEN']) self.lead_distance = cp.vl["RADAR_HUD"]['LEAD_DISTANCE'] - elif self.CP.carFingerprint in (CAR.CIVIC_BOSCH, CAR.CRV_HYBRID, CAR.CIVIC_BOSCH_DIESEL): + elif self.CP.carFingerprint in (CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.CRV_HYBRID, CAR.ACURA_RDX_3G): ret.standstill = cp.vl["ENGINE_DATA"]['XMISSION_SPEED'] < 0.1 ret.doorOpen = bool(cp.vl["SCM_FEEDBACK"]['DRIVERS_DOOR_OPEN']) elif self.CP.carFingerprint == CAR.ODYSSEY_CHN: