From 1b52930a52828b1423c59c677c9b42a5ff76125c Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 17 Aug 2020 03:16:52 -0600 Subject: [PATCH] Kilometers per hour now displayed as km/h (#2032) Fixes #2031 Signed-off-by: Christopher Rabotin --- selfdrive/controls/lib/events.py | 4 ++-- selfdrive/ui/paint.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py index 205c6a1722..193efc8c63 100644 --- a/selfdrive/controls/lib/events.py +++ b/selfdrive/controls/lib/events.py @@ -176,7 +176,7 @@ class EngagementAlert(Alert): def below_steer_speed_alert(CP, sm, metric): speed = int(round(CP.minSteerSpeed * (CV.MS_TO_KPH if metric else CV.MS_TO_MPH))) - unit = "kph" if metric else "mph" + unit = "km/h" if metric else "mph" return Alert( "TAKE CONTROL", "Steer Unavailable Below %d %s" % (speed, unit), @@ -185,7 +185,7 @@ def below_steer_speed_alert(CP, sm, metric): def calibration_incomplete_alert(CP, sm, metric): speed = int(Filter.MIN_SPEED * (CV.MS_TO_KPH if metric else CV.MS_TO_MPH)) - unit = "kph" if metric else "mph" + unit = "km/h" if metric else "mph" return Alert( "Calibration in Progress: %d%%" % sm['liveCalibration'].calPerc, "Drive Above %d %s" % (speed, unit), diff --git a/selfdrive/ui/paint.cc b/selfdrive/ui/paint.cc index 8802526cb8..dbddd50149 100644 --- a/selfdrive/ui/paint.cc +++ b/selfdrive/ui/paint.cc @@ -516,7 +516,7 @@ static void ui_draw_vision_speed(UIState *s) { snprintf(speed_str, sizeof(speed_str), "%d", (int)speed); ui_draw_text(s->vg, viz_speed_x + viz_speed_w / 2, 240, speed_str, 96*2.5, COLOR_WHITE, s->font_sans_bold); - ui_draw_text(s->vg, viz_speed_x + viz_speed_w / 2, 320, s->is_metric?"kph":"mph", 36*2.5, COLOR_WHITE_ALPHA(200), s->font_sans_regular); + ui_draw_text(s->vg, viz_speed_x + viz_speed_w / 2, 320, s->is_metric?"km/h":"mph", 36*2.5, COLOR_WHITE_ALPHA(200), s->font_sans_regular); } static void ui_draw_vision_event(UIState *s) {