From 24c74fd30fb161837c5f8b01baf3c0fe2dfa4ed5 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 21 Nov 2012 22:43:02 +0100 Subject: All PDs: Name the files pd.py consistently. The Python module name is determined by the directory name (e.g. dcf77), the *.py file names in that directory don't matter and can be kept consistent. --- decoders/mlx90614/Makefile.am | 2 +- decoders/mlx90614/__init__.py | 2 +- decoders/mlx90614/mlx90614.py | 87 ------------------------------------------- decoders/mlx90614/pd.py | 87 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 decoders/mlx90614/mlx90614.py create mode 100644 decoders/mlx90614/pd.py (limited to 'decoders/mlx90614') diff --git a/decoders/mlx90614/Makefile.am b/decoders/mlx90614/Makefile.am index f14874f..c9d0d4b 100644 --- a/decoders/mlx90614/Makefile.am +++ b/decoders/mlx90614/Makefile.am @@ -20,7 +20,7 @@ pkgdatadir = $(DECODERS_DIR)/mlx90614 -dist_pkgdata_DATA = __init__.py mlx90614.py +dist_pkgdata_DATA = __init__.py pd.py CLEANFILES = *.pyc diff --git a/decoders/mlx90614/__init__.py b/decoders/mlx90614/__init__.py index 0ceabc2..c14e67f 100644 --- a/decoders/mlx90614/__init__.py +++ b/decoders/mlx90614/__init__.py @@ -25,5 +25,5 @@ Details: TODO ''' -from .mlx90614 import * +from .pd import * diff --git a/decoders/mlx90614/mlx90614.py b/decoders/mlx90614/mlx90614.py deleted file mode 100644 index 1ee88d7..0000000 --- a/decoders/mlx90614/mlx90614.py +++ /dev/null @@ -1,87 +0,0 @@ -## -## This file is part of the sigrok project. -## -## Copyright (C) 2012 Uwe Hermann -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## 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 -## - -# Melexis MLX90614 Infrared Thermometer protocol decoder - -import sigrokdecode as srd - -class Decoder(srd.Decoder): - api_version = 1 - id = 'mlx90614' - name = 'MLX90614' - longname = 'Melexis MLX90614' - desc = 'Infrared Thermometer protocol.' - license = 'gplv2+' - inputs = ['i2c'] - outputs = ['mlx90614'] - probes = [] - optional_probes = [] - options = {} - annotations = [ - ['Celsius', 'Temperature in degrees Celsius'], - ['Kelvin', 'Temperature in degrees Kelvin'], - ] - - def __init__(self, **kwargs): - self.state = 'IGNORE START REPEAT' - self.data = [] - - def start(self, metadata): - # self.out_proto = self.add(srd.OUTPUT_PROTO, 'mlx90614') - self.out_ann = self.add(srd.OUTPUT_ANN, 'mlx90614') - - def report(self): - pass - - def putx(self, data): - self.put(self.ss, self.es, self.out_ann, data) - - # Quick hack implementation! This needs to be improved a lot! - def decode(self, ss, es, data): - cmd, databyte = data - - # State machine. - if self.state == 'IGNORE START REPEAT': - if cmd != 'START REPEAT': - return - self.state = 'IGNORE ADDRESS WRITE' - elif self.state == 'IGNORE ADDRESS WRITE': - if cmd != 'ADDRESS WRITE': - return - self.state = 'GET TEMPERATURE' - elif self.state == 'GET TEMPERATURE': - if cmd != 'DATA WRITE': - return - if len(self.data) == 0: - self.data.append(databyte) - self.ss = ss - elif len(self.data) == 1: - self.data.append(databyte) - self.es = es - else: - kelvin = (self.data[0] | (self.data[1] << 8)) * 0.02 - celsius = kelvin - 273.15 - self.putx([0, ['Temperature: %3.2f °C' % celsius]]) - self.putx([1, ['Temperature: %3.2f °K' % kelvin]]) - self.state = 'IGNORE START REPEAT' - self.data = [] - else: - raise Exception('Invalid state: %d' % self.state) - diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py new file mode 100644 index 0000000..1ee88d7 --- /dev/null +++ b/decoders/mlx90614/pd.py @@ -0,0 +1,87 @@ +## +## This file is part of the sigrok project. +## +## Copyright (C) 2012 Uwe Hermann +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## 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 +## + +# Melexis MLX90614 Infrared Thermometer protocol decoder + +import sigrokdecode as srd + +class Decoder(srd.Decoder): + api_version = 1 + id = 'mlx90614' + name = 'MLX90614' + longname = 'Melexis MLX90614' + desc = 'Infrared Thermometer protocol.' + license = 'gplv2+' + inputs = ['i2c'] + outputs = ['mlx90614'] + probes = [] + optional_probes = [] + options = {} + annotations = [ + ['Celsius', 'Temperature in degrees Celsius'], + ['Kelvin', 'Temperature in degrees Kelvin'], + ] + + def __init__(self, **kwargs): + self.state = 'IGNORE START REPEAT' + self.data = [] + + def start(self, metadata): + # self.out_proto = self.add(srd.OUTPUT_PROTO, 'mlx90614') + self.out_ann = self.add(srd.OUTPUT_ANN, 'mlx90614') + + def report(self): + pass + + def putx(self, data): + self.put(self.ss, self.es, self.out_ann, data) + + # Quick hack implementation! This needs to be improved a lot! + def decode(self, ss, es, data): + cmd, databyte = data + + # State machine. + if self.state == 'IGNORE START REPEAT': + if cmd != 'START REPEAT': + return + self.state = 'IGNORE ADDRESS WRITE' + elif self.state == 'IGNORE ADDRESS WRITE': + if cmd != 'ADDRESS WRITE': + return + self.state = 'GET TEMPERATURE' + elif self.state == 'GET TEMPERATURE': + if cmd != 'DATA WRITE': + return + if len(self.data) == 0: + self.data.append(databyte) + self.ss = ss + elif len(self.data) == 1: + self.data.append(databyte) + self.es = es + else: + kelvin = (self.data[0] | (self.data[1] << 8)) * 0.02 + celsius = kelvin - 273.15 + self.putx([0, ['Temperature: %3.2f °C' % celsius]]) + self.putx([1, ['Temperature: %3.2f °K' % kelvin]]) + self.state = 'IGNORE START REPEAT' + self.data = [] + else: + raise Exception('Invalid state: %d' % self.state) + -- cgit v1.2.3-70-g09d2