All PDs: Consistently use singular/plural for annotation classes/rows.

[libsigrokdecode.git] / decoders / signature / pd.py

diff --git a/decoders/signature/pd.py b/decoders/signature/pd.py
index f5183c03130a4a8a57d50b0f1420c1ed4868c789..946b2da7574e7fb4b01e0caeb0d584fa1dee1ff5 100644 (file)
--- a/decoders/signature/pd.py
+++ b/decoders/signature/pd.py
@@ -46,7 +46,7 @@ class Decoder(srd.Decoder):
     name = 'Signature'
     longname = 'Signature analysis'
     desc = 'Annotate signature of logic patterns.'
-    license = 'gplv3+'
+    license = 'gplv2+'
     inputs = ['logic']
     outputs = []
     tags = ['Debug/trace', 'Util', 'Encoding']
@@ -71,11 +71,11 @@ class Decoder(srd.Decoder):
         ('bit1', 'Bit1'),
         ('start', 'START'),
         ('stop', 'STOP'),
-        ('sig', 'Sig')
+        ('signature', 'Signature')
     )
     annotation_rows = (
         ('bits', 'Bits', (0, 1, 2, 3)),
-        ('sig', 'Sig', (4,))
+        ('signatures', 'Signatures', (4,))
     )
 
     def __init__(self):
@@ -135,7 +135,7 @@ class Decoder(srd.Decoder):
                         started = False
                     else:
                         self.putb(last_samplenum, [data, [str(data)]])
-                incoming = (bin(shiftreg & 0b0000_0010_1001_0001).count('1') + data) & 1
+                incoming = (bin(shiftreg & 0x0291).count('1') + data) & 1
                 shiftreg = (incoming << 15) | (shiftreg >> 1)
             prev_start = start
             prev_stop = stop