tbish: better accent, step display

Author: todbot

circuitpython/tbish/code.py

@@ -138,12 +138,14 @@ def update_ui():
         if key.pressed:
             if sequencer.playing:
                 sequencer.stop()
+                tb_disp.stop()
                 # testing out save/load params
                 s = ParamSet.dump(param_set)
                 print(s)
                 ParamSet.load(s)
 
             else:
+                tb_disp.start()
                 sequencer.start()
 
     if touch_events := check_touch():

circuitpython/tbish/paramset.py

@@ -60,15 +60,14 @@ def apply_to_obj(self,o):
             setattr(o, self.objattr, self.val)
 
 class ParamSet:
+    """ParamSet is a collection of Params that track normalized knob positions,
+    especially for the case when there are fewer knobs than Params.
+    """
 
     KNOB_PICKUP = 0
     KNOB_SCALE = 1
     KNOB_RELATIVE = 2
 
-    """ParamSet is a collection of Params that track normalized knob positions,
-    especially for the case when there are fewer knobs than Params.
-    """
-
     def __init__(self, params, num_knobs, min_knob_change=0.05,
                  knob_smooth=0.5, knob_mode = KNOB_PICKUP):
         self.params = params

circuitpython/tbish/tbish_sequencer.py

@@ -16,7 +16,7 @@ def __init__(self, tb, steps_per_beat=4, bpm=120, seqs=None):
         self.transpose = 0
         self.i = 0  # step number
         self.playing = True
-        self.on_step_callback = None
+        self.on_step_callback = None   # callback is func(step, steps_per_beat, seq_len)
 
     @property
     def steps_per_beat(self):
@@ -59,9 +59,10 @@ def update(self):
         if dt <= 0:
             self.next_step_time = now + self._secs_per_step + dt  
             # add dt delta to attempt to make up for display hosing us
-
+            
+            seq_len = len(self.seqs[self.seq_num][0])
             if self.on_step_callback:  # and (self.i % self._steps_per_beat)==0:
-                self.on_step_callback(self.i, self.steps_per_beat)
+                self.on_step_callback(self.i, self.steps_per_beat, seq_len)
 
             if not self.playing:
                 return
@@ -77,9 +78,9 @@ def update(self):
                 self.gate_off_time = time.monotonic() + self._secs_per_step * self.gate_amount
 
             #seq_num = int(param_set.param_for_name('seq').val)
-            self.i = (self.i+1) % len(self.seqs[self.seq_num][0])
+            self.i = (self.i+1) % seq_len
             self.midi_note = midi_note
 
-            print(self.i,"note: %d vel:%3d" % (midi_note, vel),
+            print("step", self.i,"note: %d vel:%3d" % (midi_note, vel),
                   int(self._secs_per_step*1000), int(dt*1000))
 

circuitpython/tbish/tbish_synth.py

@@ -129,7 +129,7 @@ def add_audioeffects(self):
 
     def note_on_step(self, midi_note, slide=False, accent=False):
         """Trigger a note, with slide and accent"""
-        print("note_on_step: %3d %1d %1d" % (midi_note, slide, accent), self.accent)
+        print("note_on_step: %3d %1d %1d" % (midi_note, slide, accent))
         self.note_off(midi_note) # must do when in step mode
         attack_level = 0.8
         cutoff = self.cutoff
@@ -138,7 +138,8 @@ def note_on_step(self, midi_note, slide=False, accent=False):
         glide_time = 0.001  # minimal slide
         if accent:
             attack_level = min(1.0, attack_level + 0.5 * self.accent)
-            cutoff = cutoff + 0.3 * self.accent   # FIXME: verify
+            cutoff = max(cutoff, 4000 * self.accent)   # FIXME: verify
+            print("\ncutoff:", cutoff, self.cutoff, "\n")
             #resonance *= 1.3  # FIXME: how to do 
             envmod = min(1.0, envmod + 0.25 * self.accent)
         if slide:

circuitpython/tbish/tbish_ui.py

@@ -35,17 +35,28 @@ def __init__(self, display, params={}): #, knobAval, knobBval):
         #for l in (self.textA, self.textB):
             self.append(l)
 
+        self.logo = label.Label(fnt, text="TBishBassSynth", color=cw, x=20,y=45)
+        self.append(self.logo)
+
         self.display.refresh()
 
     def next_param_pair(self):
         self.curr_param_pair = (self.curr_param_pair+1) % self.num_param_pairs
 
-    def show_beat(self, step, steps_per_beat):
+    def stop(self):
+        pass
+    
+    def start(self):
+        pass
+    
+    def show_beat(self, step, steps_per_beat, seq_len):
+        self.stepspot.x = 5 + step * 6
+        
         # this doesn't work right but sorta works
-        if step % steps_per_beat == 0 :
-            self.stepspot.hidden = False
-        else:
-            self.stepspot.hidden = True
+        #if step % steps_per_beat == 0 :
+        #    self.stepspot.hidden = False
+        #else:
+        #    self.stepspot.hidden = True
 
     def update_param_pairs(self):
         self.paramspot.x = 45 + 4*(self.curr_param_pair)