X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Flm75%2Fpd.py;h=c8f4a1a55a8bb8ff3ebdb5cb672e571bc45f6e68;hp=449916a4d9d98d0b66789d34ab20e5ce1a31257f;hb=4539e9ca58966ce3c9cad4801b16c315e86ace01;hpb=b0918d40e285e7782f4e86356c41648dc748e477 diff --git a/decoders/lm75/pd.py b/decoders/lm75/pd.py index 449916a..c8f4a1a 100644 --- a/decoders/lm75/pd.py +++ b/decoders/lm75/pd.py @@ -14,8 +14,7 @@ ## 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 . ## # TODO: Better support for various LM75 compatible devices. @@ -40,7 +39,7 @@ ft = { } class Decoder(srd.Decoder): - api_version = 1 + api_version = 2 id = 'lm75' name = 'LM75' longname = 'National LM75' @@ -62,13 +61,12 @@ class Decoder(srd.Decoder): ('warnings', 'Human-readable warnings'), ) - def __init__(self, **kwargs): + def __init__(self): self.state = 'IDLE' self.reg = 0x00 # Currently selected register self.databytes = [] def start(self): - # self.out_python = self.register(srd.OUTPUT_PYTHON) self.out_ann = self.register(srd.OUTPUT_ANN) def putx(self, data): @@ -77,7 +75,7 @@ class Decoder(srd.Decoder): def putb(self, data): # Helper for annotations which span a block of I²C packets. - self.put(self.block_start, self.block_end, self.out_ann, data) + self.put(self.ss_block, self.es_block, self.out_ann, data) def warn_upon_invalid_slave(self, addr): # LM75 and compatible devices have a 7-bit I²C slave address where @@ -103,11 +101,11 @@ class Decoder(srd.Decoder): def handle_temperature_reg(self, b, s, rw): # Common helper for the temperature/T_HYST/T_OS registers. if len(self.databytes) == 0: - self.block_start = self.ss + self.ss_block = self.ss self.databytes.append(b) return self.databytes.append(b) - self.block_end = self.es + self.es_block = self.es self.output_temperature(s, rw) self.databytes = [] @@ -182,6 +180,3 @@ class Decoder(srd.Decoder): else: # self.putx([0, ['Ignoring: %s (data=%s)' % (cmd, databyte)]]) pass - else: - raise Exception('Invalid state: %s' % self.state) -