X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fds1307%2Fpd.py;h=07bdebc9c065ec0aa622fb6b803f9e7e6b285e87;hp=273226c356cedb4c85d6a51abbe7a7ae5f07c58f;hb=8915b34659332288aab38780d8f10d75c4c83e7f;hpb=3bf689988fc1e8db9cb3997039b06f683c413fc1 diff --git a/decoders/ds1307/pd.py b/decoders/ds1307/pd.py index 273226c..07bdebc 100644 --- a/decoders/ds1307/pd.py +++ b/decoders/ds1307/pd.py @@ -1,5 +1,5 @@ ## -## This file is part of the sigrok project. +## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2012 Uwe Hermann ## Copyright (C) 2013 Matt Ranostay @@ -63,7 +63,7 @@ class Decoder(srd.Decoder): self.months = -1 self.years = -1 - def start(self, metadata): + def start(self): self.out_ann = self.add(srd.OUTPUT_ANN, 'ds1307') def report(self): @@ -141,9 +141,9 @@ class Decoder(srd.Decoder): # TODO: Check for NACK! elif cmd == 'STOP': # TODO: Handle read/write of only parts of these items. - d = '%02d.%02d.%02d %02d:%02d:%02d' % (self.days, self.date, - self.months, self.years, self.hours, self.minutes, - self.seconds) + d = '%s, %02d.%02d.%02d %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, es, self.out_ann, [0, ['Written date/time: %s' % d]]) self.state = 'IDLE' @@ -164,9 +164,9 @@ class Decoder(srd.Decoder): self.reg += 1 # TODO: Check for NACK! elif cmd == 'STOP': - d = '%02d.%02d.%02d.%02d %02d:%02d:%02d' % (self.days, - self.date, self.months, self.years, self.hours, - self.minutes, self.seconds) + d = '%s, %02d.%02d.%02d %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, es, self.out_ann, [0, ['Read date/time: %s' % d]]) self.state = 'IDLE'