X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fmidi%2Fpd.py;h=5915976c164535d42c10d29b920f9a81795777a3;hb=92a06d0b6bbe173257d7c76ed2318f5b35f65637;hp=5845e03d60c849a36031e3ff3f5cc287b52f805d;hpb=da9bcbd9f45b0153465c55ec726a0d76f6d7f01e;p=libsigrokdecode.git

diff --git a/decoders/midi/pd.py b/decoders/midi/pd.py
index 5845e03..5915976 100644
--- a/decoders/midi/pd.py
+++ b/decoders/midi/pd.py
@@ -25,7 +25,7 @@ RX = 0
 TX = 1
 
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'midi'
     name = 'MIDI'
     longname = 'Musical Instrument Digital Interface'
@@ -46,7 +46,6 @@ class Decoder(srd.Decoder):
         self.es_block = None
 
     def start(self):
-        # self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def putx(self, data):
@@ -71,7 +70,7 @@ class Decoder(srd.Decoder):
         c = self.cmd
         if len(c) < 3:
             return
-        self.es_block = self.ss
+        self.es_block = self.es
         msg, chan, note, velocity = c[0] & 0xf0, (c[0] & 0x0f) + 1, c[1], c[2]
         s = 'note off' if (velocity == 0) else status_bytes[msg]
         self.putx([0, ['Channel %d: %s (note = %d, velocity = %d)' % \
@@ -163,7 +162,7 @@ class Decoder(srd.Decoder):
 
     def handle_sysrealtime_msg(self, newbyte):
         # System realtime message: 0b11111ttt (t = message type)
-        self.es_block = self.ss
+        self.es_block = self.es
         self.putx([0, ['System realtime message: %s' % status_bytes[newbyte]]])
         self.cmd, self.state = [], 'IDLE'
 
@@ -176,6 +175,9 @@ class Decoder(srd.Decoder):
 
         self.ss, self.es = ss, es
 
+        # We're only interested in the byte value (not individual bits).
+        pdata = pdata[0]
+
         # Short MIDI overview:
         #  - Status bytes are 0x80-0xff, data bytes are 0x00-0x7f.
         #  - Most messages: 1 status byte, 1-2 data bytes.
@@ -207,6 +209,3 @@ class Decoder(srd.Decoder):
             self.handle_syscommon_msg(pdata)
         elif self.state == 'HANDLE SYSREALTIME MSG':
             self.handle_sysrealtime_msg(pdata)
-        else:
-            raise Exception('Invalid state: %s' % self.state)
-