X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fqi%2Fpd.py;h=ab9c5fa75259033420c4c6229bd058af2ca79144;hb=487890c822762d9886dfd022ed599c9909ceaab9;hp=9782ee5afb5dd3758e2b40e2a64e52dca9d1b8a7;hpb=d9135fe1d8982160e2b8283120a07ade7b9e0566;p=libsigrokdecode.git

diff --git a/decoders/qi/pd.py b/decoders/qi/pd.py
index 9782ee5..ab9c5fa 100644
--- a/decoders/qi/pd.py
+++ b/decoders/qi/pd.py
@@ -49,22 +49,23 @@ class Decoder(srd.Decoder):
     id = 'qi'
     name = 'Qi'
     longname = 'Qi charger protocol'
-    desc = 'Protocol used by Qi receiver'
+    desc = 'Protocol used by Qi receiver.'
     license = 'gplv2+'
     inputs = ['logic']
-    outputs = ['qi']
+    outputs = []
+    tags = ['Embedded/industrial', 'Wireless/RF']
     channels = (
         {'id': 'qi', 'name': 'Qi', 'desc': 'Demodulated Qi data line'},
     )
     annotations = (
-        ('bits', 'Bits'),
-        ('bytes-errors', 'Bit errors'),
-        ('bytes-start', 'Start bits'),
-        ('bytes-info', 'Info bits'),
-        ('bytes-data', 'Data bytes'),
-        ('packets-data', 'Packet data'),
-        ('packets-checksum-ok', 'Packet checksum'),
-        ('packets-checksum-err', 'Packet checksum'),
+        ('bit', 'Bit'),
+        ('byte-error', 'Bit error'),
+        ('byte-start', 'Start bit'),
+        ('byte-info', 'Info bit'),
+        ('byte-data', 'Data byte'),
+        ('packet-data', 'Packet data'),
+        ('packet-checksum-ok', 'Packet checksum OK'),
+        ('packet-checksum-err', 'Packet checksum error'),
     )
     annotation_rows = (
         ('bits', 'Bits', (0,)),
@@ -73,6 +74,9 @@ class Decoder(srd.Decoder):
     )
 
     def __init__(self):
+        self.reset()
+
+    def reset(self):
         self.samplerate = None
         self.reset_variables()
 
@@ -146,7 +150,7 @@ class Decoder(srd.Decoder):
                        'C: PC = %d MP = %d P = %d C = %d WS = %d WO = %d' %
                        (powerclass, maxpower, prop, count, winsize, winoff),
                        'Configuration', 'C'])
-        elif self.packet[0] == 0x71: # Identification 
+        elif self.packet[0] == 0x71: # Identification
             version = '%d.%d' % ((self.packet[1] & 0xf0) >> 4, self.packet[1] & 0x0f)
             mancode = '%02x%02x' % (self.packet[2], self.packet[3])
             devid = '%02x%02x%02x%02x' % (self.packet[4] & ~0x80,
@@ -232,7 +236,7 @@ class Decoder(srd.Decoder):
         if not self.samplerate:
             raise SamplerateError('Cannot decode without samplerate.')
 
-        (qi,) = self.wait({'skip': 1})
+        (qi,) = self.wait()
         self.handle_transition(self.samplenum, qi == 0)
         while True:
             prev = self.samplenum