X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fmorse%2Fpd.py;h=f768b3a082da8254b154c8b3214218835a6d121d;hb=HEAD;hp=3048332354f4a86585ef3fc55fc16796cf2c39fb;hpb=15a8a05595c72d328abdea8e3b23f1b558cc46bf;p=libsigrokdecode.git

diff --git a/decoders/morse/pd.py b/decoders/morse/pd.py
index 3048332..f768b3a 100644
--- a/decoders/morse/pd.py
+++ b/decoders/morse/pd.py
@@ -120,7 +120,8 @@ class Decoder(srd.Decoder):
     desc = 'Demodulated morse code protocol.'
     license = 'gplv2+'
     inputs = ['logic']
-    outputs = ['morse']
+    outputs = []
+    tags = ['Encoding']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
@@ -129,12 +130,12 @@ class Decoder(srd.Decoder):
     )
     annotations = (
         ('time', 'Time'),
-        ('units', 'Units'),
+        ('unit', 'Unit'),
         ('symbol', 'Symbol'),
         ('letter', 'Letter'),
         ('word', 'Word'),
     )
-    annotation_rows = tuple((u, v, (i,)) for i, (u, v) in enumerate(annotations))
+    annotation_rows = tuple((u + 's', v + 's', (i,)) for i, (u, v) in enumerate(annotations))
 
     def __init__(self):
         self.reset()
@@ -165,7 +166,7 @@ class Decoder(srd.Decoder):
             curtime = self.samplenum
             dt = (curtime - prevtime) / self.samplerate
             units = dt / timeunit
-            iunits = round(units)
+            iunits = int(max(1, round(units)))
             error = abs(units - iunits)
 
             symbol = (pval, iunits)
@@ -175,15 +176,17 @@ class Decoder(srd.Decoder):
                 continue
 
             self.put(prevtime, curtime, self.out_ann, [0, ['{:.3g}'.format(dt)]])
-            self.put(prevtime, curtime, self.out_ann, [1, ['{:.1f}*{:.3g}'.format(units, timeunit)]])
 
             if symbol in symbols:
+                self.put(prevtime, curtime, self.out_ann, [1, ['{:.1f}*{:.3g}'.format(units, timeunit)]])
                 yield (prevtime, curtime, symbol)
+            else:
+                self.put(prevtime, curtime, self.out_ann, [1, ['!! {:.1f}*{:.3g} !!'.format(units, timeunit)]])
 
             prevtime = curtime
 
             thisunit = dt / iunits
-            timeunit += (thisunit - timeunit) * 0.02 * iunits # Adapt.
+            timeunit += (thisunit - timeunit) * 0.2 * max(0, 1 - 2*error) # Adapt.
 
     def decode_morse(self):
         # Group symbols into letters.