X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fdcf77%2Fpd.py;h=21da4f63ccef4569ff8e6465152e292a6b97b44e;hp=0c53f419bb7dd56edde8a321e9f3f3648cb5c779;hb=bb5ebde6dce29b53a814efe3a1b1c350196674d9;hpb=99f5e74a415f94e1de50475bb26c82fe2dc7c893

diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py
index 0c53f41..21da4f6 100644
--- a/decoders/dcf77/pd.py
+++ b/decoders/dcf77/pd.py
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the libsigrokdecode project.
 ##
-## Copyright (C) 2012-2013 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2012-2014 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -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
 
@@ -42,44 +40,51 @@ class Decoder(srd.Decoder):
     optional_probes = []
     options = {}
     annotations = [
-        ['start_of_minute', 'Start of minute'],
-        ['special_bits', 'Special bits (civil warnings, weather forecast)'],
-        ['call_bit', 'Call bit'],
-        ['summer_time', 'Summer time announcement'],
+        ['start-of-minute', 'Start of minute'],
+        ['special-bits', 'Special bits (civil warnings, weather forecast)'],
+        ['call-bit', 'Call bit'],
+        ['summer-time', 'Summer time announcement'],
         ['cest', 'CEST bit'],
         ['cet', 'CET bit'],
-        ['leap_second', 'Leap second bit'],
-        ['start_of_time', 'Start of encoded time'],
+        ['leap-second', 'Leap second bit'],
+        ['start-of-time', 'Start of encoded time'],
         ['minute', 'Minute'],
-        ['minute_parity', 'Minute parity bit'],
+        ['minute-parity', 'Minute parity bit'],
         ['hour', 'Hour'],
-        ['hour_parity', 'Hour parity bit'],
+        ['hour-parity', 'Hour parity bit'],
         ['day', 'Day of month'],
-        ['day_of_week', 'Day of week'],
+        ['day-of-week', 'Day of week'],
         ['month', 'Month'],
         ['year', 'Year'],
-        ['date_parity', 'Date parity bit'],
-        ['raw_bits', 'Raw bits'],
-        ['unknown_bits', 'Unknown bits'],
+        ['date-parity', 'Date parity bit'],
+        ['raw-bits', 'Raw bits'],
+        ['unknown-bits', 'Unknown bits'],
         ['warnings', 'Human-readable warnings'],
     ]
+    annotation_rows = (
+        ('bits', 'Bits', (17, 18)),
+        ('fields', 'Fields', tuple(range(0, 16 + 1))),
+        ('warnings', 'Warnings', (19,)),
+    )
 
     def __init__(self, **kwargs):
+        self.samplerate = None
         self.state = 'WAIT FOR RISING EDGE'
         self.oldpins = None
         self.oldval = None
         self.samplenum = 0
         self.ss_bit = self.ss_bit_old = self.es_bit = self.ss_block = 0
+        self.datebits = []
         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_python = 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.
@@ -106,6 +111,10 @@ class Decoder(srd.Decoder):
         if not self.dcf77_bitnumber_is_known:
             return
 
+        # Collect bits 36-58, we'll need them for a parity check later.
+        if c in range(36, 58 + 1):
+            self.datebits.append(bit)
+
         # Output specific "decoded" annotations for the respective DCF77 bits.
         if c == 0:
             # Start of minute: DCF bit 0.
@@ -218,7 +227,7 @@ class Decoder(srd.Decoder):
             if c == 49:
                 m = bcd2int(self.tmp)
                 mn = calendar.month_name[m] # month_name[1] == January
-                self.putx([14, ['Month: %d (%s)' % (m, mn),
+                self.putb([14, ['Month: %d (%s)' % (m, mn),
                                 'Mon: %d (%s)' % (m, mn)]])
         elif c in range(50, 57 + 1):
             # Year (0-99): DCF77 bits 50-57 (BCD format).
@@ -231,14 +240,16 @@ class Decoder(srd.Decoder):
                 self.putb([15, ['Year: %d' % bcd2int(self.tmp)]])
         elif c == 58:
             # Even parity over date bits (36-58): DCF77 bit 58.
-            self.tmp |= (bit << (c - 50))
-            parity = bin(self.tmp).count('1')
+            parity = self.datebits.count(1)
             s = 'OK' if ((parity % 2) == 0) else 'INVALID!'
             self.putx([16, ['Date parity: %s' % s, 'DP: %s' %s]])
+            self.datebits = []
         else:
             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).