X-Git-Url: http://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fatsha204a%2Fpd.py;fp=decoders%2Fatsha204a%2Fpd.py;h=c0db9a41ed9ac79084a1820095c4449c7cf8d8e4;hp=8e37e5b95d6ee62a0b88f7117adbf67a9eb5ce19;hb=dcf65053104aa29162d985558260f5f8e7a859da;hpb=c35a4d56d561920def33005b775e3544ad830013 diff --git a/decoders/atsha204a/pd.py b/decoders/atsha204a/pd.py index 8e37e5b..c0db9a4 100644 --- a/decoders/atsha204a/pd.py +++ b/decoders/atsha204a/pd.py @@ -246,8 +246,8 @@ class Decoder(srd.Decoder): elif op == OPCODE_DERIVE_KEY: self.putz(s[0][0], s[31][1], [5, ['MAC: %s' % ' '.join(format(i[2], '02x') for i in s)]]) elif op == OPCODE_ECDH: - self.putz(s[0][0], s[31][1], [5, ['Pub X: %s' % ' '.join(format(i[2], '02x') for i in s[0:32])]]) - self.putz(s[32][0], s[63][1], [5, ['Pub Y: %s' % ' '.join(format(i[2], '02x') for i in s[32:64])]]) + self.putz(s[0][0], s[31][1], [5, ['Pub X: %s' % ' '.join(format(i[2], '02x') for i in s[0:32])]]) + self.putz(s[32][0], s[63][1], [5, ['Pub Y: %s' % ' '.join(format(i[2], '02x') for i in s[32:64])]]) elif op in (OPCODE_GEN_DIG, OPCODE_GEN_KEY): self.putz(s[0][0], s[3][1], [5, ['OtherData: %s' % ' '.join(format(i[2], '02x') for i in s)]]) elif op == OPCODE_MAC: @@ -309,7 +309,7 @@ class Decoder(srd.Decoder): # responses to be displayed incorrectly. self.opcode = -1 if len(self.bytes) > 0: - self.output_rx_bytes() + self.output_rx_bytes() self.waddr = -1 self.bytes = [] self.state = 'IDLE' @@ -321,4 +321,3 @@ class Decoder(srd.Decoder): self.output_tx_bytes() self.bytes = [] self.state = 'IDLE' -