commaai
/
panda
mirror of https://github.com/commaai/panda.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix can_logger.py to run correctly on python3 (#392)

This commit is contained in:
Clay Dugo 2019-11-27 14:11:55 -05:00 committed by robbederks
parent 7f9b4a59b6
commit 000282e544
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/can_logger.py
View File

@ -1,6 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import binascii
import csv import csv
import sys import sys
from panda import Panda from panda import Panda
@ -21,7 +20,7 @@ def can_logger():
sys.exit(0) sys.exit(0)
try: try:
outputfile = open('output.csv', 'wb') outputfile = open('output.csv', 'w')
csvwriter = csv.writer(outputfile) csvwriter = csv.writer(outputfile)
#Write Header #Write Header
csvwriter.writerow(['Bus', 'MessageID', 'Message', 'MessageLength']) csvwriter.writerow(['Bus', 'MessageID', 'Message', 'MessageLength'])
@ -35,7 +34,7 @@ def can_logger():
can_recv = p.can_recv() can_recv = p.can_recv()
for address, _, dat, src in can_recv: for address, _, dat, src in can_recv:
csvwriter.writerow([str(src), str(hex(address)), "0x" + binascii.hexlify(dat), len(dat)]) csvwriter.writerow([str(src), str(hex(address)), f"0x{dat.hex()}", len(dat)])
if src == 0: if src == 0:
bus0_msg_cnt += 1 bus0_msg_cnt += 1
@ -44,10 +43,10 @@ def can_logger():
elif src == 2: elif src == 2:
bus2_msg_cnt += 1 bus2_msg_cnt += 1
print("Message Counts... Bus 0: " + str(bus0_msg_cnt) + " Bus 1: " + str(bus1_msg_cnt) + " Bus 2: " + str(bus2_msg_cnt), end='\r') print(f"Message Counts... Bus 0: {bus0_msg_cnt} Bus 1: {bus1_msg_cnt} Bus 2: {bus2_msg_cnt}", end='\r')
except KeyboardInterrupt: except KeyboardInterrupt:
print("\nNow exiting. Final message Counts... Bus 0: " + str(bus0_msg_cnt) + " Bus 1: " + str(bus1_msg_cnt) + " Bus 2: " + str(bus2_msg_cnt)) print(f"\nNow exiting. Final message Counts... Bus 0: {bus0_msg_cnt} Bus 1: {bus1_msg_cnt} Bus 2: {bus2_msg_cnt}")
outputfile.close() outputfile.close()
if __name__ == "__main__": if __name__ == "__main__":