diff --git a/__init__.py b/__init__.py index c3ee53a6cee8844dc626351d901c839e56550046..a77c7ba296b59c18732e452481f468bad5a3b29d 100755 --- a/__init__.py +++ b/__init__.py @@ -36,8 +36,8 @@ class EndlessSequencer(Application): 'bark.wav', 'nya.wav', ] - #self.sample_names = [ - # 'close.wav' ] + self.sample_names = [ + 'close.wav' ] self.current_sample = None self.current_note = 0 self.startTime = time.ticks_ms() @@ -55,7 +55,7 @@ class EndlessSequencer(Application): ).fill() ctx.save() - ctx.move_to(0, 0) + ctx.move_to(0, -10) ctx.text_baseline = ctx.MIDDLE ctx.text_align = ctx.CENTER ctx.rgb(*colours.GO_GREEN) @@ -75,6 +75,7 @@ class EndlessSequencer(Application): # Main UI ctx.rgb(*colours.WHITE) + # Buttons ctx.move_to(0, -80) ctx.font_size = 80 ctx.text("^") @@ -91,12 +92,22 @@ class EndlessSequencer(Application): ctx.text("reset") ctx.rotate(0.45) + # CURRENT SAMPLE if self.current_sample != None and self.current_sample < len(self.sample_names): - ctx.move_to(0, 40) + ctx.move_to(0, 25) ctx.rgb(*colours.RED) ctx.font_size = 20 ctx.text(self.sample_names[self.current_sample]) + # BPM + ctx.move_to(0, 60) + ctx.rgb(*colours.WHITE) + ctx.font_size = 24 + ctx.text("BPM: {}".format(self.bpm)) + ctx.move_to(0, 80) + ctx.font_size = 14 + ctx.text("left btn to adjust") + ctx.restore() def think(self, ins: InputState, delta_ms: int) -> None: @@ -120,6 +131,12 @@ class EndlessSequencer(Application): ct = captouch.read() # Input command + btn = self.input.buttons.app + if btn.left.repeated or btn.left.pressed: + self.bpm -= 1 + if btn.right.repeated or btn.right.pressed: + self.bpm += 1 + if ct.petals[9].pressed: #reset if self.DEBUG: print("CLEAR SEQ")