X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fds2432%2Fpd.py;h=d50a6d846c9ab53bc1594a93dc3c4e10c17d4472;hp=269a23e38b010daaff91aac75cbf0a577bd404db;hb=3a9f6abf26e98198986567d83c790ad11fd1f875;hpb=444960cc19c62edab0b259c06b03fa096f9d5a72 diff --git a/decoders/ds2432/pd.py b/decoders/ds2432/pd.py index 269a23e..d50a6d8 100644 --- a/decoders/ds2432/pd.py +++ b/decoders/ds2432/pd.py @@ -177,13 +177,9 @@ class Decoder(srd.Decoder): self.ss = ss elif 24 == len(self.bytes): self.es = es - self.putx([0, ['Message authentication code: ' - + (','.join(format(n, '#04x') - for n in self.bytes[4:24])), - 'MAC: ' - + (','.join(format(n, '#04x') - for n in self.bytes[4:24])), - ]]) + mac = ','.join(format(n, '#04x') for n in self.bytes[4:24]) + self.putx([0, ['Message authentication code: ' + mac, + 'MAC: ' + mac]]) elif 24 < len(self.bytes): self.ss, self.es = ss, es if (0xaa == self.bytes[-1] or 0x55 == self.bytes[-1]): @@ -218,13 +214,9 @@ class Decoder(srd.Decoder): self.ss = ss elif 58 == len(self.bytes): self.es = es - self.putx([0, ['Message authentication code: ' - + (','.join(format(n, '#04x') - for n in self.bytes[38:58])), - 'MAC: ' - + (','.join(format(n, '#04x') - for n in self.bytes[38:58])), - ]]) + mac = ','.join(format(n, '#04x') for n in self.bytes[38:58]) + self.putx([0, ['Message authentication code: ' + mac, + 'MAC: ' + mac]]) elif 59 == len(self.bytes): self.ss = ss elif 60 == len(self.bytes):