diff --git a/selfdrive/ui/paint.cc b/selfdrive/ui/paint.cc index 83e1f4edd..7d0cbf722 100644 --- a/selfdrive/ui/paint.cc +++ b/selfdrive/ui/paint.cc @@ -813,28 +813,20 @@ static void ui_draw_infobar(UIState *s) { localtime_r(&rawtime, &timeinfo); strftime(date_time, sizeof(date_time),"%D %T", &timeinfo); - // Create temp string - char temp[6]; - snprintf(temp, sizeof(temp), "%02.0f°C", s->scene.pa0); - - // create battery percentage string - char battery[4]; - snprintf(battery, sizeof(battery), "%02d%%", s->scene.batteryPercent); - if (s->dragon_ui_dev_mini) { char rel_steer[9]; - snprintf(rel_steer, sizeof(rel_steer), "%s%05.1f°", s->scene.angleSteers < 0? "-" : "+", fabs(s->scene.angleSteers)); + snprintf(rel_steer, sizeof(rel_steer), "%s% 5.1f°", s->scene.angleSteers < 0? "-" : "+", fabs(s->scene.angleSteers)); char des_steer[9]; if (s->scene.engaged) { - snprintf(des_steer, sizeof(des_steer), "%s%05.1f°", s->scene.angleSteersDes < 0? "-" : "+", fabs(s->scene.angleSteersDes)); + snprintf(des_steer, sizeof(des_steer), "%s% 5.1f°", s->scene.angleSteersDes < 0? "-" : "+", fabs(s->scene.angleSteersDes)); } else { snprintf(des_steer, sizeof(des_steer), "%7s", "-"); } char lead_dist[8]; if (s->scene.lead_status) { - snprintf(lead_dist, sizeof(lead_dist), "%06.2fm", s->scene.lead_d_rel); + snprintf(lead_dist, sizeof(lead_dist), "% 6.2fm", s->scene.lead_d_rel); } else { snprintf(lead_dist, sizeof(lead_dist), "%7s", "-"); } @@ -842,10 +834,8 @@ static void ui_draw_infobar(UIState *s) { snprintf( infobar, sizeof(infobar), - "%s /TMP: %s /BAT: %s /REL: %s /DES: %s /DIS: %s", + "%s /REL: %s /DES: %s /DIS: %s", date_time, - temp, - battery, rel_steer, des_steer, lead_dist @@ -854,10 +844,8 @@ static void ui_draw_infobar(UIState *s) { snprintf( infobar, sizeof(infobar), - "%s /TMP: %s /BAT: %s", - date_time, - temp, - battery + "%s", + date_time ); } @@ -1297,11 +1285,11 @@ void ui_nvg_init(UIState *s) { s->font_courbd = nvgCreateFont(s->vg, "courbd", "../assets/fonts/courbd.ttf"); assert(s->font_courbd >= 0); - s->font_sans_regular = nvgCreateFont(s->vg, "sans-regular", "../../dragonpilot/chinese-fonts/NotoSansCJKtc-Regular.otf"); + s->font_sans_regular = nvgCreateFont(s->vg, "sans-regular", "../assets/fonts/opensans_regular.ttf"); assert(s->font_sans_regular >= 0); - s->font_sans_semibold = nvgCreateFont(s->vg, "sans-semibold", "../../dragonpilot/chinese-fonts/NotoSansCJKtc-Medium.otf"); + s->font_sans_semibold = nvgCreateFont(s->vg, "sans-semibold", "../assets/fonts/opensans_semibold.ttf"); assert(s->font_sans_semibold >= 0); - s->font_sans_bold = nvgCreateFont(s->vg, "sans-bold", "../../dragonpilot/chinese-fonts/NotoSansCJKtc-Bold.otf"); + s->font_sans_bold = nvgCreateFont(s->vg, "sans-bold", "../assets/fonts/opensans_bold.ttf"); assert(s->font_sans_bold >= 0); assert(s->img_wheel >= 0); diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 9c1371325..2f21ef6b2 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -113,7 +113,6 @@ static void ui_init(UIState *s) { s->livecalibration_sock = SubSocket::create(s->ctx, "liveCalibration"); s->radarstate_sock = SubSocket::create(s->ctx, "radarState"); s->carstate_sock = SubSocket::create(s->ctx, "carState"); - s->thermal_sock = SubSocket::create(s->ctx, "thermal"); assert(s->model_sock != NULL); assert(s->controlsstate_sock != NULL); @@ -121,7 +120,6 @@ static void ui_init(UIState *s) { assert(s->livecalibration_sock != NULL); assert(s->radarstate_sock != NULL); assert(s->carstate_sock != NULL); - assert(s->thermal_sock != NULL); s->poller = Poller::create({ s->model_sock, @@ -129,8 +127,7 @@ static void ui_init(UIState *s) { s->uilayout_sock, s->livecalibration_sock, s->radarstate_sock, - s->carstate_sock, - s->thermal_sock + s->carstate_sock }); #ifdef SHOW_SPEEDLIMIT @@ -240,20 +237,20 @@ static void ui_init_vision(UIState *s, const VisionStreamBufs back_bufs, s->limit_set_speed_timeout = UI_FREQ; // dragonpilot, 1hz - s->dragon_ui_speed_timeout = 100; - s->dragon_ui_event_timeout = 100; - s->dragon_ui_maxspeed_timeout = 100; - s->dragon_ui_face_timeout = 100; - s->dragon_ui_dev_timeout = 100; - s->dragon_ui_dev_mini_timeout = 100; - s->dragon_enable_dashcam_timeout = 100; - s->dragon_ui_volume_boost_timeout = 100; - s->dragon_driving_ui_timeout = 100; - s->dragon_ui_lane_timeout = 100; - s->dragon_ui_lead_timeout = 100; - s->dragon_ui_path_timeout = 100; - s->dragon_ui_blinker_timeout = 100; - s->dragon_waze_mode_timeout = 100; + s->dragon_ui_speed_timeout = UI_FREQ * 3.1; + s->dragon_ui_event_timeout = UI_FREQ * 3.2; + s->dragon_ui_maxspeed_timeout = UI_FREQ * 3.3; + s->dragon_ui_face_timeout = UI_FREQ * 3.4; + s->dragon_ui_dev_timeout = UI_FREQ * 3.5; + s->dragon_ui_dev_mini_timeout = UI_FREQ * 3.6; + s->dragon_enable_dashcam_timeout = UI_FREQ * 3.7; + s->dragon_ui_volume_boost_timeout = UI_FREQ * 3.8; + s->dragon_driving_ui_timeout = UI_FREQ * 3.9; + s->dragon_ui_lane_timeout = UI_FREQ * 4.0; + s->dragon_ui_lead_timeout = UI_FREQ * 4.1; + s->dragon_ui_path_timeout = UI_FREQ * 4.2; + s->dragon_ui_blinker_timeout = UI_FREQ * 4.3; + s->dragon_waze_mode_timeout = UI_FREQ * 4.4; } static PathData read_path(cereal_ModelData_PathData_ptr pathp) { @@ -484,12 +481,6 @@ void handle_message(UIState *s, Message * msg) { } s->scene.leftBlinker = datad.leftBlinker; s->scene.rightBlinker = datad.rightBlinker; - } else if (eventd.which == cereal_Event_thermal) { - struct cereal_ThermalData datad; - cereal_read_ThermalData(&datad, eventd.thermal); - - s->scene.batteryPercent = datad.batteryPercent; - s->scene.pa0 = datad.pa0; } capn_free(&ctx); } diff --git a/selfdrive/ui/ui.hpp b/selfdrive/ui/ui.hpp index 8b63cdd35..0f09c4e16 100644 --- a/selfdrive/ui/ui.hpp +++ b/selfdrive/ui/ui.hpp @@ -122,8 +122,6 @@ typedef struct UIScene { // for minimal UI float angleSteersDes; float angleSteers; - float pa0; - int batteryPercent; // for blinker, from kegman bool leftBlinker; @@ -257,7 +255,6 @@ typedef struct UIState { // dragonpilot SubSocket *carstate_sock; - SubSocket *thermal_sock; int dragon_ui_speed_timeout; int dragon_ui_event_timeout; int dragon_ui_maxspeed_timeout;