DS1307: Bugs fixes.

- Square wave frequencies above 1 Hz are in Hz not in kHz.
- AM/PM flag is in the bit 5 of hours register not in bit 6.
- AM flag is valid at 0 value of AM/PM flag not at 1 value.

diff --git a/decoders/ds1307/pd.py b/decoders/ds1307/pd.py
index 414da6531c31998977dab755af66dd3ce421257e..0bb1fb2913ad9e46232f36b74117ef1c273e5650 100644 (file)
--- a/decoders/ds1307/pd.py
+++ b/decoders/ds1307/pd.py
@@ -39,9 +39,9 @@ bits = (
 
 rates = {
     0b00: '1Hz',
 
 rates = {
     0b00: '1Hz',

-    0b01: '4096kHz',
-    0b10: '8192kHz',
-    0b11: '32768kHz',
+    0b01: '4096Hz',
+    0b10: '8192Hz',
+    0b11: '32768Hz',

 }
 
 DS1307_I2C_ADDRESS = 0x68
 }
 
 DS1307_I2C_ADDRESS = 0x68


@@ -121,7 +121,7 @@ class Decoder(srd.Decoder):
         ampm_mode = True if (b & (1 << 6)) else False
         if ampm_mode:
             self.putd(6, 6, [13, ['12-hour mode', '12h mode', '12h']])
         ampm_mode = True if (b & (1 << 6)) else False
         if ampm_mode:
             self.putd(6, 6, [13, ['12-hour mode', '12h mode', '12h']])

-            a = 'AM' if (b & (1 << 6)) else 'PM'
+            a = 'PM' if (b & (1 << 5)) else 'AM'

             self.putd(5, 5, [14, [a, a[0]]])
             h = self.hours = bcd2int(b & 0x1f)
             self.putd(4, 0, [15, ['Hour: %d' % h, 'H: %d' % h, 'H']])
             self.putd(5, 5, [14, [a, a[0]]])
             h = self.hours = bcd2int(b & 0x1f)
             self.putd(4, 0, [15, ['Hour: %d' % h, 'H: %d' % h, 'H']])