mawei/onepilot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui/map: slight turn lane types (#29446)

Browse Source 
* add slight turns

* bump cereal

* revert

* hmm, i like this better

* whops

* fix

* bump
old-commit-hash: 6d2922b8e6f6ef29b6d17ea7a1c3d16b40e2236f
This commit is contained in:
Shane Smiskol
2023-08-17 20:51:52 -07:00
committed by GitHub
parent 5530871c0e
commit 593322dfa9
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cereal

Submodule cereal updated: 2077dd1a1b...1ee48e0110

BIN
selfdrive/assets/navigation/direction_turn_slight_left_inactive.png LFS Normal file
View File

Binary file not shown.

BIN
selfdrive/assets/navigation/direction_turn_slight_right_inactive.png LFS Normal file
View File

Binary file not shown.

7
selfdrive/navd/helpers.py
View File

@@ -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'

2
selfdrive/ui/qt/maps/map_instructions.h
View File

@@ -11,6 +11,8 @@ static std::map<cereal::NavInstruction::Direction, QString> 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 {