X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fir_nec%2Fpd.py;h=d14c7d33215b093fe0b74a6a23eb7d7c877d1eb3;hb=7cf698c5475ac6948d7a9d5c2a6e4ec9cb878d84;hp=1368e417d7daff0545c25645713e9f62602fe873;hpb=5bb61a25d31c4c32f5109c38d7fd31c9e0d2c441;p=libsigrokdecode.git

diff --git a/decoders/ir_nec/pd.py b/decoders/ir_nec/pd.py
index 1368e41..d14c7d3 100644
--- a/decoders/ir_nec/pd.py
+++ b/decoders/ir_nec/pd.py
@@ -19,9 +19,13 @@
 ##
 
 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'
@@ -29,31 +33,33 @@ 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'],
-        ['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)),
-        ('warnings', 'Warnings', (11,)),
+        ('remote', 'Remote', (11,)),
+        ('warnings', 'Warnings', (12,)),
     )
 
     def putx(self, data):
@@ -82,13 +88,24 @@ class Decoder(srd.Decoder):
         self.put(self.ss_other_edge, self.samplenum, self.out_ann,
                  [idx, [p + ' pause', '%s-pause' % p[0], '%sP' % p[0], 'P']])
 
+    def putremote(self):
+        dev = address.get(self.addr, 'Unknown device')
+        buttons = command.get(self.addr, None)
+        if buttons is None:
+            btn = ['Unknown', 'Unk']
+        else:
+            btn = buttons.get(self.cmd, ['Unknown', 'Unk'])
+        self.put(self.ss_remote, self.ss_bit + self.stop, self.out_ann,
+                 [11, ['%s: %s' % (dev, btn[0]), '%s: %s' % (dev, btn[1]),
+                 '%s' % btn[1]]])
+
     def __init__(self, **kwargs):
         self.state = 'IDLE'
-        self.ss_bit = self.ss_start = self.ss_other_edge = 0
+        self.ss_bit = self.ss_start = self.ss_other_edge = self.ss_remote = 0
         self.data = self.count = self.active = self.old_ir = None
+        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
@@ -118,20 +135,24 @@ class Decoder(srd.Decoder):
     def data_ok(self):
         ret, name = (self.data >> 8) & (self.data & 0xff), self.state.title()
         if self.count == 8:
+            if self.state == 'ADDRESS':
+                self.addr = self.data
+            if self.state == 'COMMAND':
+                self.cmd = self.data
             self.putd(self.data)
             self.ss_start = self.samplenum
             return True
         if ret == 0:
             self.putd(self.data >> 8)
         else:
-            self.putx([11, ['%s error: 0x%04X' % (name, self.data)]])
+            self.putx([12, ['%s error: 0x%04X' % (name, self.data)]])
         self.data = self.count = 0
         self.ss_bit = self.ss_start = self.samplenum
         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]
 
@@ -150,6 +171,7 @@ class Decoder(srd.Decoder):
                 if b in range(self.lc - self.margin, self.lc + self.margin):
                     self.putpause('Long')
                     self.putx([5, ['Leader code', 'Leader', 'LC', 'L']])
+                    self.ss_remote = self.ss_start
                     self.data = self.count = 0
                     self.state = 'ADDRESS'
                 elif b in range(self.rc - self.margin, self.rc + self.margin):
@@ -177,10 +199,8 @@ class Decoder(srd.Decoder):
                     self.state = 'STOP' if self.data_ok() else 'IDLE'
             elif self.state == 'STOP':
                 self.putstop(self.ss_bit)
+                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
-