X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=decoders%2Fmlx90614%2Fpd.py;h=908f40a62eb70bb392f23e664ce9581c351de88e;hb=65a1134ade0ca1cd1f2789819a239cee3ca90b21;hp=4600754dffe16b550508d49255db8314c143d464;hpb=c761524941fcb2237ceb65082e504e5e48e62a05;p=libsigrokdecode.git

diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py
index 4600754..908f40a 100644
--- a/decoders/mlx90614/pd.py
+++ b/decoders/mlx90614/pd.py
@@ -14,27 +14,34 @@
 ## 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/>.
 ##
 
 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']
+    outputs = []
+    tags = ['IC', 'Sensor']
     annotations = (
-        ('celsius', 'Temperature in degrees Celsius'),
-        ('kelvin', 'Temperature in Kelvin'),
+        ('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 = []
 
@@ -73,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)
-