pre-ud

.gitignore

 *.mp3
 *.WAV
 *.MP3
+*.sng
 *__pycache__/
 lib/__pycache__/
 lib/*.pyc

config.txt

-default_song = default
-theme = default
+default_song = phat
+theme = red2
 title = default
 bpm = 90
 volume = 10

lib/FSM.py

         'SelTheme',
         'OpenSong',
         'EnterText',
-        'LoadSound'
+        'LoadSound',
+        'Shutdown',
+        'Reboot',
+        'Ping', 
+        'Wifi',
+        'Defender'
         ]
         
         for s in state_list:

lib/StatesProg.py

 import os
 from itertools import cycle
 from datetime import datetime
+from datetime import date
 import ast
 import random
 from pathlib import Path
+import socket
 #====================================     
 
 State = type("State", (object,), {})
 	o.center_block(a, o.h1, [w1,h1,w2,h2], o.light_grey)
 	o.center_block(b, o.h1, [w1,h1+20,w2,h2+45], o.light_grey)
 
+#==================================== 
+			
+def breakup_song_text(song):
+	line1 = ""
+	line2 = ""
+	line3 = ""
+	line4 = ""
+	if len(song) < 9:
+		for x in song:
+			line1 += str(x) + '.'
+	elif len(song) < 17:
+		_iter = 0
+		for x in song:
+			if _iter < 8:
+				line1 += str(x) + '.'
+			else:
+				line2 += str(x) + '.'
+			_iter += 1
+	elif len(song) < 25:
+		_iter = 0
+		for x in song:
+			if _iter < 8:
+				line1 += str(x) + '.'
+			elif _iter < 16:
+				line2 += str(x) + '.'
+			else:
+				line3 += str(x) + '.'
+			_iter += 1
+	elif len(song) < 33:
+		_iter = 0
+		for x in song:
+			if _iter < 8:
+				line1 += str(x) + '.'
+			elif _iter < 16:
+				line2 += str(x) + '.'
+			elif _iter < 24:
+				line3 += str(x) + '.'
+			else:
+				line4 += str(x) + '.'
+			_iter += 1
+	else:
+		_iter = 0
+		cur_id = len(song) - 1
+		_iter = 0
+		ns = song.copy()
+		while len(ns) > 31:
+			del ns[0]
+		for x in ns:
+			if _iter < 7:
+				line1 += str(x) + '.'
+			elif _iter < 15:
+				line2 += str(x) + '.'
+			elif _iter < 23:
+				line3 += str(x) + '.'
+			else:
+				line4 += str(x) + '.'
+			_iter += 1
+		line1 = ".." + line1
+	return [line1, line2, line3, line4]
 
 def draw_menu1(o):
 	bpm_inc = 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 == 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 _id == 9:
 		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)
+			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("Pitch-", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 9:
 			o.center_block("Pitch+", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+
+
+
+		if _id == 12:
+			if o.odub == True:
+				o.center_block("Odub", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.pink)
+			else:
+				o.center_block("Odub", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 13:
+			o.center_block("Undo", 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:
 
 		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:
+		elif _id == 1:
 			o.center_block("Vol +", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		elif _id == 12:
+			if o.patternFollow:
+				o.center_block("Follow", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.pink)
+			else:
+				o.center_block("Follow", 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_song(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 == 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 menu1_actions(self, o):
 	if o.keyState[16] == 2:
 		if o.keyState[0] == 1:
 			self.FSM.ToTransition('toUtil')
 		if o.keyState[12] == 1:
 			o.start_playback()
+			play_seq(o, [o.curPattern, 0])
 		if o.keyState[13] == 1:
 			o.stop_playback()
-		if o.keyState[6] == 1:
-			if o.note_bank > 0:
-				o.note_bank -= 1
-		if o.keyState[7] == 1:
-			if o.note_bank < 4:
-				o.note_bank += 1
+		# if o.keyState[6] == 1:
+		# 	if o.note_bank > 0:
+		# 		o.note_bank -= 1
+		# if o.keyState[7] == 1:
+		# 	if o.note_bank < 3:
+		# 		o.note_bank += 1
 		if o.keyState[8] == 1:
 			if o.volume > 0:
 				o.volume -= 1
 			#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
+			if o.bpm > 60:
+				o.bpm = o.bpm - o.bpm_inc
 				o.update_bpm()
-				text_center(o, "Master BPM", str(o.sconf['bpm']))
+				text_center(o, "Master BPM", str(o.bpm))
 				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
+			if o.bpm < 240:
+				o.bpm = o.bpm + o.bpm_inc
 				o.update_bpm()
-				text_center(o, "Master BPM", str(o.sconf['bpm']))
+				text_center(o, "Master BPM", str(o.bpm))
 				o.update_display(0)
 
 
 			#o.soundSlots[o.eSound] = s
 			
 		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)
+			print('delete sound ', o.eSound)
+			o.soundSlots[o.eSound].file = None
+			o.soundSlots[o.eSound].volume = 16
+			o.soundSlots[o.eSound].pitch = 0
 		elif o.keyState[3] == 1:
 			print('load')
 			o.FSM.FSM.ToTransition("toLoadSound")
 				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.note_bank > 0:
+				o.note_bank -= 1
+				text_center(o, "Sound Bank", str(o.note_bank))
+				o.update_display(0)
+		elif o.keyState[7] == 1:
+			if o.note_bank < 3:
+				o.note_bank += 1
+				text_center(o, "Sound Bank", str(o.note_bank))
+				o.update_display(0)
+
+		elif o.keyState[8] == 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:
+		elif o.keyState[9] == 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[12] == 1:
+			o.odub = not o.odub
+			o.undo_buf = []
+			print('odub now is ', o.odub)
+			draw_menu2_sample(o)
+			o.update_display(0)
+		elif o.keyState[13] == 1:
+			print('undo something')
+			for i in o.undo_buf:
+				o.soundSlots[i[0]].notes[i[1]][i[2]][0] = 0
+				o.soundSlots[i[0]].notes[i[1]][i[2]][1] = 0
+			o.undo_buf = []
 
 def menu2_actions_pattern(self, o):
 	if o.keyState[17] == 2:
 				o.update_display(0)		
 
 		elif o.keyState[7] == 1:
-			if o.pat_bank < 4:
+			if o.pat_bank < 3:
 				o.pat_bank += 1
 				text_center(o, "Pattern Bank", str(o.pat_bank))
 				o.update_display(0)		
 				
+def menu2_actions_song(self, o):
+	if o.keyState[17] == 2:
+		
+		if 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 < 3:
+				o.pat_bank += 1
+				text_center(o, "Pattern Bank", str(o.pat_bank))
+				o.update_display(0)		
+				
+
 				
 
 def menu2_actions_note(self, o):
 				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)
+		elif o.keyState[12] == 1:
+			if o.patternFollow:
+				o.patternFollow = False
+			else:
+				o.patternFollow = True
+			#o.patternFollow != o.patternFollow
+			print('pattern follow is ', o.patternFollow)
+			draw_menu2_note(o)
+			o.update_display(0)	
+			
 			
 		
 					
 def util_command(self, o, command):
 	if command == "Clock":
 		self.FSM.ToTransition('toClock')		
-	elif command == "Ball":
+	elif command == "Balls":
 		self.FSM.ToTransition('toBall')		
+	elif command == "Defender":
+		self.FSM.ToTransition('toDefender')	
 	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")
-
+		self.FSM.ToTransition('toReboot')		
+		#os.system("sudo reboot")
+	elif command == "Shutdown":
+		self.FSM.ToTransition('toShutdown')		
+	elif command == "Ping":
+		self.FSM.ToTransition('toPing')	
+	elif command == "Wifi":
+		self.FSM.ToTransition('toWifi')	
 
 def file_command(self, o, command):
 	if command == "Save":
-		o.save_song()
+		if o.sconf['title'] != "blank":
+			o.save_song()
+		else:
+			print('cant save over blank')
 	
 	elif command == "Open":
 		self.FSM.ToTransition('toOpenSong')	
 	elif command == "Save As":
 		self.FSM.ToTransition('toEnterText')	
+	elif command == "New":
+		#self.FSM.ToTransition('toEnterText')
+		#o.title = '_blank'
+		o.mconf['default_song'] = '_blank'
+		o.load_song()
 #==================================== 
 
 class Example(State):
 			self.draw_square()
 
 			text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
-			text_box2(o, "BPM", str(o.sconf['bpm']))
+			text_box2(o, "BPM", str(o.bpm))
 			text_box4(o, "Bank", str(o.note_bank))
 			text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
 			o.update_display(0)
 
 		#o.soundSlots[2].volume = 2
+		self.recording = True
+		self.record_queue = []
+		self.undo_queue = []
 		super(Main, self).Enter()        
 		
 	def Execute(self):
 		o = self.FSM.owner 
 		menu1_actions(self, o)
 		menu2_actions_sample(self, o)
-		
+		#self.FSM.ToTransition('toClock')
 		if o.keyState[16] == 1:
 			draw_menu1(o)
 			o.update_display(0)
 			self.draw_square()
 			#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_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
+			text_box2(o, "BPM", str(o.bpm))
 			text_box4(o, "Bank", str(o.note_bank))
 			text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
 			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, "Vol", str(o.soundSlots[o.eSound].volume))
+			text_box2(o, "BPM", str(o.bpm))
 			text_box4(o, "Bank", str(o.note_bank))
 			text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
 			o.update_display(0)
 				else:
 					if k == 1:
 						note = _id + o.note_bank * 16
-						#if len(o.soundSlots) > note:
-						if 12 == 12:
-							
-							#o.soundSlots[note].play(o.note_vol)
-							o.soundSlots[note].play(o.note_vol)
-							o.eSound = note
-							print('now editing sound ', o.eSound) 
-							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_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
-							text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
-							self.draw_square()
-							o.update_display(0)
+						self.record_queue = pygame.time.get_ticks()
+						print('bpm is ', o.half_bpm, ' ', self.record_queue)
+
+						o.soundSlots[note].play(o.note_vol)
+						o.eSound = note
+						print('now editing sound ', o.eSound) 
+						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.bpm))
+						text_box4(o, "Bank", str(o.note_bank))
+						#text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+						text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+						self.draw_square()
+						o.update_display(0)
 			_id += 1
 
 	def ReceiveMessage(self, message):
 			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_box2(o, "BPM", str(o.bpm))
 			text_box4(o, "Bank", str(o.note_bank))
 			text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))			         
 			o.update_display(0)
+		if self.record_queue != []:
+			cur_time = pygame.time.get_ticks()
+			note_pos = (cur_time - self.record_queue) - (o.half_bpm / 2)
+			print(note_pos)
+			if o.odub == True:
+				if note_pos > (o.half_bpm):
+					_note = 0
+					if message[1] == 0:
+						_note = 15
+					else:
+						_note = message[1] - 1
+					
+					if o.soundSlots[o.eSound].notes[message[0]][_note][0] != 1:
+						o.soundSlots[o.eSound].notes[message[0]][_note][0] = 1
+						o.soundSlots[o.eSound].notes[message[0]][_note][1] = o.note_vol
+						o.undo_buf.append([o.eSound, message[0], _note])
+						print(o.undo_buf)
+
+				else:
+					if o.soundSlots[o.eSound].notes[message[0]][message[1]][0] != 1:
+						o.soundSlots[o.eSound].notes[message[0]][message[1]][0] = 1
+						o.soundSlots[o.eSound].notes[message[0]][message[1]][1] = o.note_vol
+						o.undo_buf.append([o.eSound, message[0], message[1]])
+						print(o.undo_buf)
+
+		self.record_queue = []
+
 	
 	def draw_square(self):
 		o = self.FSM.owner 
 				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):
 			elif self.has_sample(o, _id) == False:
-				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.dark_blue, width=1)
+				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.dark_grey, width=1)
 
 
 			else:
 
 		if o.keyState[12] == 1:
 			o.start_playback()
+			play_seq(o, [o.curPattern, 0])
 		if o.keyState[13] == 1:
 			o.stop_playback()        
 		#self.beat = o.playhead
 					if k == 1:
 						o.eSound = _id
 						o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)
-						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)
+						o.draw.text((0, 0), "SelSou", font=o.h1, fill=o.light_blue)
+						o.draw.text((20, 60), str(o.eSound), font=o.h2, fill=o.light_grey)
 						self.draw_square()
 						o.update_display(0)
 						self.FSM.owner.soundSlots[_id].play()
 	
 		for n in o.soundSlots[o.eSound].notes[o.ePattern]:
 			if _id == o.eSound:
-				o.draw.rectangle((o_x, o_y, o_x + size, o_y + size), outline=0, fill=o.color_b)
+				o.draw.rectangle((o_x, o_y, o_x + size, o_y + size), outline=0, fill=o.light_grey)
 			else:
 				o.draw.rectangle((o_x, o_y, o_x + size, o_y + size), outline=0, fill=o.dark_grey)
 			o_x = o_x + size
 		self.cur_playing = 0
 		self.active_patterns = []
 		self.get_active_patterns(o)
+
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
 		else:
 			o.update_display(0)
 		elif o.keyState[17] == 4:
 			draw_header(o)
+			self.get_active_patterns(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)
 
 
 				draw_header(o)
 				self.draw_square()
 				text_box1(o, "Pat", str(o.ePattern))
-				text_box4(o, "PBank", str(o.pat_bank))
+				text_box4(o, "Bank", str(o.pat_bank))
 				o.update_display(0)
 
 	def draw_square(self):
 		_id = 0
 		for n in o.soundSlots[o.eSound].notes[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)
+				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.olive, width=1)
 			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)
+				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, 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.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.dark_grey, width=1)
 			o_x = o_x + size
 			_id += 1
 			if _id % 4 == 0:
 		o = self.FSM.owner 
 		o.header_text = "Note Edit"
 		o.pub.register("beat", self)
+		self.curPattern = o.ePattern
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
 		else:
 			draw_header(o)
 			self.draw_square()
 			text_box1(o, "Note Vol", str(o.note_vol))
+			text_box3(o, "Pat", str(self.curPattern))
 			o.update_display(0)
 		super(EditSoundSequence, self).Enter()        
 		
 			draw_header(o)
 			self.draw_square()
 			text_box1(o, "Note Vol", str(o.note_vol))
+			text_box3(o, "Pat", str(self.curPattern))
 			o.update_display(0)
 
 		if o.keyState[17] == 1:
 			draw_header(o)
 			self.draw_square()
 			text_box1(o, "Note Vol", str(o.note_vol))
-			
+			text_box3(o, "Pat", str(self.curPattern))
 			o.update_display(0)
 
-		if o.keyState[16] == 2:
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
 
 		else:
 			_id = 0
 			for k in self.FSM.owner.keyState:
 				if _id < 16 and k == 1:
-					if o.soundSlots[o.eSound].notes[o.ePattern][_id][0] == 1:
+					if o.soundSlots[o.eSound].notes[self.curPattern][_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
+						o.soundSlots[o.eSound].notes[self.curPattern][_id][0] = 0
+						o.soundSlots[o.eSound].notes[self.curPattern][_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
+						o.soundSlots[o.eSound].notes[self.curPattern][_id][0] = 1
+						o.soundSlots[o.eSound].notes[self.curPattern][_id][1] = o.note_vol
+					draw_header(o)
+					self.draw_square()
+					text_box1(o, "Note Vol", str(o.note_vol))			
+					text_box3(o, "Pat", str(self.curPattern))
+					o.update_display(0)
 				_id += 1
 
+
 		
 	def draw_square(self):
 		o = self.FSM.owner 
 		o_x = og_x
 		o_y = 127
 		_id = 0
-		for n in o.soundSlots[o.eSound].notes[o.ePattern]:
-			if _id == o.playhead:
-				if o.curPattern == o.ePattern:
-					o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.olive, fill=o.olive, width=1)
+		for n in o.soundSlots[o.eSound].notes[self.curPattern]:
+			if _id == o.playhead and o.playing:
+				if o.curPattern == self.curPattern:
+					o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.olive, width=1)
 				else:
-					o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.olive, fill=o.pink, width=1)
+					o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.pink, width=1)
 			elif n[0] == 1:
 				o.draw.rectangle((o_x, o_y, o_x + size, o_y - size), outline=o.light_grey, fill=o.light_grey, width=1)
 			else:
 			draw_header(o)            
 			self.draw_square()  
 			text_box1(o, "Note Vol", str(o.note_vol))
+			text_box3(o, "Pat", str(self.curPattern))
+		if o.patternFollow:
+			self.curPattern = message[0]
+		else:
+			self.curPattern = o.ePattern
+		print('message ', message)
 		o.update_display(0)
 		
 	def Exit(self):
 		self.FSM.owner.pub.unregister("beat", self)
 
-#==================================== 
-			
+
 class EditSong(State):
 	def __init__(self,FSM):
 		super(EditSong, self).__init__(FSM)    
 			pass
 		else:
 			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)
+			self.draw_main(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.update_display(0)
 		self.new_song = []
 		super(EditSong, self).Enter()        
 		o = self.FSM.owner 
 
 		menu1_actions(self, o)
+		menu2_actions_song(self, o)
 		if o.keyState[16] == 1:
 			draw_menu1(o)
 			o.update_display(0)
 		elif o.keyState[16] == 4:
 			draw_header(o)
-			if self.new_song == []:
-				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)
-			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)
+			self.draw_main(o)
+			# if self.new_song == []:
+			# 	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)
+			# 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.update_display(0)
+
+		if o.keyState[17] == 1:
+			draw_menu2_song(o)
+			o.update_display(0)
+		elif o.keyState[17] == 4:
+			draw_header(o)
+			self.draw_main(o)
 			o.update_display(0)
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
 
-		if o.keyState[16] > 0:
+		#if o.keyState[16] > 0:
 			pass
 		else:
 			_id = 0
 				if k == 1 and _id < 16:
 					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)
+					self.draw_main(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.update_display(0)
 				_id += 1        
 
+
+	def draw_main(self, o):
+		ypos = 35
+		ysize = 20
+		tmp_song = [8, 6, 7, 5, 3, 0, 9]
+		lines = breakup_song_text(o.song)
+		#lines = breakup_song_text(tmp_song)
+
+		if self.new_song != []:
+			#o.draw.text((20, 30), "New Song", font=o.h2, fill=o.pink)
+			lines = breakup_song_text(self.new_song)
+			o.center_block("New Song", o.h2, [0, ypos, o.width, ypos + ysize], o.pink)
+		else:
+			#o.draw.text((20, 30), "Current Song", font=o.h2, fill=o.light_grey)
+			o.center_block("Current Song", o.h2, [0, ypos, o.width, ypos + ysize], o.light_grey)
+
+		ypos += ysize	
+		o.center_block(lines[0], o.h2, [0, ypos, o.width, ypos + ysize], o.light_grey)
+		ypos += ysize
+		o.center_block(lines[1], o.h2, [0, ypos, o.width, ypos + ysize], o.light_grey)
+		ypos += ysize
+		o.center_block(lines[2], o.h2, [0, ypos, o.width, ypos + ysize], o.light_grey)
+		ypos += ysize
+		o.center_block(lines[3], o.h2, [0, ypos, o.width, ypos + ysize], o.light_grey)
+
 	def ReceiveMessage(self, message):
 		_id = 0
 		o = self.FSM.owner 
 		o = self.FSM.owner 
 		o.header_text = "Utilities"
 		o.pub.register("beat", self)
-		self.menu = ["Clock", "Ball", "Exit", "Shutdown", "Reboot", "Theme", "Update"]
+		self.menu = ["Clock", "Balls", "Defender", "Exit", "Shutdown", "Reboot", "Theme", "Ping", "Wifi", "Update"]
 		self.cur_el = 0
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 		self.ballx = self.ball_size
 		self.bally = self.ball_size
 		
-		self.ball_speed = 15
+		self.ball_speed = 8
 		self.ball_x_dir = 1
 		self.ball_y_dir = 1
 		
 		self.xmult = 1.0
 
 		o = self.FSM.owner 
-		o.header_text = "Ball"
+		o.header_text = "Balls"
 		o.pub.register("beat", self)
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
 		self.ball_sizex, self.ball_sizey = o.h3.getsize("18:88:88")
 		self.ball_sizex /= 2
 		self.ball_sizey /= 2
+		#self.ball_sizey += 10
 		self.ballx = o.width / 2 
 		self.bally = o.height / 2
-		self.ball_speed = 1
+		self.ball_speed = .5
 		self.ball_x_dir = 1
 		self.ball_y_dir = 1
 		
 			pass
 		else:			
 			current_time = time.strftime("%-I:%M:%S")
+			s = int(time.strftime("%S"))
+			if s % 2 == 0:
+				current_time = time.strftime("%-I:%M.%S")
 
 			if self.ballx > (o.width - self.ball_sizex) or self.ballx < (0 + self.ball_sizex):
 				self.ball_x_dir *= -1
-			if (self.bally > o.height - self.ball_sizey) or (self.bally < 0 + self.ball_sizey):
+			if (self.bally > o.height - self.ball_sizey - 20) or (self.bally < 0 + self.ball_sizey):
 				self.ball_y_dir *= -1
 
+			x1 = self.ballx - self.ball_sizex
+			x2 = self.ballx + self.ball_sizex
+			y1 = self.bally - self.ball_sizey
+			y2 = self.bally + self.ball_sizey
 			self.ballx += self.ball_speed * self.ball_x_dir
 			self.bally += self.ball_speed * self.ball_y_dir
-			o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.bg_color)			
-			o.draw.text((self.ballx - self.ball_sizex, self.bally - self.ball_sizey), current_time, align='center', font=o.h3, fill=o.light_grey)
+			o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)			
+			#o.draw.rectangle((x1, y1, x2, y2), outline=0, fill=o.dark_grey)			
+
+			#o.draw.text((self.ballx - self.ball_sizex, self.bally - self.ball_sizey), current_time, align='center', font=o.h3, fill=o.light_grey)
+			o.center_block(current_time, o.h3, [x1, y1, x2, y2], o.light_grey)
+			today = date.today()
+			current_date = today.strftime('%A')
+			current_date += ', ' + today.strftime("%b %d, %Y")
+			#o.draw.text((self.ballx - self.ball_sizex, (self.bally + 45) - self.ball_sizey), current_date, align='center', font=o.h2, fill=o.light_grey)
+			o.center_block(current_date, o.h2, [x1, y1 + 35, x2, y2 + 35], o.light_grey)
 			o.update_display(0)
 		
 	def ReceiveMessage(self, message):
 
 #==================================== 
 
+#==================================== 
+
+class Reboot(State):
+	def __init__(self,FSM):
+		super(Reboot, 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("rebooting", o.h2, [0, 0, o.width,o.height], o.light_grey)
+		o.update_display(0)
+		command = 'bash -c "sleep 5; sudo shutdown -r now"&'
+		os.system(command)
+		pygame.quit()
+		sys.exit()
+		super(Reboot, self).Enter()        
+		
+	def Execute(self):
+		pass
+		#self.FSM.stateLife += 1
+		#os.system('sudo shutdown -r now')
+		
+	def Exit(self):
+		pass
+
+#==================================== 
+
+
+#==================================== 
+
+class Shutdown(State):
+	def __init__(self,FSM):
+		super(Shutdown, 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("shutting down", o.h2, [0, 0, o.width,o.height - 20], o.light_grey)
+		o.center_block("(unplug in 20s)", o.h2, [0, 10, o.width,o.height+10], o.light_grey)
+		o.center_block("thank you for playing", o.h2, [0, 30, o.width,o.height+30], o.light_grey)
+		o.update_display(0)
+		command = 'bash -c "sleep 5; sudo shutdown -h now"&'
+		os.system(command)
+		pygame.quit()
+		sys.exit()
+		super(Shutdown, self).Enter()        
+		
+	def Execute(self):
+		pass
+		#self.FSM.stateLife += 1
+		#os.system('sudo shutdown -r now')
+		
+	def Exit(self):
+		pass
+
+#==================================== 
 class SelTheme(State):
 	def __init__(self,FSM):
 		super(SelTheme, self).__init__(FSM)    
 		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 = glob.glob('/home/pi/zpc_ct/user/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]
 			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
 			if o.keyState[3] == 1:
 				#open_command(self, o, self.menu[self.cur_el])
 				o.mconf['default_song'] = self.menu[self.cur_el]
+				o.save_config()
 				o.load_song()
 				#pass
 
 		
 	def Enter(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)
 		self.input_string = ""
+		if o.sconf['title'] == 'blank':
+
+			self.input_string += str(datetime.today().strftime('%Y%m%d'))
+		else:
+
+			self.input_string += o.sconf['title']
 		#if 
 		o.header_text = "EnterText"
 		o.pub.register("beat", self)
 		o = self.FSM.owner 
 		y_size = o.height / 4
 		if o.keyState[11] == 1:
-			self.FSM.ToTransition('toFile')		
+			if self.input_string != 'blank':
+				o.title = self.input_string
+				#o.bpm = o.sconf['bpm']
+				o.sconf['title'] = self.input_string
+				
+				print('fsm saving')
+				o.save_song()
+				self.FSM.ToTransition('toFile')		
 		if o.keyState[16] > 0 and o.keyState[17] > 0:
 			pass
 		else:
 		o.pub.register("beat", self)
 		self.cur_el = 0
 		
+		self.press_ticks_up = None
+		self.press_ticks_down = None
 
 		self.menu = []
 
 		self.menu.append("..")
 		self.menu += self.get_file_list(o)
+		if o.last_load_sound_id != None and o.last_load_sound_id <= len(self.menu):
+			self.cur_el = o.last_load_sound_id
+			print('setting cur_el ', self.cur_el)
 		self.last_preview = None
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
 		else:
-			if o.keyState[0] == 1:
+
+			since_up = 0		
+			if o.keyState[0] == 2:
+				if self.press_ticks_up == None:
+					self.press_ticks_up = pygame.time.get_ticks()
+				since_up = pygame.time.get_ticks() - self.press_ticks_up
+			else:
+				self.press_ticks_up = None
+
+				self.press_ticks_up = pygame.time.get_ticks()
+
+
+			if o.keyState[0] == 1 or since_up > 250:
 				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)
+					self.draw_main(o)
+					o.update_display(0)	
+					self.press_ticks_up = pygame.time.get_ticks()
+			
+					
 
-					#o.applyTheme
-			if o.keyState[1] == 1:
+			since_down = 0		
+			if o.keyState[1] == 2:
+				if self.press_ticks_down == None:
+					self.press_ticks_down = pygame.time.get_ticks()
+				since_down = pygame.time.get_ticks() - self.press_ticks_down
+			else:
+				self.press_ticks_down = None
+
+				self.press_ticks_down = pygame.time.get_ticks()
+
+
+			if o.keyState[1] == 1 or since_down > 250:
 				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'])
+					self.draw_main(o)
+					o.update_display(0)	
+					self.press_ticks_down = pygame.time.get_ticks()
+			
+			
+
+
 			if o.keyState[2] == 1:
 				if self.is_wav():
 					if self.last_preview == self.menu[self.cur_el]:
 					else:
 						snd = pygame.mixer.Sound(o.load_song_dir + self.menu[self.cur_el])
 						pygame.mixer.Sound.play(snd) 
+						#o.last_load_sound_id = self.cur_el
+
 
 			if o.keyState[3] == 1:
 				if self.menu[self.cur_el] == '..':
 					print('directory up')
-					if o.load_song_dir == '/home/pi/zpc_ct/sounds/':
+					o.last_load_sound_id = None
+					if o.load_song_dir == '/home/pi/zpc_ct/user/sounds/':
 						print('root dir - cant go up')
 					else:
 						o.load_song_dir = os.path.dirname(os.path.dirname(o.load_song_dir))
 					o.soundSlots[o.eSound].pitch = 0
 					o.soundSlots[o.eSound].create_sound()
 					o.soundSlots[o.eSound].set_pitch()
-				#pass
+					o.last_load_sound_id = self.cur_el
+					self.FSM.ToTransition('toMain')
 
 	def get_file_list(self, o):
-		#root, dirs, files = os.walk(o.load_song_dir).next()
 		dirs = os.listdir(o.load_song_dir)
-		#print('got file list')
-		#print(root)
-		#print(dirs)
 		dirs.sort()
-		#print(files)
 
 		return dirs
 
 	def Exit(self):
 		self.FSM.owner.pub.unregister("beat", self)
 
+#==================================== 
+
+class Ping(State):
+	def __init__(self,FSM):
+		super(Ping, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner
+		
+		o.header_text = "Ping"
+		o.pub.register("beat", self)
+
+		#o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)			
+		#o.center_block("ping", o.h2, [0, 0, o.width,o.height], o.light_grey)
+		#o.update_display(0)
+
+		
+		
+
+		self.pinging = self.check_ping()
+
+		self.draw_main(o)
+
+		draw_header(o)
+		o.update_display(0)
+		super(Ping, 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)	
+			
+		
+	def draw_main(self, o):
+		o.center_block(self.pinging, o.h2, [0, 0, o.width, o.height], o.light_grey)
+
+	def check_ping(self):
+		hostname = "8.8.8.8"
+		response = os.system("ping -c 1 " + hostname)
+		# and then check the response...
+		if response == 0:
+			pingstatus = "Network Active "
+		else:
+			pingstatus = "Network Error "
+
+		return pingstatus
+
+	def ReceiveMessage(self, message):
+		o = self.FSM.owner 
+		play_seq(o, message)
+
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)
+
+#==================================== 
+
+
+class Wifi(State):
+	def __init__(self,FSM):
+		super(Wifi, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner
+		
+		o.header_text = "Wifi"
+		o.pub.register("beat", self)
+		
+		self.ipad = self.extract_ip()
+		self.ssid = os.popen("sudo iwgetid -r").read()
+		o.center_block(self.ipad, o.h2, [0, 0, o.width,o.height], o.light_grey)
+
+		draw_header(o)
+		self.draw_main(o)
+		o.update_display(0)
+		super(Wifi, 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)	
+			
+		
+	def draw_main(self, o):
+		o.center_block(self.ipad, o.h2, [0, 0, o.width, o.height], o.light_grey)
+		o.center_block(self.ssid, o.h2, [0, 40, o.width, o.height+40], o.light_grey)
+
+
+	def extract_ip(self):
+		st = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+		try:       
+			#st.connect(('10.255.255.255', 1))
+			st.connect(("8.8.8.8", 80))
+			IP = st.getsockname()[0]
+		except Exception:
+			IP = '127.0.0.1'
+		finally:
+			st.close()
+		return IP
+	#print(extract_ip())		
+
+	def ReceiveMessage(self, message):
+		o = self.FSM.owner 
+		play_seq(o, message)
+
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)
+
+#==================================== 
+
+
+
+class Defender(State):
+	def __init__(self,FSM):
+		super(Defender, self).__init__(FSM)    
+		
+	def Enter(self):
+		self.ball_size = 10
+		self.ballx = self.ball_size
+		self.bally = self.ball_size
+		
+		self.ball_speed = 8
+		self.ball_x_dir = 1
+		self.ball_y_dir = 1
+		
+		self.ball2x = self.ball_size + 180
+		self.ball2y = self.ball_size + 70
+	
+		self.ball2_x_dir = -1
+		self.ball2_y_dir = -1
+
+		self.xmult = 1.0
+
+		o = self.FSM.owner 
+		o.header_text = "Balls"
+		o.pub.register("beat", self)
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			draw_header(o)
+			o.update_display(0)
+		super(Defender, 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)
+		
+
+		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 < (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 < (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			
+
+
+			# 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.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)        
+
+#==================================== 

main.py

 import RPi.GPIO as GPIO
 from time import sleep
 import threading
+import os
 GPIO.setmode(GPIO.BCM)
 
 # set up GPIO output channel - internal led
-GPIO.setup(47, GPIO.OUT)
+GPIO.setup(29, GPIO.OUT)
 
 
 cols = [digitalio.DigitalInOut(x) for x in (board.D21, board.D20, board.D16, board.D12)]
 keypad = adafruit_matrixkeypad.Matrix_Keypad(rows, cols, keys)
 
 pygame.init()
-mixer.init()
-mixer.set_num_channels(32)
+# mixer.init()
+# mixer.set_num_channels(32)
 done = False
 clock = pygame.time.Clock()
 TIMER = pygame.USEREVENT + 1
 class Prog:
 	def __init__(self):
 		self.FSM = FSM.ProgFSM(self)
-		self.font = ImageFont.truetype("/home/pi/examples/HLM.ttf", 64)
+		#self.start_mixer()
+		#self.font = ImageFont.truetype("/home/pi/examples/HLM.ttf", 64)
 		#self.h1 = ImageFont.truetype("/home/pi/examples/HLM.ttf", 26)
-		self.h1 = ImageFont.truetype("/home/pi/Pixellari.ttf", 30)
-		self.h2 = ImageFont.truetype("/home/pi/Pixellari.ttf", 20)
-		self.h3 = ImageFont.truetype("/home/pi/Pixellari.ttf", 54)
+		self.h1 = ImageFont.truetype("/home/pi/zpc_ct/fonts/Pixellari.ttf", 30)
+		self.h2 = ImageFont.truetype("/home/pi/zpc_ct/fonts/Pixellari.ttf", 20)
+		self.h3 = ImageFont.truetype("/home/pi/zpc_ct/fonts/Pixellari.ttf", 54)
 		
 		self.disp = st7789.ST7789(
 			spi,
 		self.draw = ImageDraw.Draw(self.image)
 		self.playhead = 0
 		self.playing = False
-		#self.bpm = 90
+		self.bpm = 90
 		self.bpm_inc = 1
+		self.half_bpm = 0.0
 		self.note_bank = 0
 		self.pat_bank = 0
 		self.volume = 10
 		self.songStart = self.curPattern
 		self.eSound = 0
 		self.ePattern = 0
+		self.patternFollow = False
 		self.patternClipboard = []
 		self.soundClipboard = []
+		self.last_load_sound_id = None
+		self.odub = False
+		self.undo_buf = []
 		self.black = "#000000"
 		self.bg_color = "#336699"
-		self.color_a = "#FFFFFF"
+		#self.color_a = "#FFFFFF"
 		self.color_b = "#929230"
-		self.color_c = "#FFFF00"
+		#self.color_c = "#FFFF00"
 		self.dark_grey = "#404040"
 		self.grey = "#808080"
 		self.light_grey = "#D3D3D3"
 		self.blue = "#336699"
 		self.dark_blue = "#2A2AD5"
 		self.pink = "#D52A80"
-		self.red = "#D52A2A"
+		#self.red = "#D52A2A"
 		self.olive = "#80D52A"
-		self.green = "#2AD52A"
+		#self.green = "#2AD52A"
 		self.notes_on = []
 		self.clear_notes_on()
 
 		#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'] + ".thm")
-		self.load_song_dir = '/home/pi/zpc_ct/sounds/'
+		self.theme = ConfigObj("/home/pi/zpc_ct/user/themes/" + self.mconf['theme'] + ".thm")
+		self.load_song_dir = '/home/pi/zpc_ct/user/sounds/'
 
 		self.light_grey = self.theme['light_grey']
 		self.apply_theme()
 			p1 = self.SoundSlot(None, _iter, self)
 			self.slots.append(p1)
 			_iter += 1
-			print('adding slot ', _iter)
+			#print('adding slot ', _iter)
 
 	def Execute(self):
 		self.keys = keypad.pressed_keys
 				self.keyState[17] = 0
 
 	def update_bpm(self):
-		bpm = (60000 / self.sconf['bpm']) / 4
-		pygame.time.set_timer(TIMER, int(bpm))
+		bpm = (60000 / self.bpm) / 4
+		self.half_bpm = bpm / 2
+		if self.playing:
+			pygame.time.set_timer(TIMER, int(bpm))
 
 	def start_playback(self):
 		self.playing = True
 		self.songCycle = cycle(self.song)
 		self.curPattern = next(self.songCycle)
 		self.songStart = self.curPattern
-		bpm = (60000 / self.sconf.as_int('bpm')) / 4
+		bpm = (60000 / self.bpm) / 4
 		pygame.time.set_timer(TIMER, int(bpm))
 		
 
 		self.draw.text((x, y), message, align='center', font=font, fill=color)
 		
 	def apply_theme(self):
+		self.grey = self.theme["grey"]
 		self.light_grey = self.theme["light_grey"]
+		self.dark_grey = self.theme["dark_grey"]
 		self.blue = self.theme["blue"]
 		self.pink = self.theme["pink"]
 		self.olive = self.theme["olive"]
-		self.black = self.theme["black"]
-		self.dark_blue = self.theme["dark_blue"]
-		self.green = self.theme["green"]
-		self.red = self.theme["red"]
+		#self.black = self.theme["black"]
+		#self.dark_blue = self.theme["dark_blue"]
+		#self.green = self.theme["green"]
+		#self.red = self.theme["red"]
 
 	def save_song(self):
 		base_dir = "/home/pi/zpc_ct/user/songs/"
-		#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()
-
-
-		self.sconf = ConfigObj(base_dir + self.sconf['title'] + '.sn2')
+		title = self.sconf['title']
+		fname = base_dir + self.sconf['title'] + '.sng'
+		if os.path.exists(fname):
+			os.utime(fname, None)
+			print(fname, ' exists')
+		else:
+			print('make a damn file ', fname)
+			open(fname, 'a').close()			
+
+		self.sconf = ConfigObj(fname)
 		self.sconf['volume'] = self.volume
 		self.sconf['song'] = self.song
-		self.sconf['bpm'] = self.sconf['bpm']
+		self.sconf['bpm'] = self.bpm
+		self.sconf['title'] = title
 		notes = []
 		for n in self.soundSlots:
 			notes.append([n.id, n.file, n.volume, n.pitch, n.notes])
 		self.sconf['sounds'] = notes
-
-		#tmp
-		#for s in self.soundSlots:
-		#	self.sconf['sounds'][s.id] = [s.id, s.file, s.volume, s.pitch, s.notes]
-
 		self.sconf.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")
+		self.theme = ConfigObj("/home/pi/zpc_ct/user/themes/" + self.mconf['theme'] + ".thm")
 
 	def load_song(self):
+		#self.stop_playback()
+		self.quit_mixer()
+		self.start_mixer()
 		base_dir = "/home/pi/zpc_ct/user/songs/"
-		self.sconf = ConfigObj(base_dir + self.mconf['default_song'] + '.sn2')
-		print(base_dir + self.mconf['default_song'] + '.sn2')
-		#one = self.sconf['song']
-		#one = self.sconf['title']
-		#print('song ', one)
-		
+		self.sconf = ConfigObj(base_dir + self.mconf['default_song'] + '.sng')
+		print(base_dir + self.mconf['default_song'] + '.sng')
+		self.last_load_sound_id = None
+		print('song bpm is ', self.sconf['bpm'])
+		self.bpm = self.sconf.as_int('bpm')
 		song = []
 		for i in self.sconf['song']:
 			song.append(int(i))
 			p1 = self.SoundSlot(filename, obj_id, self)
 			p1.volume = volume
 			p1.pitch = pitch
-			#p1.notes = ast.literal_eval(notes)
+			if pitch != 0:
+				p1.set_pitch()
 			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
 			p1.notes = notes
-			# _iter2 = 0
-			# while _iter2 < 64:
-
-			# 	_iter2 += 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(notes) - 1) > _iter:
-		# 	#lst = ast.literal_eval(notes)[_iter]
-		# 	lst = notes
-		# 	new_notes = []
-		# 	for i in lst:
-		# 		new_notes.append(i)
-		# 	n.notes = new_notes
-		# 	if _iter == 0:
-		# 		print(new_notes)
-		# 	_iter += 1
-
+		
 		self.song = song
 
 		self.songCycle = cycle(self.song)
 		self.curPattern = next(self.songCycle)
 		self.songStart = self.curPattern
-
-	
-# def load_song(self):
-# 		base_dir = "/home/pi/zpc_ct/user/songs/"
-# 		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
-
-
-
-
+		self.update_bpm()
+		# if self.playing:
+		# 	self.stop_playback()
+		# 	self.start_playback()
 
 	def update_display(self, x):
 		# if self.display_thread.is_alive():
 		
 		# 	self.display_thread.start()
 		# 	time.sleep(.001)
-		self.disp.image(self.image, self.rotation)
+		try:
+			self.disp.image(self.image, self.rotation)
+		except:
+			print('display failed')
 	def ud(self, x):
 		self.disp.image(self.image, self.rotation)
 
 			self.notes_on.append(0)
 			_iter += 1
 
+	def start_mixer(self):
+		print('starting mixer')
+		mixer.init()
+		mixer.set_num_channels(32)
+
+	def quit_mixer(self):
+		if mixer.get_init() != None:
+			print('quitting mixer')
+			mixer.quit()
+
 p = Prog()
 
 #while True:
 
 		#blink internal led
 		if p.playhead  % 8 == 0:
-			GPIO.setup(47, GPIO.OUT)
-			GPIO.output(47, GPIO.LOW)
+			GPIO.setup(29, GPIO.OUT)
+			GPIO.output(29, GPIO.LOW)
 		else:
-			GPIO.setup(47, GPIO.OUT)
-			GPIO.output(47, GPIO.HIGH)
+			GPIO.setup(29, GPIO.OUT)
+			GPIO.output(29, GPIO.HIGH)
 
 		p.pub.dispatch('beat', [p.curPattern, p.playhead]) 
 

new_wifi.txt

+this
+that
+the other
+
+network={
+    psk="this_ssid"
+    psk="this_pass"
+
+network={
+    psk="this_ssid"
+    psk="this_pass"
+}
+
+    psk="this_ssid"
+    psk="this_pass"
+}
+

runner.sh

+#until "python3 /home/pi/zpc_ct/main.py"; do
+until python3 ./main.py; do
+    echo "App 'zpc_ct' crashed with exit code $?.  Respawning.." >&2
+    sleep 2
+done

scripts/fade_out.sh

+#recursivly (from current directory) apply fade out to all wavs
+
+find . -name "*.wav"|while read w
+do 
+    echo "$w"
+	echo $w
+	sox "$w" "${w%.wav}_.wav" fade 0 $(soxi -D "$w") 0.00045
+	mv "${w%.wav}_.wav" "$w"
+done

set_wifi.sh

+FILE=wifi.txt
+declare -i _iter=0
+declare -i _first=0
+if [ -f "$FILE" ]; then
+    echo "" >> /etc/wpa_supplicant/wpa_supplicant.conf
+    echo "network={" >> /etc/wpa_supplicant/wpa_supplicant.conf
+    echo "$FILE exists."
+
+
+	while read line; do
+		if [[$_iter==0]];
+		then
+			#echo "this"
+	    		echo "    ssid=\"$line\"" >> /etc/wpa_supplicant/wpa_supplicant.conf
+		else
+			echo "that"
+			echo "    psk=\"$line\"" >> /etc/wpa_supplicant/wpa_supplicant.conf
+		fi
+		#$_iter += 1
+		let "_iter+=1" 
+	done < wifi.txt
+
+    echo "}" >> /etc/wpa_supplicant/wpa_supplicant.conf
+    rm wifi.txt
+fi

themes/bw.thm

-#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

-#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/dark.thm → user/themes/dark.thm

 #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"
+grey = "#808080"

themes/default.thm → user/themes/default.thm

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

user/themes/green.thm

+#main text
+light_grey = "#404040" 
+
+#main background
+blue = "#80D52A"
+
+#highlight1
+pink = "#D52A80"
+
+#highlight2
+olive = "#336699"
+
+dark_grey = "#D3D3D3"
+grey = "#808080"

user/themes/green2.thm

+#main text
+light_grey = "#80D52A" 
+
+#main background
+blue = "#404040"
+
+#highlight1
+pink = "#D52A80"
+
+#highlight2
+olive = "#336699"
+
+dark_grey = "#242424"
+grey = "#565656"

user/themes/red.thm

+#main text
+light_grey = "#D3D3D3"
+
+#main background
+blue = "#aa0000"
+
+#highlight1
+pink = "#610000"
+
+#highlight2
+olive = "#ffaa00"
+
+dark_grey = "#404040"
+grey = "#808080"

user/themes/red2.thm

+#main text
+light_grey = "#aa0000"
+
+#main background
+blue = "#000000"
+
+#highlight1
+pink = "#610000"
+
+#highlight2
+olive = "#ffaa00"
+
+dark_grey = "#212121"
+grey = "#808080"