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 0000000000..37f1f83627 Binary files /dev/null and b/selfdrive/assets/navigation/direction_turn_slight_left_inactive.png differ 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 0000000000..8be2245811 Binary files /dev/null and b/selfdrive/assets/navigation/direction_turn_slight_right_inactive.png differ 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 {