From 3e9b67a5148c2f4db0f06d1e0e8a026104855e33 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Fri, 4 Aug 2023 11:09:20 -0700 Subject: [PATCH] bump panda (#29234) * bump panda * bump old-commit-hash: 7949dfe796298502b38feb0d5a9f017993e70605 --- panda | 2 +- tools/replay/can_replay.py | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/panda b/panda index feef2e6c71..1950ba6f83 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit feef2e6c71bed5fc6d60000330eb86ba05367666 +Subproject commit 1950ba6f83b2ccf31a609fb6eca6aed5e4840252 diff --git a/tools/replay/can_replay.py b/tools/replay/can_replay.py index 52666c4db0..f749dad519 100755 --- a/tools/replay/can_replay.py +++ b/tools/replay/can_replay.py @@ -8,20 +8,11 @@ from tqdm import tqdm os.environ['FILEREADER_CACHE'] = '1' -from common.basedir import BASEDIR from common.realtime import config_realtime_process, Ratekeeper, DT_CTRL from selfdrive.boardd.boardd import can_capnp_to_can_list from tools.plotjuggler.juggle import load_segment from tools.lib.logreader import logreader_from_route_or_segment -from panda import Panda - -try: - # this bool can be replaced when mypy understands this pattern - panda_jungle_imported = True - from panda_jungle import PandaJungle # pylint: disable=import-error # type: ignore -except ImportError: - PandaJungle = None - panda_jungle_imported = False +from panda import Panda, PandaJungle def send_thread(s, flock): @@ -94,10 +85,6 @@ if __name__ == "__main__": parser.add_argument("route_or_segment_name", nargs='?', help="The route or segment name to replay. If not specified, a default public route will be used.") args = parser.parse_args() - if not panda_jungle_imported: - print("\33[31m", "WARNING: cannot connect to jungles. Clone the jungle library to enable support:", "\033[0m") - print("\033[34m", f"cd {BASEDIR} && git clone https://github.com/commaai/panda_jungle", "\033[0m") - print("Loading log...") if args.route_or_segment_name is None: ROUTE = "77611a1fac303767/2020-03-24--09-50-38"