Skip to content

Python decode improvements #31

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

Open
SethRobertson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Python decode improvements #31

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
33d587e
Add support for printing 1553 sub-channel (A|B) in python
Nov 16, 2021
a05e343
Python debug_action improvements
Dec 15, 2021
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
4 changes: 3 additions & 1 deletion python/Py106/MsgDecode1553.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ def msgs(self):

# Initialize counts variables
TR = ("R", "T")
AB = ("A", "B")
packet_count = 0
msg_count = 0

Expand All @@ -254,9 +255,10 @@ def msgs(self):
# time_utils.RelInt2IrigTime()
WC = decode1553.word_cnt(msg.pCmdWord1.contents.Value)
msg_time = time_utils.rel_int_to_irig_time(msg.p1553Hdr.contents.Field.PktTime)
sys.stdout.write("%s Ch %3i %2i-%s-%02i-%02i (%04x) " % ( \
sys.stdout.write("%s Ch %3i-%s %2i-%s-%02i-%02i (%04x) " % ( \
msg_time, \
pkt_io.header.ch_id, \
AB[msg.p1553Hdr.contents.Field.BlockStatus.BusID], \
msg.pCmdWord1.contents.Field.RTAddr, \
TR[msg.pCmdWord1.contents.Field.TR], \
msg.pCmdWord1.contents.Field.SubAddr, \
Expand Down
3 changes: 2 additions & 1 deletion python/irig_1553_csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ def msg_1553_unpack(msg, decode1553, time_utils, pkt_io):

statistics = collections.defaultdict(lambda: 0)
headers = headers_1553()
if not args.no_want_headers or args.debug_action:
if not args.no_want_headers and not args.debug_action:
print(args.field.join(headers))

for fn in args.filename:
Expand All @@ -330,6 +330,7 @@ for fn in args.filename:
for pkt_hdr in pkt_io.packet_headers():
if args.debug_action == "dump_pkt_hdrs":
print("Ch ID %3i %s" % (pkt_io.header.ch_id, irig10.packet.DataType.type_name(pkt_hdr.data_type)))
continue

if pkt_hdr.data_type != irig10.packet.DataType.MIL1553_FMT_1:
continue
Expand Down