license: remove FSF postal address from boiler plate license text

[libsigrokdecode.git] / decoders / mlx90614 / pd.py

diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py
index 1ee88d78509bad088f36254e1c4ab5b778beb350..c2b37c7bcf9c33a4688c3bac2d85ad13d3a0168a 100644 (file)
--- 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>
 ##
@@ -14,16 +14,13 @@
 ## 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 = 2
     id = 'mlx90614'
     name = 'MLX90614'
     longname = 'Melexis MLX90614'
@@ -31,24 +28,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):
+    def __init__(self):
         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 +69,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: %d' % self.state)
-