All PDs: Minor whitespace and consistency fixes.

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

diff --git a/decoders/ir_nec/pd.py b/decoders/ir_nec/pd.py
index 459cbe23c3bfe2f37f62b62eb1720dba469f577e..d14c7d33215b093fe0b74a6a23eb7d7c877d1eb3 100644 (file)
--- a/decoders/ir_nec/pd.py
+++ b/decoders/ir_nec/pd.py
@@ -21,8 +21,11 @@
 import sigrokdecode as srd
 from .lists import *
 
+class SamplerateError(Exception):
+    pass
+
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'ir_nec'
     name = 'IR NEC'
     longname = 'IR NEC'
@@ -30,28 +33,28 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['ir_nec']
-    probes = [
+    channels = (
         {'id': 'ir', 'name': 'IR', 'desc': 'Data line'},
-    ]
-    optional_probes = []
-    options = {
-        'polarity': ['Polarity', 'active-low'],
-    }
-    annotations = [
-        ['bit', 'Bit'],
-        ['agc-pulse', 'AGC pulse'],
-        ['longpause', 'Long pause'],
-        ['shortpause', 'Short pause'],
-        ['stop-bit', 'Stop bit'],
-        ['leader-code', 'Leader code'],
-        ['addr', 'Address'],
-        ['addr-inv', 'Address#'],
-        ['cmd', 'Command'],
-        ['cmd-inv', 'Command#'],
-        ['repeat-code', 'Repeat code'],
-        ['remote', 'Remote'],
-        ['warnings', 'Warnings'],
-    ]
+    )
+    options = (
+        {'id': 'polarity', 'desc': 'Polarity', 'default': 'active-low',
+            'values': ('active-low', 'active-high')},
+    )
+    annotations = (
+        ('bit', 'Bit'),
+        ('agc-pulse', 'AGC pulse'),
+        ('longpause', 'Long pause'),
+        ('shortpause', 'Short pause'),
+        ('stop-bit', 'Stop bit'),
+        ('leader-code', 'Leader code'),
+        ('addr', 'Address'),
+        ('addr-inv', 'Address#'),
+        ('cmd', 'Command'),
+        ('cmd-inv', 'Command#'),
+        ('repeat-code', 'Repeat code'),
+        ('remote', 'Remote'),
+        ('warnings', 'Warnings'),
+    )
     annotation_rows = (
         ('bits', 'Bits', (0, 1, 2, 3, 4)),
         ('fields', 'Fields', (5, 6, 7, 8, 9, 10)),
@@ -103,7 +106,6 @@ class Decoder(srd.Decoder):
         self.addr = self.cmd = None
 
     def start(self):
-        # self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
         self.active = 0 if self.options['polarity'] == 'active-low' else 1
         self.old_ir = 1 if self.active == 0 else 0
@@ -149,8 +151,8 @@ class Decoder(srd.Decoder):
         return ret == 0
 
     def decode(self, ss, es, data):
-        if self.samplerate is None:
-            raise Exception("Cannot decode without samplerate.")
+        if not self.samplerate:
+            raise SamplerateError('Cannot decode without samplerate.')
         for (self.samplenum, pins) in data:
             self.ir = pins[0]
 
@@ -200,8 +202,5 @@ class Decoder(srd.Decoder):
                 self.putremote()
                 self.ss_bit = self.ss_start = self.samplenum
                 self.state = 'IDLE'
-            else:
-                raise Exception('Invalid state: %s' % self.state)
 
             self.old_ir = self.ir
-