From bdbd16c902fc5325288ae183257871ee6ef41465 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Wed, 29 May 2024 23:42:00 -0400 Subject: [PATCH] Fix upstream merge conflicts --- selfdrive/car/__init__.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/selfdrive/car/__init__.py b/selfdrive/car/__init__.py index 73354470b8..77e42bfb66 100644 --- a/selfdrive/car/__init__.py +++ b/selfdrive/car/__init__.py @@ -314,10 +314,6 @@ class Platforms(str, ReprEnum, metaclass=PlatformsType): def with_flags(cls, flags: IntFlag) -> set['Platforms']: return {p for p in cls if p.config.flags & flags} - @classmethod - def without_flags(cls, flags: IntFlag) -> set['Platforms']: - return {p for p in cls if not (p.config.flags & flags)} - @classmethod def with_sp_flags(cls, spFlags: IntFlag) -> set['Platforms']: return {p for p in cls if p.config.spFlags & spFlags} @@ -325,15 +321,3 @@ class Platforms(str, ReprEnum, metaclass=PlatformsType): @classmethod def without_sp_flags(cls, spFlags: IntFlag) -> set['Platforms']: return {p for p in cls if not (p.config.spFlags & spFlags)} - - @classmethod - def print_debug(cls, flags): - platforms_with_flag = defaultdict(list) - for flag in flags: - for platform in cls: - if platform.config.flags & flag: - assert flag.name is not None - platforms_with_flag[flag.name].append(platform) - - for flag, platforms in platforms_with_flag.items(): - print(f"{flag:32s}: {', '.join(p.name for p in platforms)}")