spacecruft/nopenpilot
spacecruft/nopenpilot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove read_param_timeout (#2095)

Browse source 
* remove read_param_timeout

* missed that
This commit is contained in:
Adeeb Shihadeh 2020-08-27 19:24:51 -07:00 committed by GitHub
parent 9731e7a0d7
commit 9cd5180b43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
selfdrive/ui/android_ui.cc
View file

@ -308,9 +308,11 @@ int main(int argc, char* argv[]) {
ui_draw_vision_alert(s, s->scene.alert_size, s->status, s->scene.alert_text1.c_str(), s->scene.alert_text2.c_str());
}
read_param_timeout(&s->is_metric, "IsMetric", &s->is_metric_timeout);
int param_read = read_param_timeout(&s->last_athena_ping, "LastAthenaPingTime", &s->last_athena_ping_timeout);
if (param_read != -1) { // Param was updated this loop
if (s->sm->frame % (2*UI_FREQ) == 0) {
read_param(&s->is_metric, "IsMetric");
} else if (s->sm->frame % (3*UI_FREQ) == 0) {
int param_read = read_param(&s->last_athena_ping, "LastAthenaPingTime");
if (param_read != 0) { // Failed to read param
s->scene.athenaStatus = NET_DISCONNECTED;
} else if (nanos_since_boot() - s->last_athena_ping < 70e9) {

1
selfdrive/ui/ui.cc
View file

@ -68,7 +68,6 @@ static void ui_init_vision(UIState *s, const VisionStreamBufs back_bufs,
read_param(&s->is_metric, "IsMetric");
read_param(&s->longitudinal_control, "LongitudinalControl");
s->is_metric_timeout = UI_FREQ;
}
void update_status(UIState *s, int status) {

16
selfdrive/ui/ui.hpp
View file

@ -211,11 +211,7 @@ typedef struct UIState {
UIScene scene;
bool awake;
// timeouts
int awake_timeout;
int is_metric_timeout;
int last_athena_ping_timeout;
bool controls_seen;
uint64_t last_athena_ping;
@ -276,15 +272,3 @@ int read_param(T* param, const char *param_name, bool persistent_param = false){
}
return result;
}
template <class T>
int read_param_timeout(T* param, const char* param_name, int* timeout, bool persistent_param = false) {
int result = -1;
if (*timeout > 0){
(*timeout)--;
} else {
*timeout = 2 * UI_FREQ; // 0.5Hz
result = read_param(param, param_name, persistent_param);
}
return result;
}