Revert "change it up (#76)" (#77)

This reverts commit ab6116776b.
This commit is contained in:
Jason Wen
2023-05-28 17:39:31 -04:00
committed by GitHub
parent ab6116776b
commit ef5d612475
+4 -3
View File
@@ -571,7 +571,9 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
static float last_lead_distance = -1;
const float lead_distance = radar_state.getLeadOne().getDRel();
if (s.scene.e2eX[12] > 30 && car_state.getVEgo() < 1.0) {
if (!s.scene.e2e_long_alert_ui) {
e2eLStatus = 0;
} else if (s.scene.e2eX[12] > 30 && car_state.getVEgo() < 1.0) {
e2eLStatus = 2;
} else if ((s.scene.e2eX[12] > 0 && s.scene.e2eX[12] < 80) || s.scene.e2eX[12] < 0) {
e2eLStatus = 1;
@@ -599,8 +601,7 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
if (radar_state.getLeadOne().getStatus()) {
if ((last_lead_distance == -1) || (lead_distance < last_lead_distance)) {
last_lead_distance = lead_distance;
}
if (s.scene.e2e_long_alert_lead && (lead_distance - last_lead_distance > 1.0) && !chime_sent) {
} else if (s.scene.e2e_long_alert_lead && (lead_distance - last_lead_distance > 1.0) && !chime_sent) {
chime_prompt = 2;
chime_sent = true;
} else {