From 15a8a05595c72d328abdea8e3b23f1b558cc46bf Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Sun, 28 Jan 2018 20:49:48 +0100 Subject: graycode, morse, pwm, usb_request, wiegand: cope with absent sample rate Improve robustness of some more protocol decoders. Few of them never checked for the availability of a sample rate in the first place, others checked for the presence of a spec but would not cope with a value of 0. Some checked the value only after processing it, which could result in runtime errors. This change is motivated by bug #1118. --- decoders/morse/pd.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'decoders/morse') diff --git a/decoders/morse/pd.py b/decoders/morse/pd.py index a1e3c23..3048332 100644 --- a/decoders/morse/pd.py +++ b/decoders/morse/pd.py @@ -154,8 +154,6 @@ class Decoder(srd.Decoder): # Annotate symbols, emit symbols, handle timeout via token. timeunit = self.options['timeunit'] - if self.samplerate is None: - self.samplerate = 1.0 self.wait({0: 'r'}) prevtime = self.samplenum # Time of an actual edge. @@ -217,6 +215,15 @@ class Decoder(srd.Decoder): yield None # Pass through flush of 5+ space. def decode(self): + + # Strictly speaking there is no point in running this decoder + # when the sample rate is unknown or zero. But the previous + # implementation already fell back to a rate of 1 in that case. + # We stick with this approach, to not introduce new constraints + # for existing use scenarios. + if not self.samplerate: + self.samplerate = 1.0 + # Annotate letters, group into words. s0 = s1 = None word = '' -- cgit v1.2.3-70-g09d2