sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui.cc: replace s->scene with scene (#20045)

Browse Source 
old-commit-hash: 204add6952
commatwo_master
Dean Lee 5 years ago committed by GitHub
parent eae5fb2e7b
commit 0aa14e0b72
1 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      selfdrive/ui/ui.cc

22
selfdrive/ui/ui.cc
Unescape View File

@ -178,8 +178,8 @@ static void update_sockets(UIState *s) {
} }
if (sm.updated("driverMonitoringState")) { if (sm.updated("driverMonitoringState")) {
scene.dmonitoring_state = sm["driverMonitoringState"].getDriverMonitoringState(); scene.dmonitoring_state = sm["driverMonitoringState"].getDriverMonitoringState();
if(!s->scene.frontview && !s->ignition) { if(!scene.frontview && !s->ignition) {
read_param(&s->scene.frontview, "IsDriverViewEnabled"); read_param(&scene.frontview, "IsDriverViewEnabled");
} }
} else if ((sm.frame - sm.rcv_frame("driverMonitoringState")) > UI_FREQ/2) { } else if ((sm.frame - sm.rcv_frame("driverMonitoringState")) > UI_FREQ/2) {
scene.frontview = false; scene.frontview = false;
@ -195,7 +195,7 @@ static void update_sockets(UIState *s) {
} }
} }
} }
s->started = s->scene.thermal.getStarted() || s->scene.frontview; s->started = scene.thermal.getStarted() || scene.frontview;
} }
static void update_alert(UIState *s) { static void update_alert(UIState *s) {
@ -217,23 +217,23 @@ static void update_alert(UIState *s) {
} }
// Handle controls timeout // Handle controls timeout
if (s->scene.thermal.getStarted() && (s->sm->frame - s->started_frame) > 10 * UI_FREQ) { if (scene.thermal.getStarted() && (s->sm->frame - s->started_frame) > 10 * UI_FREQ) {
const uint64_t cs_frame = s->sm->rcv_frame("controlsState"); const uint64_t cs_frame = s->sm->rcv_frame("controlsState");
if (cs_frame < s->started_frame) { if (cs_frame < s->started_frame) {
// car is started, but controlsState hasn't been seen at all // car is started, but controlsState hasn't been seen at all
s->scene.alert_text1 = "openpilot Unavailable"; scene.alert_text1 = "openpilot Unavailable";
s->scene.alert_text2 = "Waiting for controls to start"; scene.alert_text2 = "Waiting for controls to start";
s->scene.alert_size = cereal::ControlsState::AlertSize::MID; scene.alert_size = cereal::ControlsState::AlertSize::MID;
} else if ((s->sm->frame - cs_frame) > 5 * UI_FREQ) { } else if ((s->sm->frame - cs_frame) > 5 * UI_FREQ) {
// car is started, but controls is lagging or died // car is started, but controls is lagging or died
if (s->scene.alert_text2 != "Controls Unresponsive") { if (scene.alert_text2 != "Controls Unresponsive") {
s->sound->play(AudibleAlert::CHIME_WARNING_REPEAT); s->sound->play(AudibleAlert::CHIME_WARNING_REPEAT);
LOGE("Controls unresponsive"); LOGE("Controls unresponsive");
} }
s->scene.alert_text1 = "TAKE CONTROL IMMEDIATELY"; scene.alert_text1 = "TAKE CONTROL IMMEDIATELY";
s->scene.alert_text2 = "Controls Unresponsive"; scene.alert_text2 = "Controls Unresponsive";
s->scene.alert_size = cereal::ControlsState::AlertSize::FULL; scene.alert_size = cereal::ControlsState::AlertSize::FULL;
s->status = STATUS_ALERT; s->status = STATUS_ALERT;
} }
} }

Write Preview
Loading…
Cancel
Save