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

Kilometers per hour now displayed as km/h (#2032)

Browse Source 
Fixes #2031

Signed-off-by: Christopher Rabotin <christopher.rabotin@gmail.com>
old-commit-hash: 1b52930a52
vw-mqb-aeb
Chris 5 years ago committed by GitHub
parent 34da7ee9c8
commit 42538fd54b
2 changed files with 3 additions and 3 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. 4
      selfdrive/controls/lib/events.py
  2. 2
      selfdrive/ui/paint.cc

4
selfdrive/controls/lib/events.py
Unescape View File

@ -176,7 +176,7 @@ class EngagementAlert(Alert):
def below_steer_speed_alert(CP, sm, metric): def below_steer_speed_alert(CP, sm, metric):
speed = int(round(CP.minSteerSpeed * (CV.MS_TO_KPH if metric else CV.MS_TO_MPH))) 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( return Alert(
"TAKE CONTROL", "TAKE CONTROL",
"Steer Unavailable Below %d %s" % (speed, unit), "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): def calibration_incomplete_alert(CP, sm, metric):
speed = int(Filter.MIN_SPEED * (CV.MS_TO_KPH if metric else CV.MS_TO_MPH)) 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( return Alert(
"Calibration in Progress: %d%%" % sm['liveCalibration'].calPerc, "Calibration in Progress: %d%%" % sm['liveCalibration'].calPerc,
"Drive Above %d %s" % (speed, unit), "Drive Above %d %s" % (speed, unit),

2
selfdrive/ui/paint.cc
Unescape View File

@ -516,7 +516,7 @@ static void ui_draw_vision_speed(UIState *s) {
snprintf(speed_str, sizeof(speed_str), "%d", (int)speed); 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, 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) { static void ui_draw_vision_event(UIState *s) {

Write Preview
Loading…
Cancel
Save