All PDs: Minor whitespace and consistency fixes.

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

diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py
index 1e6c33d0c8c0f5b40fd2cfb2d3109a7d05754c40..aa1ead548fe0b4a9878a1a4b83f027f20311b634 100644 (file)
--- a/decoders/mlx90614/pd.py
+++ b/decoders/mlx90614/pd.py
@@ -21,7 +21,7 @@
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'mlx90614'
     name = 'MLX90614'
     longname = 'Melexis MLX90614'
@@ -29,20 +29,16 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['mlx90614']
-    probes = []
-    optional_probes = []
-    options = {}
-    annotations = [
-        ['Celsius', 'Temperature in degrees Celsius'],
-        ['Kelvin', 'Temperature in 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):
-        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def putx(self, data):
@@ -77,6 +73,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)
-