|
|
@ -309,9 +309,9 @@ class CarState(CarStateBase): |
|
|
|
ret.cruiseState.standstill = cp.vl["ACC_HUD"]['CRUISE_SPEED'] == 252. |
|
|
|
ret.cruiseState.standstill = cp.vl["ACC_HUD"]['CRUISE_SPEED'] == 252. |
|
|
|
ret.cruiseState.speedOffset = calc_cruise_offset(0, ret.vEgo) |
|
|
|
ret.cruiseState.speedOffset = calc_cruise_offset(0, ret.vEgo) |
|
|
|
if self.CP.carFingerprint in (CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.ACCORDH, CAR.CRV_HYBRID, CAR.INSIGHT): |
|
|
|
if self.CP.carFingerprint in (CAR.CIVIC_BOSCH, CAR.CIVIC_BOSCH_DIESEL, CAR.ACCORDH, CAR.CRV_HYBRID, CAR.INSIGHT): |
|
|
|
ret.brakePressed = cp.vl["POWERTRAIN_DATA"]['BRAKE_PRESSED'] != 0 or \ |
|
|
|
ret.brakePressed = bool(cp.vl["POWERTRAIN_DATA"]['BRAKE_PRESSED'] or |
|
|
|
(self.brake_switch and self.brake_switch_prev and |
|
|
|
(self.brake_switch and self.brake_switch_prev and |
|
|
|
cp.ts["POWERTRAIN_DATA"]['BRAKE_SWITCH'] != self.brake_switch_ts) |
|
|
|
cp.ts["POWERTRAIN_DATA"]['BRAKE_SWITCH'] != self.brake_switch_ts)) |
|
|
|
self.brake_switch_prev = self.brake_switch |
|
|
|
self.brake_switch_prev = self.brake_switch |
|
|
|
self.brake_switch_ts = cp.ts["POWERTRAIN_DATA"]['BRAKE_SWITCH'] |
|
|
|
self.brake_switch_ts = cp.ts["POWERTRAIN_DATA"]['BRAKE_SWITCH'] |
|
|
|
else: |
|
|
|
else: |
|
|
|