|
|
|
@ -128,10 +128,14 @@ def get_can_signals(CP): |
|
|
|
|
("MAIN_ON", "SCM_BUTTONS", 0)] |
|
|
|
|
elif CP.carFingerprint in (CAR.CRV, CAR.CRV_EU, CAR.ACURA_RDX, CAR.PILOT_2019, CAR.RIDGELINE): |
|
|
|
|
signals += [("MAIN_ON", "SCM_BUTTONS", 0)] |
|
|
|
|
elif CP.carFingerprint in (CAR.FIT, CAR.HRV): |
|
|
|
|
elif CP.carFingerprint == CAR.FIT: |
|
|
|
|
signals += [("CAR_GAS", "GAS_PEDAL_2", 0), |
|
|
|
|
("MAIN_ON", "SCM_BUTTONS", 0), |
|
|
|
|
("BRAKE_HOLD_ACTIVE", "VSA_STATUS", 0)] |
|
|
|
|
elif CP.carFingerprint == CAR.HRV: |
|
|
|
|
signals += [("CAR_GAS", "GAS_PEDAL",0), |
|
|
|
|
("MAIN_ON", "SCM_BUTTONS", 0), |
|
|
|
|
("BRAKE_HOLD_ACTIVE", "VSA_STATUS", 0)] |
|
|
|
|
elif CP.carFingerprint == CAR.ODYSSEY: |
|
|
|
|
signals += [("MAIN_ON", "SCM_FEEDBACK", 0), |
|
|
|
|
("EPB_STATE", "EPB_STATUS", 0)] |
|
|
|
@ -243,7 +247,7 @@ class CarState(CarStateBase): |
|
|
|
|
|
|
|
|
|
self.pedal_gas = cp.vl["POWERTRAIN_DATA"]['PEDAL_GAS'] |
|
|
|
|
# crv doesn't include cruise control |
|
|
|
|
if self.CP.carFingerprint in (CAR.CRV, CAR.CRV_EU, CAR.ODYSSEY, CAR.ACURA_RDX, CAR.RIDGELINE, CAR.PILOT_2019, CAR.ODYSSEY_CHN): |
|
|
|
|
if self.CP.carFingerprint in (CAR.CRV, CAR.CRV_EU, CAR.HRV, CAR.ODYSSEY, CAR.ACURA_RDX, CAR.RIDGELINE, CAR.PILOT_2019, CAR.ODYSSEY_CHN): |
|
|
|
|
ret.gas = self.pedal_gas / 256. |
|
|
|
|
else: |
|
|
|
|
ret.gas = cp.vl["GAS_PEDAL_2"]['CAR_GAS'] / 256. |
|
|
|
|