X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fdcf77%2Fpd.py;h=fc97a1ddd1911e5fac5d3a0c07d13dd69eda1a1c;hp=e8d1443ec798dbbe525594a5d038f5e3c92e56f3;hb=12851357e784b893e24880efc6cd22a0cbcc64ce;hpb=c515eed7ef7a04a42b5b34abd308e08d6942835e

diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py
index e8d1443..fc97a1d 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
@@ -26,7 +26,7 @@ def bcd2int(b):
     return (b & 0x0f) + ((b >> 4) * 10)
 
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'dcf77'
     name = 'DCF77'
     longname = 'DCF77 time protocol'
@@ -34,33 +34,36 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['dcf77']
-    probes = [
+    channels = (
         {'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'],
-        ['cest', 'CEST bit'],
-        ['cet', 'CET bit'],
-        ['leap-second', 'Leap second bit'],
-        ['start-of-time', 'Start of encoded time'],
-        ['minute', 'Minute'],
-        ['minute-parity', 'Minute parity bit'],
-        ['hour', 'Hour'],
-        ['hour-parity', 'Hour parity bit'],
-        ['day', 'Day of month'],
-        ['day-of-week', 'Day of week'],
-        ['month', 'Month'],
-        ['year', 'Year'],
-        ['date-parity', 'Date parity bit'],
-        ['raw-bits', 'Raw bits'],
-        ['unknown-bits', 'Unknown bits'],
-        ['warnings', 'Human-readable warnings'],
-    ]
+    )
+    annotations = (
+        ('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'),
+        ('minute', 'Minute'),
+        ('minute-parity', 'Minute parity bit'),
+        ('hour', 'Hour'),
+        ('hour-parity', 'Hour parity bit'),
+        ('day', 'Day of month'),
+        ('day-of-week', 'Day of week'),
+        ('month', 'Month'),
+        ('year', 'Year'),
+        ('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
@@ -74,7 +77,6 @@ class Decoder(srd.Decoder):
         self.dcf77_bitnumber_is_known = 0
 
     def start(self):
-        # self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
@@ -222,7 +224,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).