light9 Changeset - 0bb08e887166

Changeset - 0bb08e887166

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

drewp@bigasterisk.com - 6 years ago 2019-06-10 02:19:59
drewp@bigasterisk.com

bcf2000 python 3 support
Ignore-this: 2f78d9c590846a357876afc5116aaa5d

1 file changed with 8 insertions and 10 deletions:

bcf2000.py

0 comments (0 inline, 0 general)

bcf2000.py

➞

Show inline comments

@@ @@ -29,65 +29,63 @@ class BCF2000(object): @@
 : "button-lower7",  80 : "button-lower8",
 : "button-corner1", 90 : "button-corner2",
 : "button-corner3", 92 : "button-corner4",
+               }
     def __init__(self, dev="/dev/snd/midiC2D0"):
         """device was usually /dev/snd/midiC1D0 but then it showed up
         once as C0D0. It should be autodetected"""
         self.devPath = dev
         self.dev = None
         self.lastValue: Dict[str, int] = {} # control name : value
         self.reopen()
         self.packet = ""
+        self.packet = b""
         loop = LoopingCall(self.poll)
         loop.start(.01)
     def poll(self):
         try:
-            bytes = self.dev.read(3)
+            newData = self.dev.read(3)
         except (IOError, AttributeError):
             return
         if len(bytes) == 0:
             print("midi stall, reopen slider device")
             self.reopen()
         if newData is None:
             return
-        self.packet += bytes
+        self.packet += newData
         if len(self.packet) == 3:
             p = self.packet
             self.packet = ""
+            self.packet = b""
             self.packetReceived(p)
     def packetReceived(self, packet):
-        b0, which, value = [ord(b) for b in packet]
         b0, which, value = packet
         if b0 != 0xb0:
             return
         if which in self.control:
             name = self.control[which]
             if name.startswith("button-"):
                 value = value > 0
             self.lastValue[name] = value
             self.valueIn(name, value)
         else:
             print("unknown control %s to %s" % (which, value))
     def reopen(self):
         if self.dev is not None:
             try:
                 self.dev.close()
             except IOError:
                 pass
         self.lastValue.clear()
-        self.dev = open(self.devPath, "r+")
+        self.dev = open(self.devPath, "rb+", buffering=0)
         twisted.internet.fdesc.setNonBlocking(self.dev)
     def valueIn(self, name, value):
         """override this with your handler for when events come in
         from the hardware"""
         print("slider %s to %s" % (name, value))
         if name == 'slider1':
             for x in range(2,8+1):
                 v2 = int(64 + 64 * math.sin(x / 3 + value / 10))
                 self.valueOut('slider%d' % x, v2)
             for x in range(1,8+1):
                 self.valueOut('button-upper%s' % x, value > x*15)
@@ @@ -98,21 +96,21 @@ class BCF2000(object): @@
         if self.dev is None:
             return
         value = int(value)
         if self.lastValue.get(name) == value:
             return
         self.lastValue[name] = value
         which = [k for k,v in list(self.control.items()) if v == name]
         assert len(which) == 1, "unknown control name %r" % name
         if name.startswith('button-'):
             value = value * 127
         #print "bcf: write %s %s" % (name, value)
-        self.dev.write(chr(0xb0) + chr(which[0]) + chr(int(value)))
+        self.dev.write(bytes([0xb0, which[0], int(value)]))
     def close(self):
         self.dev.close()
         self.dev = None
 if __name__ == '__main__':
     b = BCF2000()
     reactor.run()

0 comments (0 inline, 0 general)