license: remove FSF postal address from boiler plate license text

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

diff --git a/decoders/ds1307/pd.py b/decoders/ds1307/pd.py
index 800f7a0b2ebe4a6d602f3d05e5126ae84b2c511b..9b7a21f90e60e10110d0d3ecf9d7ec85d3d58647 100644 (file)
--- a/decoders/ds1307/pd.py
+++ b/decoders/ds1307/pd.py
@@ -15,12 +15,12 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License

-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.

 ##
 
 import re
 import sigrokdecode as srd
 ##
 
 import re
 import sigrokdecode as srd

+from common.srdhelper import bcd2int

 
 days_of_week = (
     'Sunday', 'Monday', 'Tuesday', 'Wednesday',
 
 days_of_week = (
     'Sunday', 'Monday', 'Tuesday', 'Wednesday',


@@ -51,10 +51,6 @@ def regs_and_bits():
     l += [('bit-' + re.sub('\/| ', '-', b).lower(), b + ' bit') for b in bits]
     return tuple(l)
 
     l += [('bit-' + re.sub('\/| ', '-', b).lower(), b + ' bit') for b in bits]
     return tuple(l)
 

-# Return the specified BCD number (max. 8 bits) as integer.
-def bcd2int(b):
-    return (b & 0x0f) + ((b >> 4) * 10)
-

 class Decoder(srd.Decoder):
     api_version = 2
     id = 'ds1307'
 class Decoder(srd.Decoder):
     api_version = 2
     id = 'ds1307'


@@ -78,7 +74,7 @@ class Decoder(srd.Decoder):
         ('warnings', 'Warnings', (28,)),
     )
 
         ('warnings', 'Warnings', (28,)),
     )
 

-    def __init__(self, **kwargs):
+    def __init__(self):

         self.state = 'IDLE'
         self.hours = -1
         self.minutes = -1
         self.state = 'IDLE'
         self.hours = -1
         self.minutes = -1


@@ -184,7 +180,7 @@ class Decoder(srd.Decoder):
         d = '%s, %02d.%02d.%4d %02d:%02d:%02d' % (
             days_of_week[self.days - 1], self.date, self.months,
             self.years, self.hours, self.minutes, self.seconds)
         d = '%s, %02d.%02d.%4d %02d:%02d:%02d' % (
             days_of_week[self.days - 1], self.date, self.months,
             self.years, self.hours, self.minutes, self.seconds)

-        self.put(self.block_start_sample, self.es, self.out_ann,
+        self.put(self.ss_block, self.es, self.out_ann,

                  [cls, ['%s date/time: %s' % (rw, d)]])
 
     def handle_reg(self, b):
                  [cls, ['%s date/time: %s' % (rw, d)]])
 
     def handle_reg(self, b):


@@ -200,7 +196,7 @@ class Decoder(srd.Decoder):
     def is_correct_chip(self, addr):
         if addr == DS1307_I2C_ADDRESS:
             return True
     def is_correct_chip(self, addr):
         if addr == DS1307_I2C_ADDRESS:
             return True

-        self.put(self.block_start_sample, self.es, self.out_ann,
+        self.put(self.ss_block, self.es, self.out_ann,

                  [28, ['Ignoring non-DS1307 data (slave 0x%02X)' % addr]])
         return False
 
                  [28, ['Ignoring non-DS1307 data (slave 0x%02X)' % addr]])
         return False
 


@@ -222,7 +218,7 @@ class Decoder(srd.Decoder):
             if cmd != 'START':
                 return
             self.state = 'GET SLAVE ADDR'
             if cmd != 'START':
                 return
             self.state = 'GET SLAVE ADDR'

-            self.block_start_sample = ss
+            self.ss_block = ss

         elif self.state == 'GET SLAVE ADDR':
             # Wait for an address write operation.
             if cmd != 'ADDRESS WRITE':
         elif self.state == 'GET SLAVE ADDR':
             # Wait for an address write operation.
             if cmd != 'ADDRESS WRITE':