X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=decoders%2Fds1307%2Fpd.py;h=2447af596815690f73ca1f0fe5632cefcf99fcb1;hb=903e9b14c84400579e0d786b7a96e9e587b5849b;hp=305a572f4d67e83acf53c5bde3f825699bffc86d;hpb=5188abb910323c22c57ef95880cdd78eaab2e1f8;p=libsigrokdecode.git

diff --git a/decoders/ds1307/pd.py b/decoders/ds1307/pd.py
index 305a572..2447af5 100644
--- a/decoders/ds1307/pd.py
+++ b/decoders/ds1307/pd.py
@@ -37,6 +37,13 @@ bits = (
     'Hours', 'Day', 'Date', 'Month', 'Year', 'OUT', 'SQWE', 'RS', 'RAM',
 )
 
+rates = {
+    0b00: '1Hz',
+    0b01: '4096kHz',
+    0b10: '8192kHz',
+    0b11: '32768kHz',
+}
+
 def regs_and_bits():
     l = [('reg-' + r.lower(), r + ' register') for r in regs]
     l += [('bit-' + re.sub('\/| ', '-', b).lower(), b + ' bit') for b in bits]
@@ -149,7 +156,24 @@ class Decoder(srd.Decoder):
         self.putd(7, 0, [19, ['Year: %d' % y, 'Y: %d' % y, 'Y']])
 
     def handle_reg_0x07(self, b): # Control Register
-        pass
+        self.putd(7, 0, [7, ['Control', 'Ctrl', 'C']])
+        for i in (6, 5, 3, 2):
+            self.putr(i)
+        o = 1 if (b & (1 << 7)) else 0
+        s = 1 if (b & (1 << 4)) else 0
+        s2 = 'en' if (b & (1 << 4)) else 'dis'
+        r = rates[b & 0x03]
+        self.putd(7, 7, [20, ['Output control: %d' % o,
+            'OUT: %d' % o, 'O: %d' % o, 'O']])
+        self.putd(4, 4, [21, ['Square wave output: %sabled' % s2,
+            'SQWE: %sabled' % s2, 'SQWE: %d' % s, 'S: %d' % s, 'S']])
+        self.putd(1, 0, [22, ['Square wave output rate: %s' % r,
+            'Square wave rate: %s' % r, 'SQW rate: %s' % r, 'Rate: %s' % r,
+            'RS: %s' % s, 'RS', 'R']])
+
+    def handle_reg_0x3f(self, b): # RAM (bytes 0x08-0x3f)
+        self.putd(7, 0, [8, ['RAM', 'R']])
+        self.putd(7, 0, [23, ['SRAM: 0x%02X' % b, '0x%02X' % b]])
 
     def decode(self, ss, es, data):
         cmd, databyte = data
@@ -189,7 +213,8 @@ class Decoder(srd.Decoder):
                 return
             # Otherwise: Get data bytes until a STOP condition occurs.
             if cmd == 'DATA WRITE':
-                handle_reg = getattr(self, 'handle_reg_0x%02x' % self.reg)
+                r = self.reg if self.reg < 8 else 0x3f
+                handle_reg = getattr(self, 'handle_reg_0x%02x' % r)
                 handle_reg(databyte)
                 self.reg += 1
                 # TODO: Check for NACK!
@@ -213,7 +238,8 @@ class Decoder(srd.Decoder):
                 pass # TODO
         elif self.state == 'READ RTC REGS2':
             if cmd == 'DATA READ':
-                handle_reg = getattr(self, 'handle_reg_0x%02x' % self.reg)
+                r = self.reg if self.reg < 8 else 0x3f
+                handle_reg = getattr(self, 'handle_reg_0x%02x' % r)
                 handle_reg(databyte)
                 self.reg += 1
                 # TODO: Check for NACK!