Skip to content

If parsed data has shortened, overwrite end of line with spaces #1201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felixdivo merged 2 commits into from
Feb 8, 2022
Merged

If parsed data has shortened, overwrite end of line with spaces #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbecf66
If parsed data has shortened, overwrite end of line with spaces
simonkerscher Dec 23, 2021
f610f54
Fill until end of available line after parsed data
simonkerscher Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions can/viewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@ def draw_can_bus_message(self, msg, sorting=False):
else:
values_list.append(str(x))
values_string = " ".join(values_list)
self.ids[key]["values_string_length"] = len(values_string)
values_string += " " * (self.x - len(values_string))

self.draw_line(self.ids[key]["row"], 77, values_string, color)
except (ValueError, struct.error):
pass
Expand Down
17 changes: 17 additions & 0 deletions test/test_viewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,16 @@ def test_send(self):
msg = can.Message(arbitration_id=0x101, data=data, is_extended_id=False)
self.can_viewer.bus.send(msg)

# Send non-CANopen message with long parsed data length
data = [255, 255]
msg = can.Message(arbitration_id=0x102, data=data, is_extended_id=False)
self.can_viewer.bus.send(msg)

# Send the same command, but with shorter parsed data length
data = [0, 0]
msg = can.Message(arbitration_id=0x102, data=data, is_extended_id=False)
self.can_viewer.bus.send(msg)

# Message with extended id
data = [1, 2, 3, 4, 5, 6, 7, 8]
msg = can.Message(arbitration_id=0x123456, data=data, is_extended_id=True)
Expand All @@ -211,6 +221,8 @@ def test_receive(self):
# For converting the EMCY and HEARTBEAT messages
0x080 + 0x01: struct.Struct("<HBLB"),
0x700 + 0x7F: struct.Struct("<B"),
# Shorter parsed data length
0x102: struct.Struct("<BB"),
# Big-endian and float test
0x123456: struct.Struct(">ff"),
}
Expand All @@ -230,6 +242,11 @@ def test_receive(self):
for col, v in self.stdscr_dummy.draw_buffer[_id["row"]].items():
if col >= 52 + _id["msg"].dlc * 3:
self.assertEqual(v, " ")
elif _id["msg"].arbitration_id == 0x102:
# Make sure the parsed values have been cleared after the shorted message was send
for col, v in self.stdscr_dummy.draw_buffer[_id["row"]].items():
if col >= 77 + _id["values_string_length"]:
self.assertEqual(v, " ")
elif _id["msg"].arbitration_id == 0x123456:
# Check if the counter is incremented
if _id["dt"] == 0:
Expand Down