X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fem4100%2Fpd.py;h=778cfd1621e6a918977a9567b0f3898dd877c4f6;hb=3a67b032235e719dc4e74f735d1c95ef2d481a33;hp=0768f9d74e832337cbb71b8f2653a9241569d13b;hpb=5b0b88ced37e8fbe3031867255412f449245ca26;p=libsigrokdecode.git

diff --git a/decoders/em4100/pd.py b/decoders/em4100/pd.py
index 0768f9d..778cfd1 100644
--- a/decoders/em4100/pd.py
+++ b/decoders/em4100/pd.py
@@ -14,8 +14,7 @@
 ## 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
@@ -24,7 +23,7 @@ class SamplerateError(Exception):
     pass
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'em4100'
     name = 'EM4100'
     longname = 'RFID EM4100'
@@ -63,6 +62,9 @@ class Decoder(srd.Decoder):
     )
 
     def __init__(self):
+        self.reset()
+
+    def reset(self):
         self.samplerate = None
         self.oldpin = None
         self.last_samplenum = None
@@ -186,52 +188,50 @@ class Decoder(srd.Decoder):
                     self.col_parity_pos = []
                     self.all_row_parity_ok = True
 
-    def manchester_decode(self, samplenum, pl, pp, pin):
+    def manchester_decode(self, pl, pp, pin):
         bit = self.oldpin ^ self.polarity
         if pl > self.halfbit_limit:
-            es = int(samplenum - pl/2)
+            es = int(self.samplenum - pl/2)
             if self.oldpl > self.halfbit_limit:
                 ss = int(self.oldsamplenum - self.oldpl/2)
             else:
                 ss = int(self.oldsamplenum - self.oldpl)
             self.putbit(bit, ss, es)
-            self.last_bit_pos = int(samplenum - pl/2)
+            self.last_bit_pos = int(self.samplenum - pl/2)
         else:
-            es = int(samplenum)
+            es = int(self.samplenum)
             if self.oldpl > self.halfbit_limit:
                 ss = int(self.oldsamplenum - self.oldpl/2)
                 self.putbit(bit, ss, es)
-                self.last_bit_pos = int(samplenum)
+                self.last_bit_pos = int(self.samplenum)
             else:
                 if self.last_bit_pos <= self.oldsamplenum - self.oldpl:
                     ss = int(self.oldsamplenum - self.oldpl)
                     self.putbit(bit, ss, es)
-                    self.last_bit_pos = int(samplenum)
+                    self.last_bit_pos = int(self.samplenum)
 
-    def decode(self, ss, es, data):
+    def decode(self):
         if not self.samplerate:
             raise SamplerateError('Cannot decode without samplerate.')
-        for (samplenum, (pin,)) in data:
-            # Ignore identical samples early on (for performance reasons).
-            if self.oldpin == pin:
-                continue
-
-            if self.oldpin is None:
-                self.oldpin = pin
-                self.last_samplenum = samplenum
-                self.lastlast_samplenum = samplenum
-                self.last_edge = samplenum
-                self.oldpl = 0
-                self.oldpp = 0
-                self.oldsamplenum = 0
-                self.last_bit_pos = 0
-                continue
-
-            if self.oldpin != pin:
-                pl = samplenum - self.oldsamplenum
-                pp = pin
-                self.manchester_decode(samplenum, pl, pp, pin)
-                self.oldpl = pl
-                self.oldpp = pp
-                self.oldsamplenum = samplenum
-                self.oldpin = pin
+
+        # Initialize internal state from the very first sample.
+        (pin,) = self.wait()
+        self.oldpin = pin
+        self.last_samplenum = self.samplenum
+        self.lastlast_samplenum = self.samplenum
+        self.last_edge = self.samplenum
+        self.oldpl = 0
+        self.oldpp = 0
+        self.oldsamplenum = 0
+        self.last_bit_pos = 0
+
+        while True:
+            # Ignore identical samples, only process edges.
+            (pin,) = self.wait({0: 'e'})
+            pl = self.samplenum - self.oldsamplenum
+            pp = pin
+            self.manchester_decode(pl, pp, pin)
+            self.oldpl = pl
+            self.oldpp = pp
+            self.oldsamplenum = self.samplenum
+            self.oldpin = pin