morse: fix for #1278

diff --git a/decoders/morse/pd.py b/decoders/morse/pd.py
index 3048332354f4a86585ef3fc55fc16796cf2c39fb..9a83b63a84b390df109cd55af1e694d88791da03 100644 (file)
--- a/decoders/morse/pd.py
+++ b/decoders/morse/pd.py
@@ -165,7 +165,7 @@ class Decoder(srd.Decoder):
             curtime = self.samplenum
             dt = (curtime - prevtime) / self.samplerate
             units = dt / timeunit
             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)
             error = abs(units - iunits)
 
             symbol = (pval, iunits)


@@ -175,15 +175,17 @@ class Decoder(srd.Decoder):
                 continue
 
             self.put(prevtime, curtime, self.out_ann, [0, ['{:.3g}'.format(dt)]])
                 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:
 
             if symbol in symbols:

+                self.put(prevtime, curtime, self.out_ann, [1, ['{:.1f}*{:.3g}'.format(units, timeunit)]])

                 yield (prevtime, curtime, symbol)
                 yield (prevtime, curtime, symbol)

+            else:
+                self.put(prevtime, curtime, self.out_ann, [1, ['!! {:.1f}*{:.3g} !!'.format(units, timeunit)]])

 
             prevtime = curtime
 
             thisunit = dt / iunits
 
             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.
 
     def decode_morse(self):
         # Group symbols into letters.