X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fdcf77%2Fpd.py;h=cbdfa872955aea7d9d3711aba7bc3730636f3f9c;hp=14d8637ff00fa287a928e38c18319e96c80c0dd2;hb=769ed325837271b76beca1e74a037cf8bb91f4b3;hpb=21cda9512f29947617da45822ab524b1f76f56c1 diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py index 14d8637..cbdfa87 100644 --- a/decoders/dcf77/pd.py +++ b/decoders/dcf77/pd.py @@ -20,10 +20,7 @@ import sigrokdecode as srd import calendar - -# Return the specified BCD number (max. 8 bits) as integer. -def bcd2int(b): - return (b & 0x0f) + ((b >> 4) * 10) +from srdhelper import bcd2int class SamplerateError(Exception): pass @@ -242,7 +239,7 @@ class Decoder(srd.Decoder): # Even parity over date bits (36-58): DCF77 bit 58. parity = self.datebits.count(1) s = 'OK' if ((parity % 2) == 0) else 'INVALID!' - self.putx([16, ['Date parity: %s' % s, 'DP: %s' %s]]) + self.putx([16, ['Date parity: %s' % s, 'DP: %s' % s]]) self.datebits = [] else: raise Exception('Invalid DCF77 bit: %d' % c) @@ -314,4 +311,3 @@ class Decoder(srd.Decoder): self.state = 'WAIT FOR RISING EDGE' self.oldval = val -