improved light behavior, fixed bugs

Author: flipcoder

settings.ini.example

@@ -1,9 +1,14 @@
+; Rename this file to settings.ini to apply settings.
+; Uncomment options and change them to customize look and behavior.
+
 [general]
-velocity_curve=1.0
-min_velocity=0
-max_velocity=127
 size=128
-midi_out=midimech
-split_out=split
-fps=60
-split=false
+;velocity_curve=1.0
+;lights=1,9,9,2,2,3,3,5,8,8,11,11
+;split_lights=4,7,5,7,5,5,7,5,7,5,7,5
+;colors=red,darkred,orange,goldenrod,yellow,green,darkolivegreen,blue,darkslateblue,indigo,darkorchid,pink
+;split_colors=cyan,blue,blue,blue,blue,blue,blue,blue,blue,blue,blue,blue
+;mark_light=1
+;mark_color=red
+;one_channel=0
+;lite=false

src/core.py

@@ -194,12 +194,16 @@ def set_mark_light(self, x, y, state=True):
 
     def set_launchpad_light(self, x, y, color):
         """Set launchpad light to color index"""
-        if color is not None:
-            col = self.options.colors[color] / 4
-        else:
-            col = glm.ivec3(0,0,0)
         if self.is_macro_button(x, 8 - y - 1):
             col = glm.ivec3(63,63,63)
+        else:
+            if color != -1: # not mark
+                if color is not None and self.scale_notes[color] != '.':
+                    col = self.options.colors[color] / 4
+                else:
+                    col = glm.ivec3(0,0,0)
+            else:
+                col = self.options.mark_color / 4
         self.launchpad.LedCtrlXY(x, 8-y, col[0], col[1], col[2])
 
     def setup_lights(self):
@@ -444,6 +448,10 @@ def init_board(self):
 
     def midi_write(self, dev, msg, ts=0):
         """Write MIDI message `msg` to device `dev`"""
+        # if type(dev) in (list,tuple):
+        #     for d in dev:
+        #         self.midi_write(d, msg, ts)
+        #     return
         if dev:
             dev.send_raw(*msg)
 
@@ -931,7 +939,7 @@ def cb_launchpad_in(self, event, timestamp=0):
             y = 8 - event[1]
             if 0 <= x < 8 and 0 <= y < 8:
                 note = y * 8 + x
-                self.set_launchpad_light(x, y, 0) # red
+                self.set_launchpad_light(x, y, -1)
                 if not self.is_macro_button(x, 8 - y - 1):
                     self.note_on([144, note, event[2]], timestamp, width=8, force_channel=self.options.launchpad_channel)
                 else:
@@ -1086,7 +1094,7 @@ def __init__(self):
         self.options.colors = list(self.options.colors.split(","))
         self.options.colors = list(map(lambda x: glm.ivec3(get_color(x)), self.options.colors))
 
-        self.options.split_colors = get_option(opts, "colors", DEFAULT_OPTIONS.split_colors)
+        self.options.split_colors = get_option(opts, "split_colors", DEFAULT_OPTIONS.split_colors)
         self.options.split_colors = list(self.options.split_colors.split(","))
         self.options.split_colors = list(map(lambda x: glm.ivec3(get_color(x)), self.options.split_colors))
 
@@ -1160,6 +1168,11 @@ def __init__(self):
         self.options.show_lowest_note = get_option(
             opts, "show_lowest_note", DEFAULT_OPTIONS.show_lowest_note
         )
+
+        self.options.y_bend = get_option(
+            opts, "y_bend", DEFAULT_OPTIONS.y_bend
+        )
+
         # self.options.mpe = get_option(
         #     opts, "mpe", DEFAULT_OPTIONS.mpe
         # ) or get_option(
@@ -1177,9 +1190,9 @@ def __init__(self):
             opts, "split", DEFAULT_OPTIONS.split
         )
         self.options.foot_in = get_option(opts, "foot_in", DEFAULT_OPTIONS.foot_in)
-        self.options.sustain = get_option(
-            opts, "sustain", DEFAULT_OPTIONS.sustain
-        )  # sustain scale
+        # self.options.sustain = get_option(
+        #     opts, "sustain", DEFAULT_OPTIONS.sustain
+        # )
 
         # which split the sustain affects
         self.options.sustain_split = get_option(
@@ -1529,14 +1542,22 @@ def __init__(self):
                     lp = launchpad.LaunchpadLPX()
                     if lp.Open(1):
                         self.launchpad_mode = "lpx"
-                    lp.LedCtrlXY(0, 0, 0, 0, 63)
-                    lp.LedCtrlXY(1, 0, 0, 0, 63)
-                    lp.LedCtrlXY(2, 0, 63, 0, 63)
-                    lp.LedCtrlXY(3, 0, 63, 0, 63)
             if self.launchpad_mode is not None:
                 self.launchpad = lp
 
         self.done = False
+
+        if self.launchpad_mode == "lpx":
+            lp.LedCtrlXY(0, 0, 0, 0, 63)
+            lp.LedCtrlXY(1, 0, 0, 0, 63)
+            lp.LedCtrlXY(2, 0, 63, 0, 63)
+            lp.LedCtrlXY(3, 0, 63, 0, 63)
+
+        # if self.launchpad:
+        #     # use the alternate colors
+        #     self.options.colors = get_option(opts, "colors", DEFAULT_OPTIONS.colors_alt)
+        #     self.options.colors = list(self.options.colors.split(","))
+        #     self.options.colors = list(map(lambda x: glm.ivec3(get_color(x)), self.options.colors))
 
         if not self.midi_out:
             error(

src/options.py

@@ -2,38 +2,92 @@
 
 @dataclass
 class Options:
-    version: int = 0
+    version: int = 0 # Version of the program (not yet impl)
     # lights: str = "4,7,3,7,3,3,7,3,7,3,7,3"
+
+    # LinnStrument light numbers
     lights: str = "4,7,3,7,3,3,7,3,7,3,7,3"
+    # Same as above, for split
     split_lights: str = "4,7,5,7,5,5,7,5,7,5,7,5"
+    
+    # LinnStrument light color for mark, default: 1 (red)
     mark_light: int = 1
+    
+    # LaunchPad light color for mark, default: red
     mark_color: str = "red"
-    # colors: str = "red,darkred,orange,goldenrod,yellow,green,darkolivegreen,blue,darkslateblue,indigo,darkorchid,pink"
+    
+    # Color scheme using webcolors
     colors: str = "cyan,green,green,green,green,green,green,green,green,green,green,green"
     split_colors: str = "cyan,blue,blue,blue,blue,blue,blue,blue,blue,blue,blue,blue"
+
+    # MPE Settings
+    # one_channel==0: MPE enabled
+    # one_channel==1: Output to channel 1 only
+    # one_channel==2: Output to channel 2 only, ...
     one_channel: int = 0
-    lite: bool = False # lite mode (no gfx)
+
+    # lite mode (no extra gfx, less processing)
+    lite: bool = False
+
+    # Custom velocity curve exponent, ex: 0.5 = more sensitive
     velocity_curve: float = 1.0
+    
+    # Velocity curve exponent for foot controller curve bending
     velocity_curve_low: float = 0.5
     velocity_curve_high: float = 3.0
+
+    # Clamp velocity
     min_velocity: float = 0
     max_velocity: float = 127
+    
+    # Show lowest note mark (old option, no longer maintained)
     show_lowest_note: bool = False
-    mpe: bool = True
+
+    # MPE mode on by default? (use one_channel instead)
+    # mpe: bool = True
+
+    # Automatically set based on size==200,
+    #  but can be forced for testing purposes
     hardware_split: bool = False
+    
+    # Midi out device name, partial matches allowed
     midi_out: str = "midimech"
+    
+    # Split device name, partial matches allowed
     split_out: str = "split"
+
+    # Application frames per second
     fps: int = 60
+
+    # Start with split on?
     split: bool = False
+    
+    # Foot controller device name, partial matches allowed
     foot_in: str = ""
+    
+    # Sustain pedal value multiplier (not yet impl)
     sustain: float = 1.0
+
+    # which split should sustain pedal use (left, right, both)
     sustain_split: str = "both"
+
+    # Size of LinnStrument (128 or 200)
     size: int = 128
+
+    # Right now these are calculated from size, don't use
     width: int = 16
     height: int = 8
+
+    # launchpad viberato method (off, mod, or pitch)
     vibrato: str = 'mod'
+    
+    # Set scale based on left hand chord (not yet impl)
     jazz: bool = False
+    
     chord_analyzer: bool = True
 
+    # Allow Y axis to bend chromatically (not yet impl)
+    y_bend: bool = False
+
 DEFAULT_OPTIONS = Options()