From 6d2922b8e6f6ef29b6d17ea7a1c3d16b40e2236f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 17 Aug 2023 20:51:52 -0700 Subject: [PATCH] ui/map: slight turn lane types (#29446) * add slight turns * bump cereal * revert * hmm, i like this better * whops * fix * bump --- cereal | 2 +- .../direction_turn_slight_left_inactive.png | Bin 0 -> 3696 bytes .../direction_turn_slight_right_inactive.png | Bin 0 -> 3743 bytes selfdrive/navd/helpers.py | 7 ++++++- selfdrive/ui/qt/maps/map_instructions.h | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 selfdrive/assets/navigation/direction_turn_slight_left_inactive.png create mode 100644 selfdrive/assets/navigation/direction_turn_slight_right_inactive.png diff --git a/cereal b/cereal index 2077dd1a1b..1ee48e0110 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit 2077dd1a1b0054713102aee8197434f8cfa07de7 +Subproject commit 1ee48e0110a46fbdd9db50ed89a38bb5a748cfcb diff --git a/selfdrive/assets/navigation/direction_turn_slight_left_inactive.png b/selfdrive/assets/navigation/direction_turn_slight_left_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..37f1f83627230de134165009353608a9605ac4e8 GIT binary patch literal 3696 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 E0lb8=pa1{> literal 0 HcmV?d00001 diff --git a/selfdrive/assets/navigation/direction_turn_slight_right_inactive.png b/selfdrive/assets/navigation/direction_turn_slight_right_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..8be224581142f30d8c48fe22e8832d61f63d6261 GIT binary patch literal 3743 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 literal 0 HcmV?d00001 diff --git a/selfdrive/navd/helpers.py b/selfdrive/navd/helpers.py index 050c571923..5957816334 100644 --- a/selfdrive/navd/helpers.py +++ b/selfdrive/navd/helpers.py @@ -8,6 +8,9 @@ from common.conversions import Conversions from common.numpy_fast import clip from common.params import Params +DIRECTIONS = ('left', 'right', 'straight') +MODIFIABLE_DIRECTIONS = ('left', 'right') + EARTH_MEAN_RADIUS = 6371007.2 SPEED_CONVERSIONS = { 'km/h': Conversions.KPH_TO_MS, @@ -119,8 +122,10 @@ def coordinate_from_param(param: str, params: Optional[Params] = None) -> Option def string_to_direction(direction: str) -> str: - for d in ['left', 'right', 'straight']: + for d in DIRECTIONS: if d in direction: + if 'slight' in direction and d in MODIFIABLE_DIRECTIONS: + return 'slight' + d.capitalize() return d return 'none' diff --git a/selfdrive/ui/qt/maps/map_instructions.h b/selfdrive/ui/qt/maps/map_instructions.h index 26bcb4d580..163c223a2d 100644 --- a/selfdrive/ui/qt/maps/map_instructions.h +++ b/selfdrive/ui/qt/maps/map_instructions.h @@ -11,6 +11,8 @@ static std::map DIRECTIONS = { {cereal::NavInstruction::Direction::LEFT, "left"}, {cereal::NavInstruction::Direction::RIGHT, "right"}, {cereal::NavInstruction::Direction::STRAIGHT, "straight"}, + {cereal::NavInstruction::Direction::SLIGHT_LEFT, "slight_left"}, + {cereal::NavInstruction::Direction::SLIGHT_RIGHT, "slight_right"}, }; class MapInstructions : public QWidget {