X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fir_nec%2Fpd.py;h=93b398b59ccfc1dfb481e314aa40d6379b476482;hp=b01af9e77b7160c1fefc526a550e75b428c2c6a2;hb=4539e9ca58966ce3c9cad4801b16c315e86ace01;hpb=bee57ee84753471970f9b65b34e71c54a0558768

diff --git a/decoders/ir_nec/pd.py b/decoders/ir_nec/pd.py
index b01af9e..93b398b 100644
--- a/decoders/ir_nec/pd.py
+++ b/decoders/ir_nec/pd.py
@@ -14,15 +14,17 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
 import sigrokdecode as srd
 from .lists import *
 
+class SamplerateError(Exception):
+    pass
+
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 3
     id = 'ir_nec'
     name = 'IR NEC'
     longname = 'IR NEC'
@@ -30,7 +32,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['ir_nec']
-    probes = (
+    channels = (
         {'id': 'ir', 'name': 'IR', 'desc': 'Data line'},
     )
     options = (
@@ -96,17 +98,18 @@ class Decoder(srd.Decoder):
                  [11, ['%s: %s' % (dev, btn[0]), '%s: %s' % (dev, btn[1]),
                  '%s' % btn[1]]])
 
-    def __init__(self, **kwargs):
+    def __init__(self):
         self.state = 'IDLE'
         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.data = self.count = self.active = 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
+
+        # Set the initial (assumed) value of the pin as per user-config.
+        self.initial_pins = [1 if self.active == 0 else 0]
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:
@@ -148,18 +151,16 @@ class Decoder(srd.Decoder):
         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.")
-        for (self.samplenum, pins) in data:
-            self.ir = pins[0]
+    def decode(self):
+        if not self.samplerate:
+            raise SamplerateError('Cannot decode without samplerate.')
+        while True:
+            # Wait for any edge (rising or falling).
+            (self.ir,) = self.wait({0: 'e'})
 
-            # Wait for an "interesting" edge, but also record the other ones.
-            if self.old_ir == self.ir:
-                continue
             if self.ir != self.active:
+                # Save the non-active edge, then wait for the next edge.
                 self.ss_other_edge = self.samplenum
-                self.old_ir = self.ir
                 continue
 
             b = self.samplenum - self.ss_bit
@@ -200,8 +201,3 @@ 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
-