diff --git a/selfdrive/ui/lib/fingerprint_catalog.py b/selfdrive/ui/lib/fingerprint_catalog.py index dee410178..38d19667f 100644 --- a/selfdrive/ui/lib/fingerprint_catalog.py +++ b/selfdrive/ui/lib/fingerprint_catalog.py @@ -42,7 +42,7 @@ FINGERPRINT_MAKE_TO_VALUES_DIR = { _FINGERPRINT_CARDOCS_RE = re.compile(r'\w*CarDocs\(\s*"([^"]+)"') _FINGERPRINT_PLATFORM_RE = re.compile(r'(\w+)\s*=\s*\w+\s*\(\s*\[([\s\S]*?)\]\s*,') _FINGERPRINT_PLATFORM_NAME_RE = re.compile(r'^[A-Z0-9_]+$') -_FINGERPRINT_VALID_NAME_RE = re.compile(r'^[A-Za-z0-9 \u0160.()\-]+$') +_FINGERPRINT_VALID_NAME_RE = re.compile(r'^[A-Za-z0-9 \u0160.(),&\-]+$') @dataclass(frozen=True) diff --git a/starpilot/system/the_galaxy/the_galaxy.py b/starpilot/system/the_galaxy/the_galaxy.py index 17c54935b..df2f99218 100644 --- a/starpilot/system/the_galaxy/the_galaxy.py +++ b/starpilot/system/the_galaxy/the_galaxy.py @@ -678,7 +678,7 @@ FINGERPRINT_MAKE_TO_VALUES_DIR = { _FINGERPRINT_CARDOCS_RE = re.compile(r'\w*CarDocs\(\s*"([^"]+)"') _FINGERPRINT_PLATFORM_RE = re.compile(r'(\w+)\s*=\s*\w+\s*\(\s*\[([\s\S]*?)\]\s*,') _FINGERPRINT_PLATFORM_NAME_RE = re.compile(r'^[A-Z0-9_]+$') -_FINGERPRINT_VALID_NAME_RE = re.compile(r'^[A-Za-z0-9 \u0160.()\-]+$') +_FINGERPRINT_VALID_NAME_RE = re.compile(r'^[A-Za-z0-9 \u0160.(),&\-]+$') _openpilot_root_cache = None _fingerprint_catalog_cache = None