|
|
@ -595,7 +595,7 @@ class Controls: |
|
|
|
CC.enabled = self.enabled |
|
|
|
CC.enabled = self.enabled |
|
|
|
# Check which actuators can be enabled |
|
|
|
# Check which actuators can be enabled |
|
|
|
CC.latActive = self.active and not CS.steerFaultTemporary and not CS.steerFaultPermanent and \ |
|
|
|
CC.latActive = self.active and not CS.steerFaultTemporary and not CS.steerFaultPermanent and \ |
|
|
|
CS.vEgo > self.CP.minSteerSpeed and not CS.standstill |
|
|
|
CS.vEgo > self.CP.minSteerSpeed and not CS.standstill |
|
|
|
CC.longActive = self.active and not self.events.any(ET.OVERRIDE_LONGITUDINAL) and self.CP.openpilotLongitudinalControl |
|
|
|
CC.longActive = self.active and not self.events.any(ET.OVERRIDE_LONGITUDINAL) and self.CP.openpilotLongitudinalControl |
|
|
|
|
|
|
|
|
|
|
|
actuators = CC.actuators |
|
|
|
actuators = CC.actuators |
|
|
@ -718,7 +718,7 @@ class Controls: |
|
|
|
|
|
|
|
|
|
|
|
recent_blinker = (self.sm.frame - self.last_blinker_frame) * DT_CTRL < 5.0 # 5s blinker cooldown |
|
|
|
recent_blinker = (self.sm.frame - self.last_blinker_frame) * DT_CTRL < 5.0 # 5s blinker cooldown |
|
|
|
ldw_allowed = self.is_ldw_enabled and CS.vEgo > LDW_MIN_SPEED and not recent_blinker \ |
|
|
|
ldw_allowed = self.is_ldw_enabled and CS.vEgo > LDW_MIN_SPEED and not recent_blinker \ |
|
|
|
and not CC.latActive and self.sm['liveCalibration'].calStatus == Calibration.CALIBRATED |
|
|
|
and not CC.latActive and self.sm['liveCalibration'].calStatus == Calibration.CALIBRATED |
|
|
|
|
|
|
|
|
|
|
|
model_v2 = self.sm['modelV2'] |
|
|
|
model_v2 = self.sm['modelV2'] |
|
|
|
desire_prediction = model_v2.meta.desirePrediction |
|
|
|
desire_prediction = model_v2.meta.desirePrediction |
|
|
|