ir_rc5: Change PD options to be a tuple of dictionaries.

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

diff --git a/decoders/ir_rc5/pd.py b/decoders/ir_rc5/pd.py
index 25a4576e71b378b03290dc5c12bd6e4429719ddc..a42c86f59edda37171dcb69c71c3d8c3e5e41520 100644 (file)
--- a/decoders/ir_rc5/pd.py
+++ b/decoders/ir_rc5/pd.py
@@ -34,10 +34,12 @@ class Decoder(srd.Decoder):
         {'id': 'ir', 'name': 'IR', 'desc': 'IR data line'},
     ]
     optional_probes = []
-    options = {
-        'polarity': ['Polarity', 'active-low'],
-        'protocol': ['Protocol type', 'standard'],
-    }
+    options = (
+        {'id': 'polarity', 'desc': 'Polarity', 'default': 'active-low',
+            'values': ('active-low', 'active-high')},
+        {'id': 'protocol', 'desc': 'Protocol type', 'default': 'standard',
+            'values': ('standard', 'extended')},
+    )
     annotations = [
         ['bit', 'Bit'],
         ['startbit1', 'Startbit 1'],
@@ -125,7 +127,11 @@ class Decoder(srd.Decoder):
         elif distance in range(s - margin, s + margin + 1):
             return 's'
         else:
-            raise Exception('Invalid edge distance: %d' % distance)
+            return 'e' # Error, invalid edge distance.
+
+    def reset_decoder_state(self):
+        self.edges, self.bits, self.bits_ss_es = [], [], []
+        self.state = 'IDLE'
 
     def decode(self, ss, es, data):
         if self.samplerate is None:
@@ -146,6 +152,9 @@ class Decoder(srd.Decoder):
                 self.old_ir = self.ir
                 continue
             edge = self.edge_type()
+            if edge == 'e':
+                self.reset_decoder_state() # Reset state machine upon errors.
+                continue
             if self.state == 'MID1':
                 self.state = 'START1' if edge == 's' else 'MID0'
                 bit = None if edge == 's' else 0
@@ -167,10 +176,9 @@ class Decoder(srd.Decoder):
             if bit != None:
                 self.bits.append([self.samplenum, bit])
 
-            if len(self.bits) == 14 + 1:
+            if len(self.bits) == 14:
                 self.handle_bits()
-                self.edges, self.bits, self.bits_ss_es = [], [], []
-                self.state = 'IDLE'
+                self.reset_decoder_state()
 
             self.old_ir = self.ir