dcf77: Fix multi-bit DCF77 field annotations.

[libsigrokdecode.git] / decoders / dcf77 / pd.py

diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py
index 7218e7ee0ac4564fbfecd08b4e20c2adaf6666b9..396945c93b6096554f505c28ccb6d12e7b9dac19 100644 (file)
--- a/decoders/dcf77/pd.py
+++ b/decoders/dcf77/pd.py
@@ -69,9 +69,7 @@ class Decoder(srd.Decoder):
         self.oldpins = None
         self.oldval = None
         self.samplenum = 0
-        self.bit_start = 0
-        self.bit_start_old = 0
-        self.bit_end = 0
+        self.ss_bit = self.ss_bit_old = self.es_bit = self.ss_block = 0
         self.bitcount = 0 # Counter for the DCF77 bits (0..58)
         self.dcf77_bitnumber_is_known = 0
 
@@ -84,7 +82,12 @@ class Decoder(srd.Decoder):
         pass
 
     def putx(self, data):
-        self.put(self.bit_start, self.bit_end, self.out_ann, data)
+        # Annotation for a single DCF77 bit.
+        self.put(self.ss_bit, self.es_bit, self.out_ann, data)
+
+    def putb(self, data):
+        # Annotation for a multi-bit DCF77 field.
+        self.put(self.ss_block, self.samplenum, self.out_ann, data)
 
     # TODO: Which range to use? Only the 100ms/200ms or full second?
     def handle_dcf77_bit(self, bit):
@@ -113,10 +116,11 @@ class Decoder(srd.Decoder):
             # Special bits (civil warnings, weather forecast): DCF77 bits 1-14.
             if c == 1:
                 self.tmp = bit
+                self.ss_block = self.ss_bit
             else:
                 self.tmp |= (bit << (c - 1))
             if c == 14:
-                self.putx([1, ['Special bits: %s' % bin(self.tmp)]])
+                self.putb([1, ['Special bits: %s' % bin(self.tmp)]])
         elif c == 15:
             s = '' if (bit == 1) else 'not '
             self.putx([2, ['Call bit is %sset' % s]])
@@ -143,10 +147,11 @@ class Decoder(srd.Decoder):
             # Minutes (0-59): DCF77 bits 21-27 (BCD format).
             if c == 21:
                 self.tmp = bit
+                self.ss_block = self.ss_bit
             else:
                 self.tmp |= (bit << (c - 21))
             if c == 27:
-                self.putx([8, ['Minutes: %d' % bcd2int(self.tmp)]])
+                self.putb([8, ['Minutes: %d' % bcd2int(self.tmp)]])
         elif c == 28:
             # Even parity over minute bits (21-28): DCF77 bit 28.
             self.tmp |= (bit << (c - 21))
@@ -157,10 +162,11 @@ class Decoder(srd.Decoder):
             # Hours (0-23): DCF77 bits 29-34 (BCD format).
             if c == 29:
                 self.tmp = bit
+                self.ss_block = self.ss_bit
             else:
                 self.tmp |= (bit << (c - 29))
             if c == 34:
-                self.putx([10, ['Hours: %d' % bcd2int(self.tmp)]])
+                self.putb([10, ['Hours: %d' % bcd2int(self.tmp)]])
         elif c == 35:
             # Even parity over hour bits (29-35): DCF77 bit 35.
             self.tmp |= (bit << (c - 29))
@@ -171,25 +177,28 @@ class Decoder(srd.Decoder):
             # Day of month (1-31): DCF77 bits 36-41 (BCD format).
             if c == 36:
                 self.tmp = bit
+                self.ss_block = self.ss_bit
             else:
                 self.tmp |= (bit << (c - 36))
             if c == 41:
-                self.putx([12, ['Day: %d' % bcd2int(self.tmp)]])
+                self.putb([12, ['Day: %d' % bcd2int(self.tmp)]])
         elif c in range(42, 44 + 1):
             # Day of week (1-7): DCF77 bits 42-44 (BCD format).
             # A value of 1 means Monday, 7 means Sunday.
             if c == 42:
                 self.tmp = bit
+                self.ss_block = self.ss_bit
             else:
                 self.tmp |= (bit << (c - 42))
             if c == 44:
                 d = bcd2int(self.tmp)
                 dn = calendar.day_name[d - 1] # day_name[0] == Monday
-                self.putx([13, ['Day of week: %d (%s)' % (d, dn)]])
+                self.putb([13, ['Day of week: %d (%s)' % (d, dn)]])
         elif c in range(45, 49 + 1):
             # Month (1-12): DCF77 bits 45-49 (BCD format).
             if c == 45:
                 self.tmp = bit
+                self.ss_block = self.ss_bit
             else:
                 self.tmp |= (bit << (c - 45))
             if c == 49:
@@ -200,10 +209,11 @@ class Decoder(srd.Decoder):
             # Year (0-99): DCF77 bits 50-57 (BCD format).
             if c == 50:
                 self.tmp = bit
+                self.ss_block = self.ss_bit
             else:
                 self.tmp |= (bit << (c - 50))
             if c == 57:
-                self.putx([15, ['Year: %d' % bcd2int(self.tmp)]])
+                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))
@@ -228,10 +238,10 @@ class Decoder(srd.Decoder):
                     continue
 
                 # Save the sample number where the DCF77 bit begins.
-                self.bit_start = self.samplenum
+                self.ss_bit = self.samplenum
 
                 # Calculate the length (in ms) between two rising edges.
-                len_edges = self.bit_start - self.bit_start_old
+                len_edges = self.ss_bit - self.ss_bit_old
                 len_edges_ms = int((len_edges / self.samplerate) * 1000)
 
                 # The time between two rising edges is usually around 1000ms.
@@ -242,10 +252,10 @@ class Decoder(srd.Decoder):
                 # beginning of a new minute (and DCF77 bit 0 of that minute).
                 if len_edges_ms in range(1600, 2400 + 1):
                     self.bitcount = 0
-                    self.bit_start_old = self.bit_start
+                    self.ss_bit_old = self.ss_bit
                     self.dcf77_bitnumber_is_known = 1
 
-                self.bit_start_old = self.bit_start
+                self.ss_bit_old = self.ss_bit
                 self.state = 'GET BIT'
 
             elif self.state == 'GET BIT':
@@ -255,10 +265,10 @@ class Decoder(srd.Decoder):
                     continue
 
                 # Save the sample number where the DCF77 bit ends.
-                self.bit_end = self.samplenum
+                self.es_bit = self.samplenum
 
                 # Calculate the length (in ms) of the current high period.
-                len_high = self.samplenum - self.bit_start
+                len_high = self.samplenum - self.ss_bit
                 len_high_ms = int((len_high / self.samplerate) * 1000)
 
                 # If the high signal was 100ms long, that encodes a 0 bit.