X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fwiegand%2Fpd.py;h=a42c9d27238d5472deefc7bbbcb3225ab7ed6495;hb=04867deb37b0f8cdfad55ab7bdb8708fd13f53fc;hp=61941948edf44f993947bc0e6d96f63b08227c88;hpb=1b1de5693cc7229c01502b23bc659a3b09af8868;p=libsigrokdecode.git diff --git a/decoders/wiegand/pd.py b/decoders/wiegand/pd.py index 6194194..a42c9d2 100644 --- a/decoders/wiegand/pd.py +++ b/decoders/wiegand/pd.py @@ -37,7 +37,7 @@ class Decoder(srd.Decoder): {'id': 'active', 'desc': 'Data lines active level', 'default': 'low', 'values': ('low', 'high')}, {'id': 'bitwidth_ms', 'desc': 'Single bit width in milliseconds', - 'default': '4', 'values': ('1', '2', '4', '8', '16', '32')}, + 'default': 4, 'values': (1, 2, 4, 8, 16, 32)}, ) annotations = ( ('bits', 'Bits'), @@ -48,14 +48,14 @@ class Decoder(srd.Decoder): ('state', 'Stream state', (1,)), ) - def __init__(self, **kwargs): + def __init__(self): self._samples_per_bit = 10 self._d0_prev = None self._d1_prev = None self._state = None - self._ss_state = None + self.ss_state = None self.ss_bit = None self.es_bit = None @@ -98,8 +98,8 @@ class Decoder(srd.Decoder): elif self._state == 'invalid': ann = [1, [self._state]] if ann: - self.put(self._ss_state, self.samplenum, self.out_ann, ann) - self._ss_state = self.samplenum + self.put(self.ss_state, self.samplenum, self.out_ann, ann) + self.ss_state = self.samplenum self._state = state self._bits = []