X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fdcf77%2Fpd.py;h=223a4c0f6dd06a8d71f6282acba0baeba279aaf8;hp=a31c313cb8f020a890d63c03911d682d009b810a;hb=ef36224880135a05d2fbde8f048ea3fe3f425df9;hpb=69ada057e0a8ed086d89d976b1c78e22bea26a77 diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py index a31c313..223a4c0 100644 --- a/decoders/dcf77/pd.py +++ b/decoders/dcf77/pd.py @@ -18,8 +18,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -# DCF77 protocol decoder - import sigrokdecode as srd import calendar @@ -65,6 +63,7 @@ class Decoder(srd.Decoder): ] def __init__(self, **kwargs): + self.samplerate = None self.state = 'WAIT FOR RISING EDGE' self.oldpins = None self.oldval = None @@ -74,13 +73,13 @@ class Decoder(srd.Decoder): self.bitcount = 0 # Counter for the DCF77 bits (0..58) self.dcf77_bitnumber_is_known = 0 - def start(self, metadata): - self.samplerate = metadata['samplerate'] - # self.out_proto = self.add(srd.OUTPUT_PROTO, 'dcf77') - self.out_ann = self.add(srd.OUTPUT_ANN, 'dcf77') + def start(self): + # self.out_proto = self.register(srd.OUTPUT_PYTHON) + self.out_ann = self.register(srd.OUTPUT_ANN) - def report(self): - pass + def metadata(self, key, value): + if key == srd.SRD_CONF_SAMPLERATE: + self.samplerate = value def putx(self, data): # Annotation for a single DCF77 bit. @@ -244,6 +243,8 @@ class Decoder(srd.Decoder): raise Exception('Invalid DCF77 bit: %d' % c) def decode(self, ss, es, data): + if self.samplerate is None: + raise Exception("Cannot decode without samplerate.") for (self.samplenum, pins) in data: # Ignore identical samples early on (for performance reasons).