fix speed too low (#1628)

Adeeb 2020-06-02 18:40:39 -07:00 committed by GitHub
parent 682dc5ddad
commit db7ea2a599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 6 deletions

View File

@ -106,6 +106,7 @@ struct CarEvent @0x9b1657f34caf3ad3 {
whitePandaUnsupported @81;
startupWhitePanda @82;
canErrorPersistent @83;
belowEngageSpeed @84;
}
}

View File

@ -149,7 +149,7 @@ class CarInterface(CarInterfaceBase):
events = self.create_common_events(ret, pcm_enable=False)
if ret.vEgo < self.CP.minEnableSpeed:
events.add(EventName.speedTooLow)
events.add(EventName.belowEngageSpeed)
if self.CS.park_brake:
events.add(EventName.parkBrake)
if ret.cruiseState.standstill:

View File

@ -476,12 +476,12 @@ class CarInterface(CarInterfaceBase):
events.add(EventName.parkBrake)
if self.CP.enableCruise and ret.vEgo < self.CP.minEnableSpeed:
events.add(EventName.speedTooLow)
events.add(EventName.belowEngageSpeed)
# it can happen that car cruise disables while comma system is enabled: need to
# keep braking if needed or if the speed is very low
if self.CP.enableCruise and not ret.cruiseState.enabled \
and (c.actuators.brake <= 0. or not self.CP.openpilotLongitudinalControl) and (self.CP.minEnableSpeed > 0):
and (c.actuators.brake <= 0. or not self.CP.openpilotLongitudinalControl):
# non loud alert if cruise disables below 25mph as expected (+ a little margin)
if ret.vEgo < self.CP.minEnableSpeed + 2.:
events.add(EventName.speedTooLow)

View File

@ -78,7 +78,7 @@ class CarInterface(CarInterfaceBase):
events = self.create_common_events(ret)
if self.CS.low_speed_lockout:
events.add(EventName.speedTooLow)
events.add(EventName.belowEngageSpeed)
if self.CS.low_speed_alert:
events.add(EventName.belowSteerSpeed)

View File

@ -323,7 +323,7 @@ class CarInterface(CarInterfaceBase):
if self.CS.low_speed_lockout and self.CP.openpilotLongitudinalControl:
events.add(EventName.lowSpeedLockout)
if ret.vEgo < self.CP.minEnableSpeed and self.CP.openpilotLongitudinalControl:
events.add(EventName.speedTooLow)
events.add(EventName.belowEngageSpeed)
if c.actuators.gas > 0.1:
# some margin on the actuator to not false trigger cancellation while stopping
events.add(EventName.speedTooLow)

View File

@ -503,6 +503,10 @@ EVENTS = {
duration_hud_alert=0.),
},
EventName.belowEngageSpeed: {
ET.NO_ENTRY: NoEntryAlert("Speed Too Low"),
},
EventName.sensorDataInvalid: {
ET.PERMANENT: Alert(
"No Data from Device Sensors",
@ -677,7 +681,6 @@ EVENTS = {
"Speed too low",
AlertStatus.normal, AlertSize.mid,
Priority.HIGH, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
ET.NO_ENTRY: NoEntryAlert("Speed Too Low"),
},
EventName.speedTooHigh: {