add lp vibrato "off" option, specific channel send, started jazz mode

Author: flipcoder

requirements.txt

@@ -5,3 +5,4 @@ rtmidi2
 launchpad-py
 musicpy
 pyyaml
+webcolors

scales.yaml

@@ -24,7 +24,7 @@
     - Melodic Minor
     - Assyrian
     - Lydian Augmented
-    - Acoustic
+    - Acoustic # Lydian Dominant
     - Melodic Major
     - Half Dim
     - Altered

src/articulation.py

@@ -29,8 +29,10 @@ def __init__(self, core):
         self.mod_changed = True
         self.last_midi_message = None
 
-        self.mode = self.core.options.vibrato
-        if self.mode not in ('mod', 'pitch'):
+        self.mode = self.core.options.vibrato.lower()
+        if self.mode in ('false', 'off'):
+            self.mode = None
+        elif self.mode not in ('mod', 'pitch'):
             print('Vibrato option must be mod or pitch. Using mod.')
             self.mode = 'mod'
         self.t = 0.0
@@ -116,7 +118,8 @@ def tick(self):
                     if msg != self.last_midi_message:
                         self.core.midi_write(self.core.midi_out, msg)
                         self.last_midi_message = msg
-            self.mod_changed = False
+            if self.mode:
+                self.mod_changed = False
 
         # held_note_count = self.core.held_note_count()
         # if held_note_count == 0:

src/core.py

@@ -397,6 +397,8 @@ def init_board(self):
         for i, note in enumerate(self.notes):
             self.notes[i] = Note()
 
+        # These are midi numbers, not indicies, so they only have to be 127
+        self.left_chord_notes = [False] * 127
         self.chord_notes = [False] * 127
         self.note_set = set()
 
@@ -419,7 +421,7 @@ def note_on(self, data, timestamp, width=None, curve=True, mpe=None):
         msg = (data[0] & 0xF0) >> 4
         aftertouch = (msg == 10)
         if self.options.one_channel:
-            data[0] = d0 & 0xF0  # send all to channel 0 if enabled
+            data[0] = (d0 & 0xF0) + (self.options.one_channel-1)  # send all to channel 0 if enabled
         row = None
         col = None
 
@@ -476,9 +478,11 @@ def note_on(self, data, timestamp, width=None, curve=True, mpe=None):
         data[1] += (self.octave + self.octave_base) * 12
         data[1] += BASE_OFFSET
         midinote = data[1] - 24 + self.transpose * 2
-        split_chan = 0
+        side = self.channel_from_split(col, row, force=True)
         if self.is_split():
-            split_chan = self.channel_from_split(col, row)
+            split_chan = side
+        else:
+            split_chan = 0
         if not aftertouch:
             self.mark(midinote, 1, only_row=row)
         data[1] += self.out_octave * 12 + self.transpose * 2
@@ -515,9 +519,14 @@ def note_on(self, data, timestamp, width=None, curve=True, mpe=None):
                 note.midinote = data[1]
                 note.split = split_chan
 
-        self.chord_notes[data[1]] = True
-        self.note_set.add(data[1])
-        self.dirty_chord = True
+            if self.options.jazz:
+                if side == 0:
+                    self.left_chord_notes[data[1]] = True
+                    # self.dirty_left_chord = True
+        
+            self.chord_notes[data[1]] = True
+            self.note_set.add(data[1])
+            self.dirty_chord = True
 
         if self.is_split():
             if split_chan == 0:
@@ -537,7 +546,7 @@ def note_off(self, data, timestamp, width=None, mpe=None):
         ch = d0 & 0x0F
         msg = (data[0] & 0xF0) >> 4
         if self.options.one_channel:
-            data[0] = d0 & 0xF0  # send all to channel 0 if enabled
+            data[0] = (d0 & 0xF0) + (self.options.one_channel-1)
         row = None
         col = None
 
@@ -605,15 +614,26 @@ def note_off(self, data, timestamp, width=None, mpe=None):
         data[1] += (self.octave + self.octave_base) * 12
         data[1] += BASE_OFFSET
         midinote = data[1] - 24 + self.transpose * 2
+        side = self.channel_from_split(col, row, force=True)
         if self.is_split():
-            split_chan = self.channel_from_split(col, row)
+            split_chan = side
+        else:
+            split_chan = 0
         self.mark(midinote, 0, only_row=row)
         data[1] += self.out_octave * 12 + self.transpose * 2
         if self.flipped:
             data[1] += 7
 
+        if self.options.jazz:
+            if side == 0:
+                self.left_chord_notes[data[1]] = False
+                # self.dirty_left_chord = True
+        
         self.chord_notes[data[1]] = False
-        self.note_set.remove(data[1])
+        try:
+            self.note_set.remove(data[1])
+        except KeyError:
+            pass
         self.dirty_chord = True
 
         if self.is_split():
@@ -632,7 +652,7 @@ def device_to_xy(self, data):
         ch = d0 & 0x0F
         msg = (data[0] & 0xF0) >> 4
         if self.options.one_channel:
-            data[0] = d0 & 0xF0  # send all to channel 0 if enabled
+            data[0] = (d0 & 0xF0) + (self.options.one_channel-1)
         row = None
         col = None
 
@@ -689,7 +709,7 @@ def cb_midi_in(self, data, timestamp):
         ch = d0 & 0x0F
         msg = (data[0] & 0xF0) >> 4
         if self.options.one_channel:
-            data[0] = d0 & 0xF0  # send all to channel 0 if enabled
+            data[0] = (d0 & 0xF0) + (self.options.one_channel-1)
         row = None
         col = None
         if not self.options.mpe:
@@ -1055,13 +1075,14 @@ def __init__(self):
         # ) or get_option(
         #     opts, "no_overlap", DEFAULT_OPTIONS.mpe
         # )
-        self.options.mpe = True
         self.options.vibrato = get_option(opts, "vibrato", DEFAULT_OPTIONS.vibrato)
         self.options.midi_out = get_option(opts, "midi_out", DEFAULT_OPTIONS.midi_out)
         self.options.split_out = get_option(
             opts, "split_out", DEFAULT_OPTIONS.split_out
         )
         self.options.fps = get_option(opts, "fps", DEFAULT_OPTIONS.fps)
+        self.options.fps = get_option(opts, "jazz", DEFAULT_OPTIONS.jazz)
+        self.options.chord_analyzer = get_option(opts, "chord_analyzer", DEFAULT_OPTIONS.chord_analyzer)
         self.split_state = self.options.split = get_option(
             opts, "split", DEFAULT_OPTIONS.split
         )
@@ -1423,6 +1444,7 @@ def __init__(self):
         self.dirty = True
         self.dirty_lights = True
         self.dirty_chord = False
+        # self.dirty_left_chord = False
 
         w = self.max_width
         h = self.board_h
@@ -1871,28 +1893,40 @@ def logic(self, dt):
         # #     if self.config_save_timer <= 0.0:
         # #         save()
 
-        # TODO: if notes changed
-        if self.dirty_chord:
-            notes = []
-            for i, note in enumerate(self.chord_notes):
-                if note:
-                    notes.append(NOTES[i % 12])
-            if notes:
-                self.chord = mp.alg.detect(mp.chord(','.join(notes)))
-                try:
-                    self.chord = self.chord[0:self.chord.index(' sort')]
-                except ValueError:
-                    pass
-                if self.chord.startswith('note '):
-                    self.chord = self.chord[len('note '):-1]
-            else:
-                self.chord = ''
-            self.dirty_chord = False
-            self.dirty = True
+        # chord analysis for jazz mod
+        if self.options.jazz:
+            if self.dirty_chord:
+                self.left_chord = self.analyze(self.left_chord_notes)
+        
+        # chord analyzer
+        if self.options.chord_analyzer:
+            if self.dirty_chord:
+                self.chord = self.analyze(self.chord_notes)
+        
+        self.dirty_chord = False
 
         if not self.options.lite:
             self.gui.update(dt)
 
+    def analyze(self, chord_notes):
+        notes = []
+        r = ''
+        for i, note in enumerate(chord_notes):
+            if note:
+                notes.append(NOTES[i % 12])
+        if notes:
+            r = mp.alg.detect(mp.chord(','.join(notes)))
+            # try:
+            #     r = r[0:self.chord.index(' sort')]
+            # except ValueError:
+            #     pass
+            # if self.chord.startswith('note '):
+            #     r = r[len('note '):-1]
+        else:
+            r = ''
+        self.dirty = True
+        return r
+
     def sustainable_devices(self):
         if not self.is_split() or not self.options.sustain_split:
             return [self.midi_out]

src/options.py

@@ -5,7 +5,7 @@ class Options:
     version: int = 0
     lights: str = "4,7,3,7,3,3,7,3,7,3,7,3"
     split_lights: str = "4,7,5,7,5,5,7,5,7,5,7,5"
-    one_channel: bool = False
+    one_channel: int = 0
     lite: bool = False # lite mode (no gfx)
     velocity_curve: float = 1.0
     velocity_curve_low: float = 0.5
@@ -26,6 +26,8 @@ class Options:
     width: int = 16
     height: int = 8
     vibrato: str = 'mod'
+    jazz: bool = False
+    chord_analyzer: bool = True
 
 DEFAULT_OPTIONS = Options()