X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Frgb_led_spi%2Fpd.py;h=c64bd2990a789c0ac1387d7a6d0e41cd33aa3d31;hp=44c1837b66cc66ddf389bf0f1e3e74a7fcc87d3f;hb=4539e9ca58966ce3c9cad4801b16c315e86ace01;hpb=ae036d3403ad9e301d41a68869ded51a54127bfe

diff --git a/decoders/rgb_led_spi/pd.py b/decoders/rgb_led_spi/pd.py
index 44c1837..c64bd29 100644
--- a/decoders/rgb_led_spi/pd.py
+++ b/decoders/rgb_led_spi/pd.py
@@ -14,37 +14,33 @@
 ## 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 = 2
     id = 'rgb_led_spi'
-    name = 'RGB LED (SPI mode)'
-    longname = 'RGB LED string decoder (SPI mode)'
-    desc = 'Generic RGB LED string protocol (RGB values clocked over SPI).'
-    license = 'gplv2'
+    name = 'RGB LED (SPI)'
+    longname = 'RGB LED string decoder (SPI)'
+    desc = 'RGB LED string protocol (RGB values clocked over SPI).'
+    license = 'gplv2+'
     inputs = ['spi']
     outputs = ['rgb_led_spi']
-    probes = []
-    optional_probes = []
-    options = {}
-    annotations = [
-        ['rgb', 'RGB values'],
-    ]
+    annotations = (
+        ('rgb', 'RGB values'),
+    )
 
-    def __init__(self, **kwargs):
-        self.cmd_ss, self.cmd_es = 0, 0
+    def __init__(self):
+        self.ss_cmd, self.es_cmd = 0, 0
         self.mosi_bytes = []
 
     def start(self):
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def putx(self, data):
-        self.put(self.cmd_ss, self.cmd_es, self.out_ann, data)
+        self.put(self.ss_cmd, self.es_cmd, self.out_ann, data)
 
     def decode(self, ss, es, data):
         ptype, mosi, miso = data
@@ -55,7 +51,7 @@ class Decoder(srd.Decoder):
         self.ss, self.es = ss, es
 
         if len(self.mosi_bytes) == 0:
-            self.cmd_ss = ss
+            self.ss_cmd = ss
         self.mosi_bytes.append(mosi)
 
         # RGB value == 3 bytes
@@ -63,10 +59,8 @@ class Decoder(srd.Decoder):
             return
 
         red, green, blue = self.mosi_bytes
-        rgb_value  = int(red) << 16
-        rgb_value |= int(green) << 8
-        rgb_value |= int(blue)
+        rgb_value = int(red) << 16 | int(green) << 8 | int(blue)
 
-        self.cmd_es = es
-        self.putx([0, ["#%.6x" % rgb_value]])
+        self.es_cmd = es
+        self.putx([0, ['#%.6x' % rgb_value]])
         self.mosi_bytes = []