misc

config.txt

@@ -1,5 +1,5 @@
-default_song = r100.sng
-theme = default.thm
+default_song = default
+theme = default
 title = default
 bpm = 90
 volume = 10

lib/FSM.py

@@ -77,7 +77,11 @@ class ProgFSM(Char):
         'Util', 
         'File',
         'Ball',
-        'Clock'
+        'Clock',
+        'Exit',
+        'SelTheme',
+        'OpenSong',
+        'EnterText'
         ]
         
         for s in state_list:

lib/StatesProg.py

@@ -2,7 +2,7 @@
 import random
 import time
 import pygame
-
+import sys
 import pyaudio
 import wave
 import glob
@@ -10,6 +10,7 @@ import os
 from itertools import cycle
 from datetime import datetime
 import ast
+import random
 #====================================     
 
 State = type("State", (object,), {})
@@ -31,11 +32,13 @@ class State(object):
 
 def play_seq(o, message):
 	_id = 0
+	o.clear_notes_on()
 	for s in o.soundSlots:
 		if s.notes[message[0]][message[1]][0] == 1:
+			o.notes_on[_id] = 1
 			o.soundSlots[_id].play(s.notes[message[0]][message[1]][1])
 		_id += 1
-
+	#print(o.notes_on)
 def draw_header(o):
 	o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)
 	o.center_text(o.header_text, o.h1, o.width, 25, o.light_grey)
@@ -117,7 +120,7 @@ def draw_menu1(o):
 		if _id == 9:
 			o.center_block("Vol+", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		if _id == 11:
-			o.center_block("Save", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+			o.center_block("", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		if _id == 12:
 			o.center_block("Play", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		if _id == 13:
@@ -135,7 +138,7 @@ def draw_menu1(o):
 			o_x = og_x
 
 
-def draw_menu2(o):
+def draw_menu2_sample(o):
 	bpm_inc = 4
 	x_size = o.width / 4
 	y_size = o.height / 4
@@ -148,54 +151,83 @@ def draw_menu2(o):
 	   
 		o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.dark_grey)
 
-		# if _id == 0:
-		#     o.center_block("Main", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 1:
-		#     o.center_block("Note", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 2:
-		#     o.center_block("Patt", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 3:
-		#     o.center_block("Song", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 4:
-		#     o.center_block("File", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 5:
-		#     o.center_block("Util", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-
-		# if _id == 6:
-		#     o.center_block("Bank-", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-			
-		# if _id == 7:
-		#     o.center_block("Bank+", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-			
-		# if _id == 8:
-		#     o.center_block("Vol-", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		#     #if o.volume > 0:
-		#         #o.volume -= 1
-		# if _id == 9:
-		#     o.center_block("Vol+", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		#     #if o.volume < 16:
-		#         #o.volume += 1
-		# if _id == 11:
-		#     o.center_block("Save", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 12:
-		#     o.center_block("Play", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 13:
-		#     o.center_block("Stop", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 14:
-		#     o.center_block("BPM-", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		# if _id == 15:
-		#     o.center_block("BPM+", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-			
+		
+		if _id == 0:
+			o.center_block("Copy", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 1:
+			o.center_block("Paste", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 2:
+			o.center_block("Del-", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 3:
+			o.center_block("Load", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 
+		if _id == 4:
+			o.center_block("Vol-", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 5:
+			o.center_block("Vol+", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 6:
+			o.center_block("Pitch-", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 7:
+			o.center_block("Pitch+", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		o_x = o_x + x_size
 		_id += 1
 		if _id % 4 == 0:
 			o_y -= y_size
 			o_x = og_x
 
+def draw_menu2_pattern(o):
+	bpm_inc = 4
+	x_size = o.width / 4
+	y_size = o.height / 4
+	og_x = 0
+	o_x = og_x
+	o_y = o.height
+	text_padding = 6
+	_id = 0
+	while _id < 16:
+	   
+		o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.dark_grey)
+
+		if _id == 0:
+			o.center_block("Copy", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 1:
+			o.center_block("Paste", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 2:
+			o.center_block("Clear", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 6:
+			o.center_block("Bank -", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 7:
+			o.center_block("Bank +", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 
+		o_x = o_x + x_size
+		_id += 1
+		if _id % 4 == 0:
+			o_y -= y_size
+			o_x = og_x
 
+def draw_menu2_note(o):
+	bpm_inc = 4
+	x_size = o.width / 4
+	y_size = o.height / 4
+	og_x = 0
+	o_x = og_x
+	o_y = o.height
+	text_padding = 6
+	_id = 0
+	while _id < 16:
+	   
+		o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.dark_grey)
 
+		if _id == 0:
+			o.center_block("Vol -", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 1:
+			o.center_block("Vol +", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		
+		o_x = o_x + x_size
+		_id += 1
+		if _id % 4 == 0:
+			o_y -= y_size
+			o_x = og_x
 
 def menu1_actions(self, o):
 	if o.keyState[16] == 2:
@@ -210,7 +242,7 @@ def menu1_actions(self, o):
 		elif o.keyState[4] == 1:
 			self.FSM.ToTransition('toFile')
 		elif o.keyState[5] == 1:
-			self.FSM.ToTransition('toClock')
+			self.FSM.ToTransition('toUtil')
 		if o.keyState[12] == 1:
 			o.start_playback()
 		if o.keyState[13] == 1:
@@ -225,28 +257,186 @@ def menu1_actions(self, o):
 			if o.volume > 0:
 				o.volume -= 1
 				text_center(o, "Master Volume", str(o.volume))
-				o.disp.image(o.image, o.rotation)
+				o.update_display(0)
 		if o.keyState[9] == 1:
 			if o.volume < 16:
 				o.volume += 1
 				text_center(o, "Master Volume", str(o.volume))
-				o.disp.image(o.image, o.rotation)
+				o.update_display(0)
 		if o.keyState[11] == 1:
-			o.save_song()
+			#o.save_song()
+			pass
 		if o.keyState[14] == 1:
 			if o.sconf.as_int('bpm') > 60:
 				o.sconf['bpm'] = o.sconf.as_int('bpm') - o.bpm_inc
 				o.update_bpm()
 				text_center(o, "Master BPM", str(o.sconf['bpm']))
-				o.disp.image(o.image, o.rotation)
+				o.update_display(0)
 		if o.keyState[15] == 1:
 			if o.sconf.as_int('bpm') < 240:
 				o.sconf['bpm'] = o.sconf.as_int('bpm') + o.bpm_inc
 				o.update_bpm()
 				text_center(o, "Master BPM", str(o.sconf['bpm']))
-				o.disp.image(o.image, o.rotation)
+				o.update_display(0)
+
+
+def menu2_actions_sample(self, o):
+	if o.keyState[17] == 2:
+		if o.keyState[0] == 1:
+			if o.soundSlots[o.eSound].volume > 0:
+				print('copy')
+				o.soundClipboard = [o.soundSlots[o.eSound].file, o.soundSlots[o.eSound].volume, o.soundSlots[o.eSound].pitch]
+				print(o.soundClipboard)
+				#text_center(o, "Sample Volume", str(o.soundSlots[o.eSound].volume))
+				#o.update_display(0)
+		elif o.keyState[1] == 1:
+			if o.soundSlots[o.eSound].volume < 16:
+				print('pasting ', o.soundClipboard)
+				#o.soundSlots[o.eSound].volume += 1
+				#text_center(o, "Sample Volume", str(o.soundSlots[o.eSound].volume))
+				#o.update_display(0)
+		elif o.keyState[2] == 1:
+			if o.soundSlots[o.eSound].pitch > -10:
+				o.soundSlots[o.eSound].pitch -= 1
+				text_center(o, "Sample Pitch", str(o.soundSlots[o.eSound].pitch))
+				o.soundSlots[o.eSound].set_pitch()
+				o.update_display(0)
+		elif o.keyState[3] == 1:
+			if o.soundSlots[o.eSound].pitch < 10:
+				o.soundSlots[o.eSound].pitch += 1
+				text_center(o, "Sample Pitch", str(o.soundSlots[o.eSound].pitch))
+				o.soundSlots[o.eSound].set_pitch()
+				o.update_display(0)
+
+		elif o.keyState[4] == 1:
+			if o.soundSlots[o.eSound].volume > 0:
+				o.soundSlots[o.eSound].volume -= 1
+				text_center(o, "Sample Volume", str(o.soundSlots[o.eSound].volume))
+				o.update_display(0)
+		elif o.keyState[5] == 1:
+			if o.soundSlots[o.eSound].volume < 16:
+				o.soundSlots[o.eSound].volume += 1
+				text_center(o, "Sample Volume", str(o.soundSlots[o.eSound].volume))
+				o.update_display(0)
+		elif o.keyState[6] == 1:
+			if o.soundSlots[o.eSound].pitch > -10:
+				o.soundSlots[o.eSound].pitch -= 1
+				text_center(o, "Sample Pitch", str(o.soundSlots[o.eSound].pitch))
+				o.soundSlots[o.eSound].set_pitch()
+				o.update_display(0)
+		elif o.keyState[7] == 1:
+			if o.soundSlots[o.eSound].pitch < 10:
+				o.soundSlots[o.eSound].pitch += 1
+				text_center(o, "Sample Pitch", str(o.soundSlots[o.eSound].pitch))
+				o.soundSlots[o.eSound].set_pitch()
+				o.update_display(0)
+
+def menu2_actions_pattern(self, o):
+	if o.keyState[17] == 2:
+		if o.keyState[0] == 1:
+			print('copy')
+			o.patternClipboard = []
+			for s in o.soundSlots:
+				notes = []
+				for i in s.notes[o.ePattern]:
+					notes.append([i[0], i[1]])
+					#i[0] = 0
+					#i[1] = 0
+				o.patternClipboard.append(notes)
+				print('adding to clip ', notes)
+			# if o.soundSlots[o.eSound].volume > 0:
+			# 	o.soundSlots[o.eSound].volume -= 1
+			# 	text_center(o, "Sample Volume", str(o.soundSlots[o.eSound].volume))
+			# 	o.update_display(0)
+		elif o.keyState[1] == 1:
+			print('paste')
+			if o.patternClipboard != []:
+				p = 0
+				for s in o.soundSlots:
+					n = 0
+					for i in s.notes[o.ePattern]:
+						i[0] = o.patternClipboard[p][n][0]
+						i[1] = o.patternClipboard[p][n][1]
+						n += 1
+					print('added ', o.patternClipboard[p])
+					p += 1
+					
+				
+			else:
+				print('nothing to paste')
+			# if o.soundSlots[o.eSound].volume < 16:
+			# 	o.soundSlots[o.eSound].volume += 1
+			# 	text_center(o, "Sample Volume", str(o.soundSlots[o.eSound].volume))
+			# 	o.update_display(0)
+		elif o.keyState[2] == 1:
+			print('clear')
+			print(o.soundSlots[o.eSound].notes[o.ePattern])
+			for s in o.soundSlots:
+				for i in s.notes[o.ePattern]:
+					i[0] = 0
+					i[1] = 0
+			#print(o.soundSlots[o.eSound].notes[o.ePattern])
+			# if o.soundSlots[o.eSound].pitch > -10:
+			# 	o.soundSlots[o.eSound].pitch -= 1
+			# 	text_center(o, "Sample Pitch", str(o.soundSlots[o.eSound].pitch))
+			# 	o.soundSlots[o.eSound].set_pitch()
+			# 	o.update_display(0)
+		elif o.keyState[6] == 1:
+			if o.pat_bank > 0:
+				o.pat_bank -= 1
+				text_center(o, "Pattern Bank", str(o.pat_bank))
+				o.update_display(0)		
+
+		elif o.keyState[7] == 1:
+			if o.pat_bank < 4:
+				o.pat_bank += 1
+				text_center(o, "Pattern Bank", str(o.pat_bank))
+				o.update_display(0)		
+				
 				
 
+def menu2_actions_note(self, o):
+	if o.keyState[17] == 2:
+		if o.keyState[0] == 1:
+			if o.note_vol > 0:
+				o.note_vol -= 1
+				text_center(o, "Note Volume", str(o.note_vol))
+				o.update_display(0)		
+
+
+		elif o.keyState[1] == 1:
+			if o.note_vol < 16:
+				o.note_vol += 1
+				text_center(o, "Note Volume", str(o.note_vol))
+				o.update_display(0)
+			
+		
+					
+
+def util_command(self, o, command):
+	if command == "Clock":
+		self.FSM.ToTransition('toClock')		
+	elif command == "Ball":
+		self.FSM.ToTransition('toBall')		
+	elif command == "Exit":
+		self.FSM.ToTransition('toExit')		
+	elif command == "Theme":
+		self.FSM.ToTransition('toSelTheme')		
+	elif command == "Reboot":
+		#self.FSM.ToTransition('toSelTheme')		
+		os.system("sudo reboot")
+
+
+def file_command(self, o, command):
+	if command == "Save":
+		o.save_song()
+	
+	elif command == "Open":
+		self.FSM.ToTransition('toOpenSong')	
+	elif command == "Save As":
+		self.FSM.ToTransition('toEnterText')	
+#==================================== 
+
 class Example(State):
 	def __init__(self,FSM):
 		super(Example, self).__init__(FSM)    
@@ -297,8 +487,12 @@ class Intro(State):
 		o = self.FSM.owner
 		o.header_text = "Starting up..."
 		o.draw.rectangle((0, 0, self.FSM.owner.width, self.FSM.owner.height), outline=0, fill=o.blue)
-		draw_header(o)
-		o.disp.image(o.image, o.rotation)
+		#draw_header(o)
+		#o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)			
+		o.center_block("Starting up...", o.h2, [0, 0, o.width, o.height], o.light_grey)
+		#o.display_thread.start()
+		o.update_display(0)
+		#o.update_display(0)
 		super(Intro, self).Enter()        
 		
 	def Execute(self):
@@ -320,6 +514,7 @@ class LoadDefault(State):
 
 
 		o = self.FSM.owner
+		o.init_slots()
 		o.load_song()
 
 
@@ -329,18 +524,11 @@ class LoadDefault(State):
 		self.globbed = glob.glob('/home/pi/skull/*.wav') + glob.glob('/home/pi/skull/*.mp3')
 		self.globbed.sort()
 		obj_id = 0
-		# for f in self.globbed:
-		#     #self.sounds.append(pygame.mixer.Sound(f))
-		#     p1 = self.FSM.owner.SoundSlot(f, obj_id)
-		#     self.FSM.owner.soundSlots.append(p1)
-		#     obj_id += 1
-
-		# self.sound_names = [os.path.basename(x) for x in self.globbed]
-
-		for s in o.sconf['sounds']:
-			p1 = self.FSM.owner.SoundSlot(s, obj_id, o)
-			self.FSM.owner.soundSlots.append(p1)
-			obj_id += 1
+		
+		# for s in o.sconf['sounds']:
+		# 	p1 = self.FSM.owner.SoundSlot(s, obj_id, o)
+		# 	self.FSM.owner.soundSlots.append(p1)
+		# 	obj_id += 1
 
 		_iter = 0
 
@@ -349,8 +537,9 @@ class LoadDefault(State):
 
 		for n in o.soundSlots:
 			m = []
-			lst = ast.literal_eval(o.sconf.as_list('notes')[_iter])
-			n.notes = lst
+			if _iter < (len(o.sconf.as_list('notes')) - 1):
+				lst = ast.literal_eval(o.sconf.as_list('notes')[_iter])
+				n.notes = lst
 			_iter += 1
 
 		super(LoadDefault, self).Enter()        
@@ -381,42 +570,47 @@ class Main(State):
 		else:
 			draw_header(o)
 			self.draw_square()
-			text_box1(o, "Vol", str(o.sconf['volume']))
+
+			text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
 			text_box2(o, "BPM", str(o.sconf['bpm']))
 			text_box4(o, "Bank", str(o.note_bank))
-			o.disp.image(o.image, o.rotation)
+			text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+			o.update_display(0)
 
-		o.soundSlots[2].volume = 2
+		#o.soundSlots[2].volume = 2
 		super(Main, self).Enter()        
 		
 	def Execute(self):
 		o = self.FSM.owner 
 		menu1_actions(self, o)
+		menu2_actions_sample(self, o)
 		
 		if o.keyState[16] == 1:
 			draw_menu1(o)
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
 		elif o.keyState[16] == 4:
 			draw_header(o)
 			self.draw_square()
-			text_box1(o, "Vol", str(o.volume))
+			#print('esound ', o.eSound)
+			#print('oss ', o.soundSlots[o.eSound].volume)
+			text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
 			text_box2(o, "BPM", str(o.sconf['bpm']))
 			text_box4(o, "Bank", str(o.note_bank))
-			#text_box3(o, "BPM", "90.0")
-			o.disp.image(o.image, o.rotation)
+			text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+			o.update_display(0)
 
 
 		if o.keyState[17] == 1:
-			draw_menu2(o)
-			o.disp.image(o.image, o.rotation)
+			draw_menu2_sample(o)
+			o.update_display(0)
 		elif o.keyState[17] == 4:
 			draw_header(o)
 			self.draw_square()
-			text_box1(o, "Vol", str(o.volume))
+			text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
 			text_box2(o, "BPM", str(o.sconf['bpm']))
 			text_box4(o, "Bank", str(o.note_bank))
-			#text_box3(o, "BPM", "90.0")
-			o.disp.image(o.image, o.rotation)
+			text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+			o.update_display(0)
 
 		_id = 0
 		for k in o.keyState:
@@ -428,16 +622,22 @@ class Main(State):
 				else:
 					if k == 1:
 						note = _id + o.note_bank * 16
-						if len(o.soundSlots) > note:
+						#if len(o.soundSlots) > note:
+						if 12 == 12:
 							
-							self.FSM.owner.soundSlots[note].play(o.note_vol)
+							#o.soundSlots[note].play(o.note_vol)
+							o.slots[note].play(o.note_vol)
 							o.eSound = note
 							#print('now editing sound ', o.eSound) 
-							text_box1(o, "Vol", str(o.volume))
+							draw_header(o)
+							#text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
+							text_box1(o, "SVol", str(o.slots[o.eSound].volume))
 							text_box2(o, "BPM", str(o.sconf['bpm']))
-							text_box4(o, "Bank", str(o.note_bank))          
+							text_box4(o, "Bank", str(o.note_bank))
+							#text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+							text_box3(o, "Pitch", str(o.slots[o.eSound].pitch))
 							self.draw_square()
-							o.disp.image(o.image, o.rotation)
+							o.update_display(0)
 			_id += 1
 
 	def ReceiveMessage(self, message):
@@ -447,7 +647,12 @@ class Main(State):
 			pass
 		else:
 			draw_header(o)            
-			self.draw_square()            
+			self.draw_square()   
+			text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
+			text_box2(o, "BPM", str(o.sconf['bpm']))
+			text_box4(o, "Bank", str(o.note_bank))
+			text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))			         
+			o.update_display(0)
 	
 	def draw_square(self):
 		o = self.FSM.owner 
@@ -460,6 +665,11 @@ class Main(State):
 		while _id < ((o.note_bank * 16) + 16):
 			if _id == o.eSound:
 				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.light_grey, width=1)
+			elif o.notes_on[_id] == 1:
+				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.grey, width=1)
+			elif _id > (len(o.soundSlots) - 1):
+				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.dark_blue, width=1)
+
 			else:
 				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.blue, width=1)
 			o_x = o_x + size
@@ -514,7 +724,7 @@ class SeqPlayer(State):
 		o = self.FSM.owner
 		o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)
 		o.draw.text((20, 0), 'SeqPlayer', font=o.h1, fill="#FFFFFF")
-		o.disp.image(o.image, o.rotation)
+		o.update_display(0)
 		super(SeqPlayer, self).Enter()        
 		
 	def Execute(self):
@@ -538,7 +748,7 @@ class SeqPlayer(State):
 		o = self.FSM.owner
 		o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)
 		o.draw.text((20, 0), str(message[0]) + ' - ' + str(message[1]), font=o.h1, fill="#FFFFFF")
-		o.disp.image(o.image, o.rotation)
+		o.update_display(0)
 		play_seq(o, message)
 
 	def Exit(self):
@@ -558,18 +768,18 @@ class SelectSound(State):
 		o.pub.register("beat", self)
 		draw_header(o)
 		self.draw_square()
-		o.disp.image(o.image, o.rotation)
+		o.update_display(0)
 		super(SelectSound, self).Enter()        
 		
 	def Execute(self):
 		o = self.FSM.owner 
 		if o.keyState[16] == 1:
 			draw_menu1(o)
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
 		elif o.keyState[16] == 4:
 			draw_header(o)
 			self.draw_square()
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
 
 		if o.keyState[16] == 2:
 			if o.keyState[0] == 1:
@@ -586,7 +796,7 @@ class SelectSound(State):
 						o.draw.text((0, 0), "SelSou", font=o.h1, fill=o.color_a)
 						o.draw.text((20, 60), str(o.eSound), font=o.h2, fill=o.color_b)
 						self.draw_square()
-						o.disp.image(o.image, o.rotation)
+						o.update_display(0)
 						self.FSM.owner.soundSlots[_id].play()
 						#print('now editing sound ', _id)    
 				_id += 1        
@@ -597,7 +807,7 @@ class SelectSound(State):
 		o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=(0, 0, 0))
 		o.draw.text((0, 0), "SelSou", font=o.h1, fill="#FFFFFF")
 		o.draw.text((0, 20), str(o.eSound), font=o.h2, fill="#FFFFFF")
-		o.disp.image(o.image, o.rotation)
+		o.update_display(0)
 		play_seq(o, message)
 
 	def draw_square(self):
@@ -634,26 +844,48 @@ class SelectPattern(State):
 		o = self.FSM.owner 
 		o.header_text = "Select Pattern"
 		o.pub.register("beat", self)
-
+		self.cur_playing = 0
+		self.active_patterns = []
+		self.get_active_patterns(o)
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
 		else:
 			draw_header(o)
 			self.draw_square()
-			o.disp.image(o.image, o.rotation)
+			text_box1(o, "Pat", str(o.ePattern))
+			text_box4(o, "Bank", str(o.pat_bank))
+			o.update_display(0)
 		
 		super(SelectPattern, self).Enter()        
 		
 	def Execute(self):
 		o = self.FSM.owner 
 		menu1_actions(self, o)
+		menu2_actions_pattern(self, o)
 		if o.keyState[16] == 1:
 			draw_menu1(o)
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
 		elif o.keyState[16] == 4:
 			draw_header(o)
 			self.draw_square()
-			o.disp.image(o.image, o.rotation)
+			text_box1(o, "Pat", str(o.ePattern))
+			text_box4(o, "Bank", str(o.pat_bank))
+			o.update_display(0)
+
+		if o.keyState[17] == 1:
+			draw_menu2_pattern(o)
+			o.update_display(0)
+		elif o.keyState[17] == 4:
+			draw_header(o)
+			self.draw_square()
+			#text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
+			#text_box2(o, "BPM", str(o.sconf['bpm']))
+			text_box1(o, "Pat", str(o.ePattern))
+			text_box4(o, "Bank", str(o.pat_bank))
+			#text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+			self.get_active_patterns(o)
+			o.update_display(0)
+
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
@@ -664,20 +896,33 @@ class SelectPattern(State):
 					pass
 				else:
 					if k == 1:
-						o.ePattern = _id
+						o.ePattern = (o.pat_bank * 16) +_id 
 
-						o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)
-						o.draw.text((0, 0), "SelPat", font=o.h1, fill=o.color_a)
-						o.draw.text((20, 60), str(o.ePattern), font=o.h2, fill=o.color_b)
+						draw_header(o)
 						self.draw_square()
-						o.disp.image(o.image, o.rotation)						
-						#print('now editing sound ', _id)                
+						
+						text_box1(o, "Pat", str(o.ePattern))
+						text_box4(o, "Bank", str(o.pat_bank))
+						o.update_display(0)
+						
 
 				_id += 1        
 
 	def ReceiveMessage(self, message):
 		o = self.FSM.owner
 		play_seq(o, message) 
+		
+		if message[0] != self.cur_playing:
+			#print('playing ', message)
+			self.cur_playing = message[0]
+			if o.keyState[16] > 0 or o.keyState[17] > 0:
+				pass
+			else:
+				draw_header(o)
+				self.draw_square()
+				text_box1(o, "Pat", str(o.ePattern))
+				text_box4(o, "PBank", str(o.pat_bank))
+				o.update_display(0)
 
 	def draw_square(self):
 		o = self.FSM.owner 
@@ -687,16 +932,47 @@ class SelectPattern(State):
 		o_y = 127
 		_id = 0
 		for n in o.soundSlots[o.eSound].notes[o.ePattern]:
-			if _id == o.ePattern:
+			if (_id + (o.pat_bank * 16)) == o.ePattern:
 				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.olive, fill=o.olive, width=1)
-			else:
+			elif (_id + (o.pat_bank * 16)) == self.cur_playing:
+				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.olive, fill=o.light_grey, width=1)
+			elif self.active_patterns[_id] == 1:
 				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.blue, width=1)
+			else:
+				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.dark_blue, width=1)
 			o_x = o_x + size
 			_id += 1
 			if _id % 4 == 0:
 				o_y -= size
 				o_x = og_x          
 
+	def get_active_patterns(self, o):
+		#for n in o.soundSlots[o.eSound]
+		self.active_patterns = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+		pat_iter = o.pat_bank * 16
+		_iter = 0
+		print('is this note on? ', o.soundSlots[0].notes[0][0][0])
+
+
+		while pat_iter < ((o.pat_bank * 16) + 16):
+			
+			for s in o.soundSlots:
+				print('checking soundSlot ', s.id)
+				pat_used = 0
+				for p in s.notes[pat_iter]:
+					if self.active_patterns[_iter] == 1:
+						break
+					if p[0] == 1:
+						#pat_used = 1
+						self.active_patterns[_iter] = 1
+						print('found ', pat_iter, ' -- ', p[0])
+						break
+				#self.active_patterns.append(pat_used)
+			pat_iter += 1
+			_iter += 1
+	
+		print('active patterns ', self.active_patterns)
+
 	def Exit(self):
 		self.FSM.owner.pub.unregister("beat", self)
 
@@ -716,19 +992,32 @@ class EditSoundSequence(State):
 		else:
 			draw_header(o)
 			self.draw_square()
-			o.disp.image(o.image, o.rotation)
+			text_box1(o, "Note Vol", str(o.note_vol))
+			o.update_display(0)
 		super(EditSoundSequence, self).Enter()        
 		
 	def Execute(self):
 		o = self.FSM.owner 
 		menu1_actions(self, o)
+		menu2_actions_note(self, o)
 		if o.keyState[16] == 1:
 			draw_menu1(o)
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
 		elif o.keyState[16] == 4:
 			draw_header(o)
 			self.draw_square()
-			o.disp.image(o.image, o.rotation)
+			text_box1(o, "Note Vol", str(o.note_vol))
+			o.update_display(0)
+
+		if o.keyState[17] == 1:
+			draw_menu2_note(o)
+			o.update_display(0)
+		elif o.keyState[17] == 4:
+			draw_header(o)
+			self.draw_square()
+			text_box1(o, "Note Vol", str(o.note_vol))
+			
+			o.update_display(0)
 
 		if o.keyState[16] == 2:
 			pass
@@ -740,9 +1029,11 @@ class EditSoundSequence(State):
 					if o.soundSlots[o.eSound].notes[o.ePattern][_id][0] == 1:
 						print('turn note off')
 						o.soundSlots[o.eSound].notes[o.ePattern][_id][0] = 0
+						o.soundSlots[o.eSound].notes[o.ePattern][_id][1] = 0
 					else:
 						print('turn note on')
 						o.soundSlots[o.eSound].notes[o.ePattern][_id][0] = 1
+						o.soundSlots[o.eSound].notes[o.ePattern][_id][1] = o.note_vol
 				_id += 1
 
 		
@@ -778,8 +1069,8 @@ class EditSoundSequence(State):
 		else:
 			draw_header(o)            
 			self.draw_square()  
-		
-		o.disp.image(o.image, o.rotation)
+			text_box1(o, "Note Vol", str(o.note_vol))
+		o.update_display(0)
 		
 	def Exit(self):
 		self.FSM.owner.pub.unregister("beat", self)
@@ -800,7 +1091,7 @@ class EditSong(State):
 			draw_header(o)
 			o.draw.text((20, 30), "Current Song", font=o.h2, fill=o.light_grey)
 			o.draw.text((20, 50), str(o.song), font=o.h2, fill=o.light_grey)
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
 		self.new_song = []
 		super(EditSong, self).Enter()        
 		
@@ -810,7 +1101,7 @@ class EditSong(State):
 		menu1_actions(self, o)
 		if o.keyState[16] == 1:
 			draw_menu1(o)
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
 		elif o.keyState[16] == 4:
 			draw_header(o)
 			if self.new_song == []:
@@ -819,7 +1110,7 @@ class EditSong(State):
 			else:
 				o.draw.text((20, 30), "New Song", font=o.h2, fill=o.pink)
 				o.draw.text((20, 50), str(self.new_song), font=o.h2, fill=o.pink)
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
 
 		if o.keyState[16] > 0:
 			pass
@@ -827,11 +1118,11 @@ class EditSong(State):
 			_id = 0
 			for k in self.FSM.owner.keyState:
 				if k == 1 and _id < 16:
-					self.new_song.append(_id)
+					self.new_song.append((_id + (o.pat_bank * 16)))
 					draw_header(o)
 					o.draw.text((20, 30), "New Song", font=o.h2, fill=o.pink)
 					o.draw.text((20, 50), str(self.new_song), font=o.h2, fill=o.pink)
-					o.disp.image(o.image, o.rotation)
+					o.update_display(0)
 				_id += 1        
 
 	def ReceiveMessage(self, message):
@@ -859,12 +1150,16 @@ class File(State):
 		o = self.FSM.owner 
 		o.header_text = "File"
 		o.pub.register("beat", self)
+		self.cur_el = 0
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
 		else:
 			draw_header(o)
-			o.disp.image(o.image, o.rotation)
-		self.menu = ["New", "Save", "Save As", "Open"]
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)
+		self.menu = ["Save", "Save As", "Open", "New"]
+		
 		super(File, self).Enter()        
 		
 	def Execute(self):
@@ -872,24 +1167,104 @@ class File(State):
 		menu1_actions(self, o)
 		if o.keyState[16] == 1:
 			draw_menu1(o)
-			o.disp.image(o.image, o.rotation)
+			#self.draw_footer(o)
+			o.update_display(0)
 		elif o.keyState[16] == 4:
 			draw_header(o)
-			#self.draw_square()
-			o.disp.image(o.image, o.rotation)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)
+
+		if o.keyState[0] == 1 or o.keyState[0] == 3 or o.keyState[1] == 1 or o.keyState[1] == 3 or o.keyState[2] == 1 or o.keyState[2] == 3 or o.keyState[3] == 1 or o.keyState[3] == 3:
+			draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)	
+			print('draw butt')				
+
 
-	def ReceiveMessage(self, message):
-		o = self.FSM.owner 
-		play_seq(o, message)
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
 		else:
-			draw_header(o)            
-		
-		o.disp.image(o.image, o.rotation)
+			if o.keyState[0] == 1:
+				if self.cur_el > 0:
+					self.cur_el -= 1
+					print('cur el down is ', self.cur_el)
+			if o.keyState[1] == 1:
+				if self.cur_el < (len(self.menu) - 1):
+					self.cur_el += 1
+					print('cur el up is ', self.cur_el)
+			
+			if o.keyState[3] == 1:
+				file_command(self, o, self.menu[self.cur_el])
+				pass
+
+	def draw_footer(self, o):
+		_iter = 0
+		width = o.width / 4
+		xpos = 0
+		yposa = 135 - 25
+		yposb = 135
+		opts = ["Up", "Down", "Esc", "OK"]
+		while _iter < 4:
+			o.draw.rectangle((xpos, yposa, xpos + width, yposb), outline=0, fill=o.blue)
+			
+			if o.keyState[_iter] == 1:
+				o.draw.rectangle((xpos, yposa, xpos + width, yposb), outline=0, fill=o.light_grey)
+				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.blue)
+			else:
+				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.light_grey)
+			
+			xpos += width
+			_iter += 1
+
 
+	def draw_main(self, o):
+		al = []
+		ypos = 30
+		if self.cur_el == 0:
+			_iter = 0
+			while len(al) < 4:
+				al.append(self.menu[_iter])
+				_iter += 1
+		elif self.cur_el == 1:
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+			al.append(self.menu[self.cur_el + 2])
+		elif self.cur_el == (len(self.menu) - 2):
+			al.append(self.menu[self.cur_el - 2])
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+		elif self.cur_el == (len(self.menu) - 1):
+			al.append(self.menu[self.cur_el - 3])
+			al.append(self.menu[self.cur_el - 2])
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+		else:
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+			al.append(self.menu[self.cur_el + 2])
+		_iter = 0 
+		for i in al:
+			if i == self.menu[self.cur_el]:
+			#if _iter == self.cur_el:
+				o.draw.rectangle((0, ypos, o.width, ypos + 20), outline=0, fill=o.light_grey)
+				o.center_block(i, o.h2, [0, ypos, o.width,ypos + 20], o.blue)
+			else:
+				o.draw.rectangle((0, ypos, o.width, ypos + 20), outline=0, fill=o.blue)
+				o.center_block(i, o.h2, [0, ypos, o.width,ypos + 20], o.light_grey)
+			ypos += 20
+			_iter += 1
+
+	def ReceiveMessage(self, message):
+		o = self.FSM.owner 
+		play_seq(o, message)
+		
 	def Exit(self):
-		pass
+		self.FSM.owner.pub.unregister("beat", self)
 
 class Util(State):
 	def __init__(self,FSM):
@@ -899,13 +1274,18 @@ class Util(State):
 		o = self.FSM.owner 
 		o.header_text = "Utilities"
 		o.pub.register("beat", self)
+		self.menu = ["Clock", "Ball", "Exit", "Shutdown", "Reboot", "Theme", "Update"]
+		self.cur_el = 0
+
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
 		else:
 			draw_header(o)
-			o.disp.image(o.image, o.rotation)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)
 
-		self.menu = ["Clock", "Ball", "Theme", "Shutdown", "Reboot", "Update"]
+		
 		super(Util, self).Enter()        
 		
 	def Execute(self):
@@ -913,23 +1293,106 @@ class Util(State):
 		menu1_actions(self, o)
 		if o.keyState[16] == 1:
 			draw_menu1(o)
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
 		elif o.keyState[16] == 4:
 			draw_header(o)
-			o.disp.image(o.image, o.rotation)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)
+
+		if o.keyState[0] == 1 or o.keyState[0] == 3 or o.keyState[1] == 1 or o.keyState[1] == 3 or o.keyState[2] == 1 or o.keyState[2] == 3 or o.keyState[3] == 1 or o.keyState[3] == 3:
+			draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)	
+			print('draw butt')				
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			if o.keyState[0] == 1:
+				if self.cur_el > 0:
+					self.cur_el -= 1
+					print('cur el down is ', self.cur_el)
+			if o.keyState[1] == 1:
+				if self.cur_el < (len(self.menu) - 1):
+					self.cur_el += 1
+					print('cur el up is ', self.cur_el)
+			
+			if o.keyState[3] == 1:
+				util_command(self, o, self.menu[self.cur_el])
 		
 	def ReceiveMessage(self, message):
 		_id = 0
 		o = self.FSM.owner 
 		play_seq(o, message)
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-			pass
+		# if o.keyState[16] > 0 or o.keyState[17] > 0:
+		# 	pass
+		# else:
+		# 	draw_header(o)           		
+		# o.update_display(0)
+
+	def draw_main(self, o):
+		al = []
+		ypos = 30
+		if self.cur_el == 0:
+			_iter = 0
+			while len(al) < 4:
+				al.append(self.menu[_iter])
+				_iter += 1
+		elif self.cur_el == 1:
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+			al.append(self.menu[self.cur_el + 2])
+		elif self.cur_el == (len(self.menu) - 2):
+			al.append(self.menu[self.cur_el - 2])
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+		elif self.cur_el == (len(self.menu) - 1):
+			al.append(self.menu[self.cur_el - 3])
+			al.append(self.menu[self.cur_el - 2])
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
 		else:
-			draw_header(o)           		
-		o.disp.image(o.image, o.rotation)
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+			al.append(self.menu[self.cur_el + 2])
+		_iter = 0 
+		for i in al:
+			if i == self.menu[self.cur_el]:
+			#if _iter == self.cur_el:
+				o.draw.rectangle((0, ypos, o.width, ypos + 20), outline=0, fill=o.light_grey)
+				o.center_block(i, o.h2, [0, ypos, o.width,ypos + 20], o.blue)
+			else:
+				o.draw.rectangle((0, ypos, o.width, ypos + 20), outline=0, fill=o.blue)
+				o.center_block(i, o.h2, [0, ypos, o.width,ypos + 20], o.light_grey)
+			ypos += 20
+			_iter += 1
+
+	def draw_footer(self, o):
+		_iter = 0
+		width = o.width / 4
+		xpos = 0
+		yposa = 135 - 25
+		yposb = 135
+		opts = ["Up", "Down", "Esc", "OK"]
+		while _iter < 4:
+			o.draw.rectangle((xpos, yposa, xpos + width, yposb), outline=0, fill=o.blue)
+			
+			if o.keyState[_iter] == 1:
+				o.draw.rectangle((xpos, yposa, xpos + width, yposb), outline=0, fill=o.light_grey)
+				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.blue)
+			else:
+				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.light_grey)
+			
+			xpos += width
+			_iter += 1
 
 	def Exit(self):
-		pass        
+		self.FSM.owner.pub.unregister("beat", self)        
 
 
 
@@ -952,6 +1415,8 @@ class Ball(State):
 		self.ball2_x_dir = -1
 		self.ball2_y_dir = -1
 
+		self.xmult = 1.0
+
 		o = self.FSM.owner 
 		o.header_text = "Ball"
 		o.pub.register("beat", self)
@@ -959,7 +1424,7 @@ class Ball(State):
 			pass
 		else:
 			draw_header(o)
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
 		super(Ball, self).Enter()        
 		
 	def Execute(self):
@@ -967,41 +1432,70 @@ class Ball(State):
 		menu1_actions(self, o)
 		if o.keyState[16] == 1:
 			draw_menu1(o)
-			o.disp.image(o.image, o.rotation)
-		else:
+			o.update_display(0)
+		
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:			
 			now = datetime.now()
 			current_time = time.strftime("%-I:%M %p")
 
-			if self.ballx > (o.width - self.ball_size) or self.ballx < (0 + self.ball_size):
-				self.ball_x_dir *= -1
-			if (self.bally > o.height - self.ball_size) or (self.bally < 0 + self.ball_size):
-				self.ball_y_dir *= -1
+
+			if self.ballx < (0 + self.ball_size):
+				self.ball_x_dir = 1
+			if self.ballx > (o.width - self.ball_size):
+				self.ball_x_dir = -1
+
+			if self.bally < (0 + self.ball_size):
+				self.ball_y_dir = 1
+			if self.bally > (o.height - self.ball_size):
+				self.ball_y_dir = -1
+
+			# if self.ballx > (o.width - self.ball_size) or self.ballx < (0 + self.ball_size):
+			# 	self.ball_x_dir *= -1
+			# if self.bally > (o.height - self.ball_size) or self.bally < (0 + self.ball_size):
+			# 	self.ball_y_dir *= -1
 
 			self.ballx += self.ball_speed * self.ball_x_dir
 			self.bally += self.ball_speed * self.ball_y_dir
 
 
-			if self.ball2x > (o.width - self.ball_size) or self.ball2x < (0 + self.ball_size):
-				self.ball2_x_dir *= -1
-			if (self.ball2y > o.height - self.ball_size) or (self.ball2y < 0 + self.ball_size):
-				self.ball2_y_dir *= -1
+			if self.ball2x < (0 + self.ball_size):
+				self.ball2_x_dir = 1
+				self.xmult = random.uniform(.6, 1.2)
+			if self.ball2x > (o.width - self.ball_size):
+				self.ball2_x_dir = -1
+				self.xmult = random.uniform(.6, 1.2)
+
+			if self.ball2y < (0 + self.ball_size):
+				self.ball2_y_dir = 1
+			if self.ball2y > (o.height - self.ball_size):
+				self.ball2_y_dir = -1			
 
-			self.ball2x += self.ball_speed * self.ball2_x_dir
-			self.ball2y += self.ball_speed * self.ball2_y_dir
+
+			# if self.ball2x > (o.width - self.ball_size) or self.ball2x < (0 + self.ball_size):
+			# 	self.ball2_x_dir *= -1
+			# 	self.xmult = random.uniform(.8, 1.2)
+			# if self.ball2y > (o.height - self.ball_size) or self.ball2y < (0 + self.ball_size):
+			# 	self.ball2_y_dir *= -1
+
+			self.ball2x += (self.ball_speed * self.ball2_x_dir) * self.xmult
+			self.ball2y += (self.ball_speed * self.ball2_y_dir) 
 
 			o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)
 			
 			o.draw.ellipse((self.ballx - self.ball_size, self.bally - self.ball_size, self.ballx + self.ball_size, self.bally + self.ball_size), fill = o.light_grey, outline =o.light_grey)
 			o.draw.ellipse((self.ball2x - self.ball_size, self.ball2y - self.ball_size, self.ball2x + self.ball_size, self.ball2y + self.ball_size), fill = o.light_grey, outline =o.light_grey)
-			o.center_block(current_time, o.h3, [0,0,o.width,o.height], o.pink)
-			o.disp.image(o.image, o.rotation)
+			#o.center_block(current_time, o.h3, [0,0,o.width,o.height], o.pink)
+			o.update_display(0)
 		
 	def ReceiveMessage(self, message):
 		o = self.FSM.owner 
 		play_seq(o, message)
 		
 	def Exit(self):
-		pass        
+		self.FSM.owner.pub.unregister("beat", self)        
 
 #==================================== 
 
@@ -1033,10 +1527,15 @@ class Clock(State):
 	def Execute(self):
 		o = self.FSM.owner 
 		menu1_actions(self, o)
+
 		if o.keyState[16] == 1:
 			draw_menu1(o)
-			o.disp.image(o.image, o.rotation)
-		else:
+			o.update_display(0)
+
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:			
 			current_time = time.strftime("%-I:%M:%S")
 
 			if self.ballx > (o.width - self.ball_sizex) or self.ballx < (0 + self.ball_sizex):
@@ -1048,13 +1547,456 @@ class Clock(State):
 			self.bally += self.ball_speed * self.ball_y_dir
 			o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.black)			
 			o.draw.text((self.ballx - self.ball_sizex, self.bally - self.ball_sizey), current_time, align='center', font=o.h3, fill=o.olive)
-			o.disp.image(o.image, o.rotation)
+			o.update_display(0)
+		
+	def ReceiveMessage(self, message):
+		o = self.FSM.owner 
+		play_seq(o, message)
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)        
+
+#==================================== 
+
+class Exit(State):
+	def __init__(self,FSM):
+		super(Exit, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner
+		o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)			
+		o.center_block("goodbye", o.h2, [0, 0, o.width,o.height], o.light_grey)
+		o.update_display(0)
+		pygame.quit()
+		sys.exit()
+		super(Exit, self).Enter()        
+		
+	def Execute(self):
+		self.FSM.stateLife += 1
+		
+	def Exit(self):
+		pass
+
+#==================================== 
+
+class SelTheme(State):
+	def __init__(self,FSM):
+		super(SelTheme, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner
+		o.header_text = "Select Theme"
+		o.pub.register("beat", self)
+		self.cur_el = 0
+		self.globbed = glob.glob('/home/pi/zpc_ct/themes/*.thm')
+		self.globbed.sort()
+		self.names = [os.path.basename(x) for x in self.globbed]
+		self.names = [os.path.splitext(x)[0] for x in self.names]
+		if o.mconf['theme'] in self.names:
+			_id = self.names.index(o.mconf['theme'])
+			self.cur_el = _id
+			#print('found theme ', _id)
+		else:
+			print('nope ', o.mconf['theme'], ' - ', self.globbed)
+		#self.theme = ConfigObj("/home/pi/zpc_ct/themes/" + self.mconf['theme'])
+		#print(os.path.splitext(x)[0])
+		self.menu = self.names
+
+		#self.cur_el = 0
+		print('theme menu is ', self.menu)
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			draw_header(o)
+			self.draw_main(o)			
+			
+			o.update_display(0)
+		super(SelTheme, self).Enter()    
+
+	def Execute(self):
+		o = self.FSM.owner 
+		menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)
+
+		if o.keyState[0] == 1 or o.keyState[0] == 3 or o.keyState[1] == 1 or o.keyState[1] == 3 or o.keyState[2] == 1 or o.keyState[2] == 3 or o.keyState[3] == 1 or o.keyState[3] == 3:
+			draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)	
+			print('draw butt')				
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			if o.keyState[0] == 1:
+				if self.cur_el > 0:
+					self.cur_el -= 1
+					o.mconf['theme'] = self.menu[self.cur_el]					
+					o.save_config()
+					o.load_config()
+					o.apply_theme()
+					print('cur el down is ', self.cur_el)
+
+					#o.applyTheme
+			if o.keyState[1] == 1:
+				if self.cur_el < (len(self.menu) - 1):
+					self.cur_el += 1
+					o.mconf['theme'] = self.menu[self.cur_el]					
+					o.save_config()
+					o.load_config()
+					o.apply_theme()
+					print('cur el up is ', self.cur_el)
+					print('loading theme ', self.menu[self.cur_el], '-- ', o.mconf['theme'])
+			if o.keyState[3] == 1:
+				util_command(self, o, self.menu[self.cur_el])
+
+	def draw_main(self, o):
+		al = []
+		ypos = 30
+		if self.cur_el == 0:
+			_iter = 0
+			while len(al) < 4:
+				al.append(self.menu[_iter])
+				_iter += 1
+		elif self.cur_el == 1:
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+			al.append(self.menu[self.cur_el + 2])
+		elif self.cur_el == (len(self.menu) - 2):
+			al.append(self.menu[self.cur_el - 2])
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+		elif self.cur_el == (len(self.menu) - 1):
+			al.append(self.menu[self.cur_el - 3])
+			al.append(self.menu[self.cur_el - 2])
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+		else:
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+			al.append(self.menu[self.cur_el + 2])
+		_iter = 0 
+		for i in al:
+			if i == self.menu[self.cur_el]:
+			#if _iter == self.cur_el:
+				o.draw.rectangle((0, ypos, o.width, ypos + 20), outline=0, fill=o.light_grey)
+				o.center_block(i, o.h2, [0, ypos, o.width,ypos + 20], o.blue)
+			else:
+				o.draw.rectangle((0, ypos, o.width, ypos + 20), outline=0, fill=o.blue)
+				o.center_block(i, o.h2, [0, ypos, o.width,ypos + 20], o.light_grey)
+			ypos += 20
+			_iter += 1		    
+
+	def draw_footer(self, o):
+		_iter = 0
+		width = o.width / 4
+		xpos = 0
+		yposa = 135 - 25
+		yposb = 135
+		opts = ["Up", "Down", "", ""]
+		while _iter < 4:
+			o.draw.rectangle((xpos, yposa, xpos + width, yposb), outline=0, fill=o.blue)
+			
+			if o.keyState[_iter] == 1:
+				o.draw.rectangle((xpos, yposa, xpos + width, yposb), outline=0, fill=o.light_grey)
+				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.blue)
+			else:
+				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.light_grey)
+			
+			xpos += width
+			_iter += 1
+		
+
+	def ReceiveMessage(self, message):
+		o = self.FSM.owner 
+		play_seq(o, message)
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)
+
+#==================================== 
+
+class OpenSong(State):
+	def __init__(self,FSM):
+		super(OpenSong, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner
+		o.header_text = "Open Song"
+		o.pub.register("beat", self)
+		self.cur_el = 0
+		self.globbed = glob.glob('/home/pi/zpc_ct/user/songs/*.sng')
+		self.globbed.sort()
+		if '/home/pi/zpc_ct/user/songs/_blank.sng' in self.globbed:
+			self.globbed.remove('/home/pi/zpc_ct/user/songs/_blank.sng')
+		#del self.globbed[0]
+		self.names = [os.path.basename(x) for x in self.globbed]
+		self.names = [os.path.splitext(x)[0] for x in self.names]
+		print('we got these songs ', self.names)
+		print('in these paths ', self.globbed)
+		if o.mconf['default_song'] in self.names:
+			_id = self.names.index(o.mconf['default_song'])
+			self.cur_el = _id
+		else:
+			print('nope ', o.mconf['default_song'], ' - ', self.globbed)
+		self.menu = self.names
+
+		#self.cur_el = 0
+		#print('theme menu is ', self.menu)
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			draw_header(o)
+			self.draw_main(o)			
+			
+			o.update_display(0)
+		super(OpenSong, self).Enter()    
+
+	def Execute(self):
+		o = self.FSM.owner 
+		menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)
+
+		if o.keyState[0] == 1 or o.keyState[0] == 3 or o.keyState[1] == 1 or o.keyState[1] == 3 or o.keyState[2] == 1 or o.keyState[2] == 3 or o.keyState[3] == 1 or o.keyState[3] == 3:
+			draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)	
+			print('draw butt')				
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			if o.keyState[0] == 1:
+				if self.cur_el > 0:
+					self.cur_el -= 1
+					# o.mconf['theme'] = self.menu[self.cur_el]					
+					# o.save_config()
+					# o.load_config()
+					# o.apply_theme()
+					print('cur el down is ', self.cur_el)
+
+					#o.applyTheme
+			if o.keyState[1] == 1:
+				if self.cur_el < (len(self.menu) - 1):
+					self.cur_el += 1
+					# o.mconf['theme'] = self.menu[self.cur_el]					
+					# o.save_config()
+					# o.load_config()
+					# o.apply_theme()
+					print('cur el up is ', self.cur_el)
+					#print('loading theme ', self.menu[self.cur_el], '-- ', o.mconf['theme'])
+			if o.keyState[3] == 1:
+				#open_command(self, o, self.menu[self.cur_el])
+				o.mconf['default_song'] = self.menu[self.cur_el]
+				o.load_song()
+				#pass
+
+	def draw_main(self, o):
+		al = []
+		ypos = 30
+		if self.cur_el == 0:
+			_iter = 0
+			while len(al) < 4:
+				al.append(self.menu[_iter])
+				_iter += 1
+		elif self.cur_el == 1:
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+			al.append(self.menu[self.cur_el + 2])
+		elif self.cur_el == (len(self.menu) - 2):
+			al.append(self.menu[self.cur_el - 2])
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+		elif self.cur_el == (len(self.menu) - 1):
+			al.append(self.menu[self.cur_el - 3])
+			al.append(self.menu[self.cur_el - 2])
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+		else:
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			al.append(self.menu[self.cur_el + 1])
+			al.append(self.menu[self.cur_el + 2])
+		_iter = 0 
+		for i in al:
+			if i == self.menu[self.cur_el]:
+			#if _iter == self.cur_el:
+				o.draw.rectangle((0, ypos, o.width, ypos + 20), outline=0, fill=o.light_grey)
+				o.center_block(i, o.h2, [0, ypos, o.width,ypos + 20], o.blue)
+			else:
+				o.draw.rectangle((0, ypos, o.width, ypos + 20), outline=0, fill=o.blue)
+				o.center_block(i, o.h2, [0, ypos, o.width,ypos + 20], o.light_grey)
+			ypos += 20
+			_iter += 1		    
+
+	def draw_footer(self, o):
+		_iter = 0
+		width = o.width / 4
+		xpos = 0
+		yposa = 135 - 25
+		yposb = 135
+		opts = ["Up", "Down", "Esc", "Open"]
+		while _iter < 4:
+			o.draw.rectangle((xpos, yposa, xpos + width, yposb), outline=0, fill=o.blue)
+			
+			if o.keyState[_iter] == 1:
+				o.draw.rectangle((xpos, yposa, xpos + width, yposb), outline=0, fill=o.light_grey)
+				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.blue)
+			else:
+				o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.light_grey)
+			
+			xpos += width
+			_iter += 1
 		
+
+	def ReceiveMessage(self, message):
+		o = self.FSM.owner 
+		play_seq(o, message)
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)
+
+
+class EnterText(State):
+	def __init__(self,FSM):
+		super(EnterText, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner 
+		
+		self.input_string = ""
+		o.header_text = "EnterText"
+		o.pub.register("beat", self)
+		self.last_action = pygame.time.get_ticks()
+
+		self.cur_but = 18
+		self.cur_letter = ""
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			pass
+
+		self.skips = [7, 11, 12, 13, 14, 15]
+		
+		self.labels = [["p", "q", "r", "s"], ["t", "u", "v"], ["w", "x", "y", "z"], ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"], 
+				["g", "h", "i"], ["j", "k", "l"], ["m", "n", "o"], ["D", "E", "L"],
+				["_", "-"], ["a", "b", "c"], ["d", "e", "f"], ["O", "K"],
+				[], [], [], []]
+
+		#self.songCycle = cycle(self.song)
+		#self.curPattern = next(self.songCycle)
+
+		self.cycles = []
+		for l in self.labels:
+			self.cycles.append(cycle(l))
+
+		self.draw(o)
+		o.update_display(0)
+		super(EnterText, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		y_size = o.height / 4
+		if o.keyState[11] == 1:
+			self.FSM.ToTransition('toFile')		
+		if o.keyState[16] > 0 and o.keyState[17] > 0:
+			pass
+		else:
+			_iter = 0
+			for k in o.keyState:
+				if k == 1:
+					cur_time = pygame.time.get_ticks()
+					print(cur_time - self.last_action)
+					
+					#print('cur letter ', next(self.cycles[_iter]))
+					if _iter not in self.skips:
+						self.last_action = cur_time
+						self.cur_letter = next(self.cycles[_iter])
+						self.cur_but = _iter
+						self.draw(o)
+						o.center_block(self.input_string + self.cur_letter, o.h2, [0, 0, o.width, y_size], o.light_grey)
+
+					if _iter == 7:
+						
+						self.input_string = self.input_string[:-1]
+						#self.input_string = self.input_string.rstrip(self.input_string[-1])
+						print('deleting')
+						self.last_action = 100000000
+						self.draw(o)
+						o.center_block(self.input_string, o.h2, [0, 0, o.width, y_size], o.light_grey)
+					
+					o.update_display(0)
+				_iter += 1
+
+		cur_time = pygame.time.get_ticks()
+		delay = cur_time - self.last_action
+		if delay > 1000 and delay < 100000:
+			self.input_string += self.cur_letter
+			self.last_action = 100000000
+			self.reset_cycles()
+			self.draw(o)
+
+			o.center_block(self.input_string, o.h2, [0, 0, o.width, y_size], o.light_grey)
+			o.update_display(0)
+	
 	def ReceiveMessage(self, message):
 		o = self.FSM.owner 
 		play_seq(o, message)
+
+	def draw(self, o):
+		x_size = o.width / 4
+		y_size = o.height / 4
+		og_x = 0
+		o_x = og_x
+		o_y = o.height
+		text_padding = 6
+		
+
+		_id = 0
+		while _id < 16:
+			lab = ""
+			for i in self.labels[_id]:
+				lab += i
+			o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.blue)
+			if _id == 3:
+				lab = "123"
+			o.center_block(lab, o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+
+			o_x = o_x + x_size
+			_id += 1
+			if _id % 4 == 0:
+				o_y -= y_size
+				o_x = og_x
+		o.draw.rectangle((0, 0, o.width, y_size), outline=0, fill=o.blue)
 		
+	def reset_cycles(self):
+		self.cycles = []
+		for l in self.labels:
+			self.cycles.append(cycle(l))
+
 	def Exit(self):
-		pass        
+		self.FSM.owner.pub.unregister("beat", self)        
 
 #==================================== 

main.py

@@ -21,6 +21,7 @@ from configobj import ConfigObj
 import ast
 import RPi.GPIO as GPIO
 from time import sleep
+import threading
 GPIO.setmode(GPIO.BCM)
 
 # set up GPIO output channel - internal led
@@ -40,6 +41,7 @@ keypad = adafruit_matrixkeypad.Matrix_Keypad(rows, cols, keys)
 
 pygame.init()
 mixer.init()
+mixer.set_num_channels(32)
 done = False
 clock = pygame.time.Clock()
 TIMER = pygame.USEREVENT + 1
@@ -52,6 +54,7 @@ cs_pin = digitalio.DigitalInOut(board.CE0)
 dc_pin = digitalio.DigitalInOut(board.D25)
 reset_pin = None
 BAUDRATE = 64000000  # The pi can be very fast!
+#BAUDRATE = 24000000
 # display = st7789.ST7789(
 # 	board.SPI(),
 # 	cs=cs_pin,
@@ -135,10 +138,12 @@ class Prog:
 		#self.bpm = 90
 		self.bpm_inc = 1
 		self.note_bank = 0
+		self.pat_bank = 0
 		self.volume = 10
 		self.note_vol = 16
 		self.note_pitch = 0.0
 		self.soundSlots = []
+		self.slots = []
 		self.keys = []
 		self.keyState = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
 		#self.song = [2, 3, 0, 1, 0, 1, 0, 1, 0, 1]
@@ -148,6 +153,8 @@ class Prog:
 		self.songStart = self.curPattern
 		self.eSound = 0
 		self.ePattern = 0
+		self.patternClipboard = []
+		self.soundClipboard = []
 		self.black = "#000000"
 		self.bg_color = "#336699"
 		self.color_a = "#FFFFFF"
@@ -162,27 +169,36 @@ class Prog:
 		self.red = "#D52A2A"
 		self.olive = "#80D52A"
 		self.green = "#2AD52A"
+		self.notes_on = []
+		self.clear_notes_on()
+
 
 		self.pub = observer.Publisher(['beat', 'the joint'])
 
-		self.song_file_name = "default.sng"
+		#self.song_file_name = "default.sng"
 		self.mconf = ConfigObj("config.txt")
 		self.sconf = ConfigObj("/home/pi/zpc_ct/user/songs/" + self.mconf['default_song'])
-		self.theme = ConfigObj("/home/pi/zpc_ct/themes/" + self.mconf['theme'])
+		self.theme = ConfigObj("/home/pi/zpc_ct/themes/" + self.mconf['theme'] + ".thm")
 		
 		self.light_grey = self.theme['light_grey']
 		self.apply_theme()
+		self.display_thread = threading.Thread(target=self.update_display, args=([0]))
 
 	class SoundSlot:
 		def __init__(self, file, obj_id, o):
 			self.file = file
 			self.id = obj_id
 			self.o = o
-			self.mixerSound = pygame.mixer.Sound(self.file)
-			self.og_sound = self.mixerSound
-			self.pattern = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]
+			self.mixerSound = None
+			self.soundArray = None
+			self.og_sound = None
+			if file != None:
+				self.mixerSound = pygame.mixer.Sound(self.file)
+				self.soundArray = pygame.sndarray.array(self.mixerSound)
+				self.og_sound = self.mixerSound
+			#self.pattern = [0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0]
 			self.notes = self.init_notes()
-			self.pitch = 0.0
+			self.pitch = 0
 			self.volume = 16
 			self.start = 0
 			self.end = 0
@@ -193,12 +209,27 @@ class Prog:
 			# snd_resample = resample(snd_array, 2.5, "sinc_fastest").astype(snd_array.dtype)
 			# snd_out = pygame.sndarray.make_sound(snd_resample)
 			# snd_out.play()
-			
-			if vol != 0:
-				vol = (vol / 16) * (self.volume / 16) * (self.o.volume / 16)
-				self.mixerSound.set_volume(vol)
 
-			pygame.mixer.Sound.play(self.mixerSound)  
+			#lst = ast.literal_eval(self.o.sconf.as_list('volumes')[self.id])
+			#print('---------- ', 'this is a volume')
+			#print(lst)
+			#print('note vol ', self.volume)
+			#o.sconf
+			if self.file != None:
+				if vol != 0:
+					vol = (vol / 16) * (self.volume / 16) * (self.o.volume / 16)
+					self.mixerSound.set_volume(vol)
+
+				pygame.mixer.Sound.play(self.mixerSound)  
+
+		def set_pitch(self):
+			if self.pitch == 0:
+				self.mixerSound = self.og_sound
+			else:
+				snd_resample = resample(self.soundArray, ((self.pitch * - 1) / 10) + 1, "sinc_fastest").astype(self.soundArray.dtype)
+				self.mixerSound = pygame.sndarray.make_sound(snd_resample)
+				# snd_array = pygame.sndarray.array(self.mixerSound)
+			print('setting pitch to ', self.pitch)
 
 
 		def init_notes(self):
@@ -215,6 +246,17 @@ class Prog:
 				_id += 1		
 			return outp
 				
+	def init_slots(self):
+		# slot_id, file, volume, pitch, notes
+		_iter = 0 
+		self.slots = []
+		while _iter < 64:
+
+			#def __init__(self, file, obj_id, o):
+			p1 = self.SoundSlot(None, _iter, self)
+			self.slots.append(p1)
+			_iter += 1
+			print('adding slot ', _iter)
 
 	def Execute(self):
 		self.keys = keypad.pressed_keys
@@ -321,37 +363,125 @@ class Prog:
 
 	def save_song(self):
 		base_dir = "/home/pi/zpc_ct/user/songs/"
-		self.sconf = ConfigObj(base_dir + self.song_file_name)
-		self.sconf['title'] = "default"
+		self.sconf = ConfigObj(base_dir + self.sconf['title'] + '.sng')
+		#self.sconf['title'] = "default"
 		self.sconf['volume'] = self.volume
 		sounds = []
 		notes = []
 		vols = []
 		pitches = []
+
+		outp = []
 		for x in self.soundSlots:
 			sounds.append(x.file)
 			notes.append(x.notes)
 			vols.append(x.volume)
 			pitches.append(x.pitch)
+			outp.append([x.id, x.file, x.volume, x.pitch, x.notes])
 		self.sconf['sounds'] = sounds
 		self.sconf['notes'] = notes
 		self.sconf['song'] = self.song
+		self.sconf['volumes'] = vols
+		self.sconf['pitches'] = pitches
+		self.sconf['Sound Slot'] = outp
 		self.sconf.write()
 
+
+		c2 = ConfigObj(base_dir + self.sconf['title'] + '.sn2')
+		c2['volume'] = self.volume
+		c2['song'] = self.song
+		c2['bpm'] = self.sconf['bpm']
+		notes = []
+		for n in self.slots:
+			notes.append([n.id, n.file, n.volume, n.pitch, n.notes])
+		c2['sounds'] = notes
+
+		#tmp
+		for s in self.soundSlots:
+			c2['sounds'][s.id] = [s.id, s.file, s.volume, s.pitch, s.notes]
+
+		c2.write()
+
+	def save_config(self):
+		base_dir = "/home/pi/zpc_ct/"
+		#self.mconf = ConfigObj(base_dir + 'config.txt')
+		print('before writing')
+		print(self.mconf['theme'])
+		self.mconf.write()
+
+	def load_config(self):
+		base_dir = "/home/pi/zpc_ct/"
+		self.sconf = ConfigObj(base_dir + 'config.txt')
+		self.theme = ConfigObj("/home/pi/zpc_ct/themes/" + self.mconf['theme'] + ".thm")
+
 	def load_song(self):
 		base_dir = "/home/pi/zpc_ct/user/songs/"
-		self.sconf = ConfigObj(base_dir + 'default.sng')
-		one = self.sconf['song']
+		self.sconf = ConfigObj(base_dir + self.mconf['default_song'] + '.sng')
+		print(base_dir + self.mconf['default_song'] + '.sng')
+		#one = self.sconf['song']
+		one = self.sconf['title']
+		print('song ', one)
 		
 		song = []
 		for i in self.sconf['song']:
 			song.append(int(i))
+
+		obj_id = 0
+		self.soundSlots = []
+		for s in self.sconf['sounds']:
+			p1 = self.SoundSlot(s, obj_id, self)
+			self.soundSlots.append(p1)
+			if (len(self.sconf.as_list('volumes')) - 1) > obj_id:
+				p1.volume = int(self.sconf.as_list('volumes')[obj_id])
+			else:
+				p1.volume = 12
+			if (len(self.sconf.as_list('pitches')) - 1) > obj_id:
+				p1.pitch = int(self.sconf.as_list('pitches')[obj_id])
+				p1.set_pitch()
+			else:
+				p1.pitch = 0
+			print('adding ', s)
+			obj_id += 1
+		print(self.soundSlots)
+
+		_iter = 0
+
+		lst = ast.literal_eval(self.sconf['notes'][0])
+		print('length ', len(lst))
+
+		for n in self.soundSlots:
+			m = []
+			if (len(self.sconf.as_list('notes')) - 1) > _iter:
+				lst = ast.literal_eval(self.sconf.as_list('notes')[_iter])
+				n.notes = lst
+			_iter += 1
+
 		self.song = song
 
 		self.songCycle = cycle(self.song)
 		self.curPattern = next(self.songCycle)
 		self.songStart = self.curPattern
 
+	def update_display(self, x):
+		# if self.display_thread.is_alive():
+		# 	pass
+		# 	#self.disp.image(self.image, self.rotation)
+		# else:
+		# 	self.display_thread = threading.Thread(target=self.ud, args=([0]))
+		
+		# 	self.display_thread.start()
+		# 	time.sleep(.001)
+		self.disp.image(self.image, self.rotation)
+	def ud(self, x):
+		self.disp.image(self.image, self.rotation)
+
+	def clear_notes_on(self):
+		_iter = 0
+		self.notes_on = []
+		while _iter < 64:
+			self.notes_on.append(0)
+			_iter += 1
+
 p = Prog()
 
 #while True:

scripts/button_test.py

@@ -0,0 +1,94 @@
+import sys
+from pygame import mixer
+import time
+import digitalio
+import board
+import adafruit_matrixkeypad
+import pygame
+import digitalio
+import board
+import RPi.GPIO as GPIO
+from time import sleep
+
+GPIO.setmode(GPIO.BCM)
+
+GPIO.setup(47, GPIO.OUT)
+cols = [digitalio.DigitalInOut(x) for x in (board.D21, board.D20, board.D16, board.D12)]
+rows = [digitalio.DigitalInOut(x) for x in (board.D26, board.D13, board.D6, board.D5)]
+
+keys = ((15, 14, 13, 12),
+		(11, 10, 9, 8),
+		(7, 6, 5, 4),
+		(3, 2, 1, 0))
+
+
+keypad = adafruit_matrixkeypad.Matrix_Keypad(rows, cols, keys)
+
+pygame.init()
+mixer.init()
+mixer.set_num_channels(32)
+done = False
+clock = pygame.time.Clock()
+TIMER = pygame.USEREVENT + 1
+playhead = 0
+
+timer = pygame.time.get_ticks
+start = now = timer()
+
+cs_pin = digitalio.DigitalInOut(board.CE0)
+dc_pin = digitalio.DigitalInOut(board.D25)
+reset_pin = None
+BAUDRATE = 64000000 
+
+spi = board.SPI()
+
+class Prog:
+	def __init__(self):
+		self.keys = []
+		self.keyState = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+		
+
+	class SoundSlot:
+		def __init__(self, file, obj_id, o):
+			self.file = file
+
+	def Execute(self):
+		self.keys = keypad.pressed_keys
+		self.update_keys()
+		#self.FSM.Execute()
+
+	def update_keys(self):
+		_id = 0 
+		for k in self.keyState:
+			if k == 0:
+				if _id in self.keys:
+					self.keyState[_id] = 1
+					print('key on ', _id)
+
+			elif k == 1:
+				if _id in self.keys:
+					self.keyState[_id] = 2
+				else:
+					self.keyState[_id] = 3
+			elif k == 2:
+				if _id in self.keys:
+					self.keyState[_id] = 2
+				else:
+					self.keyState[_id] = 3
+			else:
+				self.keyState[_id] = 0
+			_id += 1
+
+
+p = Prog()
+	
+while not done:
+	p.Execute()
+	if pygame.event.get(pygame.USEREVENT + 1):
+		
+		p.playhead += 1
+
+	clock.tick_busy_loop()
+	#print(clock.get_fps())
+
+pygame.quit()

themes/bw.thm

@@ -0,0 +1,14 @@
+#main text
+light_grey = "#D3D3D3"
+#main background
+blue = "#000000"
+#highlight1
+pink = "#D52A80"
+#highlight2
+olive = "#80D52A"
+black = "#000000"
+dark_grey = "#404040"
+grey = "#808080"
+dark_blue = "#2A2AD5"
+red = "#D52A2A"
+green = "#2AD52A"

themes/dark2.thm

@@ -0,0 +1,14 @@
+#main text
+light_grey = "#D3D3D3"
+#main background
+blue = "#000000"
+#highlight1
+pink = "#D52A80"
+#highlight2
+olive = "#80D52A"
+black = "#000000"
+dark_grey = "#404040"
+grey = "#808080"
+dark_blue = "#2A2AD5"
+red = "#D52A2A"
+green = "#2AD52A"

themes/pumpkin.thm

@@ -0,0 +1,14 @@
+#main text
+light_grey = "#FF4400"
+#main background
+blue = "#404040"
+#highlight1
+pink = "#FFC400"
+#highlight2
+olive = "#3BFF00"
+black = "#000000"
+dark_grey = "#404040"
+grey = "#808080"
+dark_blue = "#2A2AD5"
+red = "#D52A2A"
+green = "#2AD52A"