X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fdcf77%2Fpd.py;h=94f5d2cd95c059655b75d77a9db3f9cb023b28d2;hb=780770f1295b7fdeb4481eb42623bad5da1e19a7;hp=9a273b21498dbdc828c8f07461a9bffde46debd2;hpb=f2a5df42ea41e6c4370d4efa1a27ab942ba1ddff;p=libsigrokdecode.git

diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py
index 9a273b2..94f5d2c 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
 
@@ -39,30 +37,33 @@ class Decoder(srd.Decoder):
     probes = [
         {'id': 'data', 'name': 'DATA', 'desc': 'DATA line'},
     ]
-    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
@@ -76,16 +77,13 @@ class Decoder(srd.Decoder):
         self.dcf77_bitnumber_is_known = 0
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'dcf77')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'dcf77')
+        # self.out_python = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:
             self.samplerate = value
 
-    def report(self):
-        pass
-
     def putx(self, data):
         # Annotation for a single DCF77 bit.
         self.put(self.ss_bit, self.es_bit, self.out_ann, data)
@@ -227,7 +225,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).