decoders: Fix incorrect 'outputs' fields.

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

diff --git a/decoders/rfm12/pd.py b/decoders/rfm12/pd.py
index bacd8b15f38d3388d77408851a95219660b170bc..d3df13a9eb3dfeb024cf7cf836b43a672d269920 100644 (file)
--- a/decoders/rfm12/pd.py
+++ b/decoders/rfm12/pd.py
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the libsigrokdecode project.
 ##
-## Copyright (C) 2014 Sławek Piotrowski <slawomir.piotrowski@payu.pl>
+## Copyright (C) 2014 Sławek Piotrowski <sentinel@atteo.org>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,21 +14,21 @@
 ## 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 = 2
+    api_version = 3
     id = 'rfm12'
     name = 'RFM12'
-    longname = 'RFM12 control protocol'
-    desc = 'Protocol for controlling RFM12 wireless transceivers from HoperRF'
+    longname = 'HopeRF RFM12'
+    desc = 'HopeRF RFM12 wireless transceiver control protocol.'
     license = 'gplv2+'
     inputs = ['spi']
-    outputs = ['rfm12']
+    outputs = []
+    tags = ['Wireless/RF']
     annotations = (
         ('cmd', 'Command'),
         ('params', 'Command parameters'),
@@ -43,7 +43,10 @@ class Decoder(srd.Decoder):
         ('interpretation', 'Interpretation', (5,)),
     )
 
-    def __init__(self, **kwargs):
+    def __init__(self):
+        self.reset()
+
+    def reset(self):
         self.mosi_bytes, self.miso_bytes = [], []
         self.mosi_bits, self.miso_bits = [], []
         self.row_pos = [0, 0, 0]
@@ -120,7 +123,7 @@ class Decoder(srd.Decoder):
         self.describe_bits(bits, NAMES)
         self.describe_changed_bits(bits, old_bits, NAMES)
 
-        FREQUENCIES = ['Reserved', '433', '868', '912']
+        FREQUENCIES = ['315', '433', '868', '915']
         f = FREQUENCIES[(cmd[1] & 0x30) >> 4] + 'MHz'
         self.putx(1, 2, ['Frequency: ' + f, f])
         if cmd[1] & 0x30 != self.last_config & 0x30:
@@ -460,7 +463,7 @@ class Decoder(srd.Decoder):
         else:
             c = '%02x %02x' % tuple(cmd)
             r = '%02x %02x' % tuple(ret)
-            self.putx(0, 16, ['Uknown command: %s (reply: %s)!' % (c, r)])
+            self.putx(0, 16, ['Unknown command: %s (reply: %s)!' % (c, r)])
 
     def decode(self, ss, es, data):
         ptype, mosi, miso = data