X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fook_vis%2Fpd.py;h=1645ceb7deea00a96aafbb5d3ea806a3708f2987;hb=826981ac5a2105c7231aeb5e5e523cd37ce72edd;hp=9bbd37fdf1fd13032bfb60ac34a14870fa8368b3;hpb=51753e2207e72266bd36b782891d791299bd2c3d;p=libsigrokdecode.git diff --git a/decoders/ook_vis/pd.py b/decoders/ook_vis/pd.py index 9bbd37f..1645ceb 100644 --- a/decoders/ook_vis/pd.py +++ b/decoders/ook_vis/pd.py @@ -29,6 +29,7 @@ class Decoder(srd.Decoder): license = 'gplv2+' inputs = ['ook'] outputs = ['ook'] + tags = ['Encoding'] annotations = ( ('bit', 'Bit'), ('ref', 'Reference'), @@ -42,8 +43,8 @@ class Decoder(srd.Decoder): ('compare', 'Compare', (1,)), ('fields', 'Fields', (2,)), ('ref_fields', 'Ref fields', (3,)), - ('level2', 'L2', (4,)), - ('ref_level2', 'Ref L2', (5,)), + ('level2_vals', 'L2', (4,)), + ('ref_level2_vals', 'Ref L2', (5,)), ) options = ( {'id': 'displayas', 'desc': 'Display as', 'default': 'Nibble - Hex', @@ -113,8 +114,7 @@ class Decoder(srd.Decoder): if len(ook) >= preamble_end: preamble_end += int(self.sync_offset) - 1 - self.ss = ook[0][0] - self.es = ook[preamble_end][1] + self.ss, self.es = ook[0][0], ook[preamble_end][1] self.putx([line, ['Preamble', 'Pre', 'P']]) self.decode_pos += preamble_end @@ -149,10 +149,7 @@ class Decoder(srd.Decoder): ook = self.decoded for i in range(len(ook)): self.ookstring += ook[i][2] - if 'Nibble' in self.displayas: - bits = 4 - else: - bits = 8 + bits = 4 if 'Nibble' in self.displayas else 8 rem_nibbles = len(self.ookstring) // bits for i in range(rem_nibbles): # Display the rest of the nibbles. self.ss = ook[self.decode_pos][0]