X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fmlx90614%2Fpd.py;h=aa1ead548fe0b4a9878a1a4b83f027f20311b634;hb=95d11271b46a46788d497481d03177e883c8554e;hp=329f2b6a47c4d2701e0da90240c392852c38d6e7;hpb=0eeeb544e1ea3cef9669f98e7c0b19b8f73a9236;p=libsigrokdecode.git

diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py
index 329f2b6..aa1ead5 100644
--- a/decoders/mlx90614/pd.py
+++ b/decoders/mlx90614/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 <uwe@hermann-uwe.de>
 ##
@@ -18,12 +18,10 @@
 ## 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
+    api_version = 2
     id = 'mlx90614'
     name = 'MLX90614'
     longname = 'Melexis MLX90614'
@@ -31,24 +29,17 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['mlx90614']
-    probes = []
-    optional_probes = []
-    options = {}
-    annotations = [
-        ['Celsius', 'Temperature in degrees Celsius'],
-        ['Kelvin', 'Temperature in degrees Kelvin'],
-    ]
+    annotations = (
+        ('celsius', 'Temperature in degrees Celsius'),
+        ('kelvin', 'Temperature in 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 start(self):
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def putx(self, data):
         self.put(self.ss, self.es, self.out_ann, data)
@@ -79,9 +70,6 @@ class Decoder(srd.Decoder):
                 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.putx([1, ['Temperature: %3.2f K' % kelvin]])
                 self.state = 'IGNORE START REPEAT'
                 self.data = []
-        else:
-            raise Exception('Invalid state: %s' % self.state)
-