test 2

Author: flipcoder

src/core.py

@@ -1750,25 +1750,31 @@ def __init__(self):
                 self.foot_in.callback = self.cb_foot
 
         self.launchpads = []
+        num_launchpads = 0
         if self.options.launchpad:
             launchpads = []
             lp = launchpad.LaunchpadPro()
             if lp.Check(0):
                 if lp.Open(0):
-                    self.launchpads += [Launchpad(self, lp, "pro", 0)]
-            if launchpad.LaunchpadProMk3().Check(0):
-                lp = launchpad.LaunchpadProMk3()
+                    self.launchpads += [Launchpad(self, lp, "pro", num_launchpads)]
+                    num_launchpads += 1
+            lp = launchpad.LaunchpadProMk3()
+            if lp.Check(0):
                 if lp.Open(0):
-                    self.launchpads += [Launchpad(self, lp, "promk3", 0)]
-            if launchpad.LaunchpadLPX().Check(1):
+                    self.launchpads += [Launchpad(self, lp, "promk3", num_launchpads)]
+                    num_launchpads += 1
+            lp = launchpad.LaunchpadLPX()
+            if lp.Check(1):
                 lp = launchpad.LaunchpadLPX()
                 if lp.Open(1):
-                    self.launchpads += [Launchpad(self, lp, "lpx", 0)]
+                    self.launchpads += [Launchpad(self, lp, "lpx", num_launchpads)]
+                    num_launchpads += 1
                 if launchpad.LaunchpadLPX().Check(3):
                     lp = launchpad.LaunchpadLPX()
                     if lp.Open(3): # second
-                        self.launchpads += [Launchpad(self, lp, "lpx", 1, self.options.octave_separation)]
-
+                        self.launchpads += [Launchpad(self, lp, "lpx", num_launchpads, self.options.octave_separation)]
+                        num_launchpads += 1
+        
         if self.launchpads:
             print('Launchpads:', len(self.launchpads))
 

src/launchpad.py

@@ -9,71 +9,73 @@ def __init__(self, core, out, mode, index=0, octave_separation=0):
         self.index = index
         self.octave_separation = octave_separation
 
+        print("Launchpad", mode, 'Connected! (#' + str(index) + ")")
+
         # self.pos = glm.ivec2(0, 0)
 
     def button(self, x, y):
         # if self.mode == 'lpx':
         if y == -1:
             if x == 0:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("OCT+")
                 self.octave += 1
                 self.core.clear_marks(use_lights=False)
                 self.core.send_all_notes_off()
             elif x == 1:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("OCT-")
                 self.octave -= 1
                 self.core.clear_marks(use_lights=False)
                 self.core.send_all_notes_off()
             elif x == 2:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("MOV-")
                 self.core.move_board(-1)
                 # self.pos.x -= 1
             elif x == 3:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("MOV+")
                 self.core.move_board(1)
             elif x == 4:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("TRA-")
                 self.core.set_tonic(self.core.tonic - 1)
             elif x == 5:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("TRA+")
                 self.core.set_tonic(self.core.tonic + 1)
         if x == 8:
             if y == 0:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("SCL+")
                 self.core.next_scale()
             elif y == 1:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("SCL-")
                 self.core.prev_scale()
             elif y == 2:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("MOD+")
                 self.core.next_mode()
             elif y == 3:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("MOD-")
                 self.core.prev_mode()
             elif y == 4:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("BANK+")
                 self.core.next_bank()
             elif y == 5:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("BANK-")
                 self.core.prev_bank()
             elif y == 6:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("PROG+")
                 self.core.next_program()
             elif y == 7:
-                if self.core.options.debug:
+                if True:#self.core.options.debug:
                     print("PROG-")
                 self.core.prev_program()