From 954449372446051292027cf2a4f33551828e2b6f Mon Sep 17 00:00:00 2001 From: Arne Schwarck Date: Wed, 18 Dec 2019 09:45:17 +0100 Subject: [PATCH 1/6] use list( instead of keys() --- selfdrive/debug/can_compare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/debug/can_compare.py b/selfdrive/debug/can_compare.py index 1559a89eb7b019..34256e04f477ac 100755 --- a/selfdrive/debug/can_compare.py +++ b/selfdrive/debug/can_compare.py @@ -47,7 +47,7 @@ def can_compare(bus=0, max_msg=None, addr="127.0.0.1"): dd = chr(27) for k,v in sorted(zip(msgs.keys(), map(lambda x: binascii.hexlify(x[-1]), msgs.values()))): try: - if binascii.hexlify(msgs2.values()[msgs2.keys().index(k)][-1]) != binascii.hexlify(msgs3.values()[msgs3.keys().index(k)][-1]) and v == binascii.hexlify(msgs3.values()[msgs3.keys().index(k)][-1]): + if binascii.hexlify(msgs2.values()[list(msgs2).index(k)][-1]) != binascii.hexlify(msgs3.values()[list(msgs3).index(k)][-1]) and v == binascii.hexlify(msgs3.values()[list(msgs3).index(k)][-1]): dd +="%s %s\n" % ("%04X(%4d)" % (k,k), v.decode('ascii')) w = binascii.hexlify(msgs2.values()[msgs2.keys().index(k)][-1]).decode('ascii') dd +="%s %s\n" % ("%04X(%4d)" % (k,k), w.decode('ascii')) From 043db6b4aaf599d95adbea7215dd4b9f175ef28d Mon Sep 17 00:00:00 2001 From: Arne Schwarck Date: Wed, 18 Dec 2019 09:46:19 +0100 Subject: [PATCH 2/6] Missed one keys() to list( --- selfdrive/debug/can_compare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/debug/can_compare.py b/selfdrive/debug/can_compare.py index 34256e04f477ac..0c689a1e6e996a 100755 --- a/selfdrive/debug/can_compare.py +++ b/selfdrive/debug/can_compare.py @@ -49,7 +49,7 @@ def can_compare(bus=0, max_msg=None, addr="127.0.0.1"): try: if binascii.hexlify(msgs2.values()[list(msgs2).index(k)][-1]) != binascii.hexlify(msgs3.values()[list(msgs3).index(k)][-1]) and v == binascii.hexlify(msgs3.values()[list(msgs3).index(k)][-1]): dd +="%s %s\n" % ("%04X(%4d)" % (k,k), v.decode('ascii')) - w = binascii.hexlify(msgs2.values()[msgs2.keys().index(k)][-1]).decode('ascii') + w = binascii.hexlify(msgs2.values()[list(msgs2).index(k)][-1]).decode('ascii') dd +="%s %s\n" % ("%04X(%4d)" % (k,k), w.decode('ascii')) except ValueError: pass From c44370028ade38be6b9c5fdb552939f6086a0728 Mon Sep 17 00:00:00 2001 From: Arne Schwarck Date: Wed, 18 Dec 2019 10:03:37 +0100 Subject: [PATCH 3/6] even values needs to be a list --- selfdrive/debug/can_compare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/debug/can_compare.py b/selfdrive/debug/can_compare.py index 0c689a1e6e996a..b29d3f8c4757a4 100755 --- a/selfdrive/debug/can_compare.py +++ b/selfdrive/debug/can_compare.py @@ -47,7 +47,7 @@ def can_compare(bus=0, max_msg=None, addr="127.0.0.1"): dd = chr(27) for k,v in sorted(zip(msgs.keys(), map(lambda x: binascii.hexlify(x[-1]), msgs.values()))): try: - if binascii.hexlify(msgs2.values()[list(msgs2).index(k)][-1]) != binascii.hexlify(msgs3.values()[list(msgs3).index(k)][-1]) and v == binascii.hexlify(msgs3.values()[list(msgs3).index(k)][-1]): + if binascii.hexlify(list(msgs2.values())[list(msgs2).index(k)][-1]) != binascii.hexlify(list(msgs3.values())[list(msgs3).index(k)][-1]) and v == binascii.hexlify(list(msgs3.values())[list(msgs3).index(k)][-1]): dd +="%s %s\n" % ("%04X(%4d)" % (k,k), v.decode('ascii')) w = binascii.hexlify(msgs2.values()[list(msgs2).index(k)][-1]).decode('ascii') dd +="%s %s\n" % ("%04X(%4d)" % (k,k), w.decode('ascii')) From 93324a0384d4b48fdc09a2922c0fe8b3d00a28bb Mon Sep 17 00:00:00 2001 From: Arne Schwarck Date: Wed, 18 Dec 2019 10:14:18 +0100 Subject: [PATCH 4/6] Add same dd structure as can_printer --- selfdrive/debug/can_compare.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/selfdrive/debug/can_compare.py b/selfdrive/debug/can_compare.py index b29d3f8c4757a4..1b5752fa990c8e 100755 --- a/selfdrive/debug/can_compare.py +++ b/selfdrive/debug/can_compare.py @@ -44,13 +44,14 @@ def can_compare(bus=0, max_msg=None, addr="127.0.0.1"): for y in x.can: if y.src == canbus: msgs3[y.address].append(y.dat) - dd = chr(27) + dd = chr(27) + "[2J" + dd += "%5.2f\n" % (sec_since_boot() - start) for k,v in sorted(zip(msgs.keys(), map(lambda x: binascii.hexlify(x[-1]), msgs.values()))): try: if binascii.hexlify(list(msgs2.values())[list(msgs2).index(k)][-1]) != binascii.hexlify(list(msgs3.values())[list(msgs3).index(k)][-1]) and v == binascii.hexlify(list(msgs3.values())[list(msgs3).index(k)][-1]): - dd +="%s %s\n" % ("%04X(%4d)" % (k,k), v.decode('ascii')) + dd += "%s(%6d) %s\n" % ("%04X(%4d)" % (k,k),len(msgs[k]), v.decode('ascii')) w = binascii.hexlify(msgs2.values()[list(msgs2).index(k)][-1]).decode('ascii') - dd +="%s %s\n" % ("%04X(%4d)" % (k,k), w.decode('ascii')) + dd +="%s(%6d) %s\n" % ("%04X(%4d)" % (k,k),len(msgs[k]), w.decode('ascii')) except ValueError: pass print(dd) From 77d3ade13e2b59ef367bfbdb9a684e9e87bf1e2b Mon Sep 17 00:00:00 2001 From: Arne Schwarck Date: Wed, 18 Dec 2019 11:01:30 +0100 Subject: [PATCH 5/6] This might work now --- selfdrive/debug/can_compare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/debug/can_compare.py b/selfdrive/debug/can_compare.py index 1b5752fa990c8e..990bbfe21a7d16 100755 --- a/selfdrive/debug/can_compare.py +++ b/selfdrive/debug/can_compare.py @@ -50,7 +50,7 @@ def can_compare(bus=0, max_msg=None, addr="127.0.0.1"): try: if binascii.hexlify(list(msgs2.values())[list(msgs2).index(k)][-1]) != binascii.hexlify(list(msgs3.values())[list(msgs3).index(k)][-1]) and v == binascii.hexlify(list(msgs3.values())[list(msgs3).index(k)][-1]): dd += "%s(%6d) %s\n" % ("%04X(%4d)" % (k,k),len(msgs[k]), v.decode('ascii')) - w = binascii.hexlify(msgs2.values()[list(msgs2).index(k)][-1]).decode('ascii') + w = binascii.hexlify(list(msgs2.values())[list(msgs2).index(k)][-1]).decode('ascii') dd +="%s(%6d) %s\n" % ("%04X(%4d)" % (k,k),len(msgs[k]), w.decode('ascii')) except ValueError: pass From db8cce985d09bd81b4aa72b27a1ee41c3941411d Mon Sep 17 00:00:00 2001 From: Arne Schwarck Date: Wed, 18 Dec 2019 12:43:26 +0100 Subject: [PATCH 6/6] decode only once --- selfdrive/debug/can_compare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/debug/can_compare.py b/selfdrive/debug/can_compare.py index 990bbfe21a7d16..a717caf11f0ca1 100755 --- a/selfdrive/debug/can_compare.py +++ b/selfdrive/debug/can_compare.py @@ -50,7 +50,7 @@ def can_compare(bus=0, max_msg=None, addr="127.0.0.1"): try: if binascii.hexlify(list(msgs2.values())[list(msgs2).index(k)][-1]) != binascii.hexlify(list(msgs3.values())[list(msgs3).index(k)][-1]) and v == binascii.hexlify(list(msgs3.values())[list(msgs3).index(k)][-1]): dd += "%s(%6d) %s\n" % ("%04X(%4d)" % (k,k),len(msgs[k]), v.decode('ascii')) - w = binascii.hexlify(list(msgs2.values())[list(msgs2).index(k)][-1]).decode('ascii') + w = binascii.hexlify(list(msgs2.values())[list(msgs2).index(k)][-1]) dd +="%s(%6d) %s\n" % ("%04X(%4d)" % (k,k),len(msgs[k]), w.decode('ascii')) except ValueError: pass