X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fmlx90614%2Fpd.py;h=908f40a62eb70bb392f23e664ce9581c351de88e;hp=67a852c4b9c7854c1a7bb1ba15f0b866f4872b09;hb=d94270b928f04ad26ef0cd6f83cd8c6d46d98fc8;hpb=f2a5df42ea41e6c4370d4efa1a27ab942ba1ddff

diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py
index 67a852c..908f40a 100644
--- a/decoders/mlx90614/pd.py
+++ b/decoders/mlx90614/pd.py
@@ -14,41 +14,39 @@
 ## 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/>.
 ##
 
-# Melexis MLX90614 Infrared Thermometer protocol decoder
-
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 3
     id = 'mlx90614'
     name = 'MLX90614'
     longname = 'Melexis MLX90614'
-    desc = 'Infrared Thermometer protocol.'
+    desc = 'Melexis MLX90614 infrared thermometer protocol.'
     license = 'gplv2+'
     inputs = ['i2c']
-    outputs = ['mlx90614']
-    probes = []
-    optional_probes = []
-    options = {}
-    annotations = [
-        ['Celsius', 'Temperature in degrees Celsius'],
-        ['Kelvin', 'Temperature in Kelvin'],
-    ]
+    outputs = []
+    tags = ['IC', 'Sensor']
+    annotations = (
+        ('celsius', 'Temperature / °C'),
+        ('kelvin', 'Temperature / K'),
+    )
+    annotation_rows = (
+        ('temps-celsius', 'Temperature / °C', (0,)),
+        ('temps-kelvin', 'Temperature / K', (1,)),
+    )
+
+    def __init__(self):
+        self.reset()
 
-    def __init__(self, **kwargs):
+    def reset(self):
         self.state = 'IGNORE START REPEAT'
         self.data = []
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'mlx90614')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'mlx90614')
-
-    def report(self):
-        pass
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def putx(self, data):
         self.put(self.ss, self.es, self.out_ann, data)
@@ -82,6 +80,3 @@ class Decoder(srd.Decoder):
                 self.putx([1, ['Temperature: %3.2f K' % kelvin]])
                 self.state = 'IGNORE START REPEAT'
                 self.data = []
-        else:
-            raise Exception('Invalid state: %s' % self.state)
-