211207 m

config.txt

@@ -1,5 +1,6 @@
-default_song = Roland_TR-808
-theme = green2
+default_song = 20211217
+theme = default
 title = default
 bpm = 90
 volume = 10
+song_dir = /home/pi/zpc_ct/user/songs/drum_machines/

lib/FSM.py

@@ -1,6 +1,8 @@
 
 import StatesProg
 import StatesDefender   
+
+
 #====================================
 class Transition(object):
     def __init__(self, toState):
@@ -91,7 +93,9 @@ class ProgFSM(Char):
         'Defender',
         'Update',
         'Calculator',
-        'About'
+        'About',
+        'SelectFolder',
+        'NewDir'
         ]
         
         for s in state_list:

lib/StatesProg.py

@@ -1,4 +1,3 @@
-
 import random
 import time
 import pygame
@@ -13,17 +12,37 @@ from datetime import date
 import ast
 import random
 from pathlib import Path
-import socket 
+#import socket 
 import FSM
 
 import utils as u
 import menus as m
 
 #states
+from sMain import Main
+from sSelectSound import SelectSound
+from sSelectPattern import SelectPattern
+from sEditSong import EditSong
+from sEditSoundSequence import EditSoundSequence
+from sFile import File
+from sUtil import Util
+from sBall import Ball
+from sExit import Exit
+from sReboot import Reboot
+from sClock import Clock
+from sShutdown import Shutdown
+from sSelTheme import SelTheme
+from sOpenSong import OpenSong
+from sEnterText import EnterText
+from sLoadSound import LoadSound
+from sPing import Ping
+from sWifi import Wifi
+from sDefender import Defender
 from sCalculator import Calculator
 from sAbout import About
 from sUpdate import Update
-
+from sSelectFolder import SelectFolder
+from sNewDir import NewDir
 #====================================     
 
 State = type("State", (object,), {})
@@ -163,182 +182,6 @@ class LoadDefault(State):
 
 #==================================== 
 			
-class Main(State):
-	def __init__(self,FSM):
-		super(Main, self).__init__(FSM)    
-		
-	def Enter(self):
-		print('hello main')
-		self.FSM.owner.pub.register("beat", self)
-		self.FSM.stateLife = 1
-		o = self.FSM.owner 
-		o.header_text = "Sound Select"
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-			pass
-		else:
-			u.draw_header(o)
-			self.draw_square()
-
-			u.text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
-			u.text_box2(o, "BPM", str(o.bpm))
-			u.text_box4(o, "Bank", str(o.note_bank))
-			u.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 
-		
-		# if o.keyState[16] == 2:
-		# 	o.button_repeater(0, [8,9,14,15])
-
-		#if o.keyState[17] == 2:
-		#	o.button_repeater(0, [4,5,6,7,8,9])
-
-		m.menu1_actions(self, o)
-		m.menu2_actions_sample(self, o)
-		#self.FSM.ToTransition('toClock')
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.draw_header(o)
-			self.draw_square()
-			#print('esound ', o.eSound)
-			#print('oss ', o.soundSlots[o.eSound].volume)
-			u.text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
-			u.text_box2(o, "BPM", str(o.bpm))
-			u.text_box4(o, "Bank", str(o.note_bank))
-			u.text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
-			o.button_repeater(1, [])
-			o.update_display(0)
-
-		
-
-
-		if o.keyState[17] == 1:
-			m.draw_menu2_sample(o)
-			o.update_display(0)
-		elif o.keyState[17] == 4:
-			u.draw_header(o)
-			self.draw_square()
-			u.text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
-			u.text_box2(o, "BPM", str(o.bpm))
-			u.text_box4(o, "Bank", str(o.note_bank))
-			u.text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
-			o.update_display(0)
-
-		_id = 0
-		for k in o.keyState:
-			if _id > 15:
-				pass
-			else:
-				if o.keyState[16] > 0 or o.keyState[17] > 0:
-					pass
-				else:
-					if k == 1:
-						note = _id + o.note_bank * 16
-						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) 
-						u.draw_header(o)
-						#u.text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
-						u.text_box1(o, "SVol", str(o.slots[o.eSound].volume))
-						u.text_box2(o, "BPM", str(o.bpm))
-						u.text_box4(o, "Bank", str(o.note_bank))
-						#u.text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
-						u.text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
-						self.draw_square()
-						o.update_display(0)
-			_id += 1
-
-	def ReceiveMessage(self, message):
-		o = self.FSM.owner 
-		u.play_seq(o, message)
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-			pass
-		else:
-			u.draw_header(o)            
-			self.draw_square()   
-			u.text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
-			u.text_box2(o, "BPM", str(o.bpm))
-			u.text_box4(o, "Bank", str(o.note_bank))
-			u.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 
-		size = 22
-		og_x = (o.width / 2) - (size * 2)
-		o_x = og_x
-		o_y = 127
-		_id = o.note_bank * 16 
-	
-		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):
-			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_grey, 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
-			_id += 1
-			if _id % 4 == 0:
-				o_y -= size
-				o_x = og_x
-
-	def has_sample(self, o, slot):
-		if o.soundSlots[slot].file != None:
-			return True
-		else:
-			return False
-
-	def Exit(self):
-		self.FSM.owner.pub.unregister("beat", self)
-
-#==================================== 
-#==================================== 
-			
 class PadPlayer(State):
 	def __init__(self,FSM):
 		super(PadPlayer, self).__init__(FSM)    
@@ -411,2166 +254,3 @@ class SeqPlayer(State):
 		self.FSM.owner.pub.unregister("beat", self)
 
 #==================================== 
-#==================================== 
-			
-class SelectSound(State):
-	def __init__(self,FSM):
-		super(SelectSound, self).__init__(FSM)    
-		
-	def Enter(self):
-		self.FSM.stateLife = 1
-		o = self.FSM.owner 
-		o.header_text = "SelSou"
-		o.pub.register("beat", self)
-		u.draw_header(o)
-		self.draw_square()
-		o.update_display(0)
-		super(SelectSound, self).Enter()        
-		
-	def Execute(self):
-		o = self.FSM.owner 
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.draw_header(o)
-			self.draw_square()
-			o.update_display(0)
-
-		if o.keyState[16] == 2:
-			if o.keyState[0] == 1:
-				self.FSM.ToTransition('toMain')
-		else:
-			_id = 0
-			for k in o.keyState:
-				if _id > 15:
-					pass
-				else:
-					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.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()
-						#print('now editing sound ', _id)    
-				_id += 1        
-
-	def ReceiveMessage(self, message):
-		_id = 0
-		o = self.FSM.owner 
-		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.update_display(0)
-		u.play_seq(o, message)
-
-	def draw_square(self):
-		o = self.FSM.owner 
-		size = 32
-		og_x = 110
-		o_x = og_x
-		o_y = 0
-		_id = 0
-	
-		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.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
-			_id += 1
-			if _id % 4 == 0:
-				o_y += size
-				o_x = og_x
-
-		
-	def Exit(self):
-		self.FSM.owner.pub.unregister("beat", self)
-
-#==================================== 
-			
-class SelectPattern(State):
-	def __init__(self,FSM):
-		super(SelectPattern, self).__init__(FSM)    
-		
-	def Enter(self):
-		self.FSM.stateLife = 1
-		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:
-			u.draw_header(o)
-			self.draw_square()
-			u.text_box1(o, "Pat", str(o.ePattern))
-			u.text_box4(o, "Bank", str(o.pat_bank))
-			o.update_display(0)
-		
-		super(SelectPattern, self).Enter()        
-		
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		m.menu2_actions_pattern(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.draw_header(o)
-			self.draw_square()
-			u.text_box1(o, "Pat", str(o.ePattern))
-			u.text_box4(o, "Bank", str(o.pat_bank))
-			o.update_display(0)
-
-		if o.keyState[17] == 1:
-			m.draw_menu2_pattern(o)
-			o.update_display(0)
-		elif o.keyState[17] == 4:
-			u.draw_header(o)
-			self.get_active_patterns(o)
-			self.draw_square()
-			u.text_box1(o, "Pat", str(o.ePattern))
-			u.text_box4(o, "Bank", str(o.pat_bank))
-			
-			o.update_display(0)
-
-
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-			pass
-		else:
-			_id = 0
-			for k in o.keyState:
-				if _id > 15:
-					pass
-				else:
-					if k == 1:
-						o.ePattern = (o.pat_bank * 16) +_id 
-
-						u.draw_header(o)
-						self.draw_square()
-						
-						u.text_box1(o, "Pat", str(o.ePattern))
-						u.text_box4(o, "Bank", str(o.pat_bank))
-						o.update_display(0)
-						
-
-				_id += 1        
-
-	def ReceiveMessage(self, message):
-		o = self.FSM.owner
-		u.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:
-				u.draw_header(o)
-				self.draw_square()
-				u.text_box1(o, "Pat", str(o.ePattern))
-				u.text_box4(o, "Bank", str(o.pat_bank))
-				o.update_display(0)
-
-	def draw_square(self):
-		o = self.FSM.owner 
-		size = 22
-		og_x = (o.width / 2) - (size * 2)
-		o_x = og_x
-		o_y = 127
-		_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.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.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_grey, 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)
-
-#==================================== 
-			
-class EditSoundSequence(State):
-	def __init__(self,FSM):
-		super(EditSoundSequence, self).__init__(FSM)    
-		
-	def Enter(self):
-		self.FSM.stateLife = 1
-		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:
-			u.draw_header(o)
-			self.draw_square()
-			u.text_box1(o, "Note Vol", str(o.note_vol))
-			u.text_box3(o, "Pat", str(self.curPattern))
-			o.update_display(0)
-		super(EditSoundSequence, self).Enter()        
-		
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		m.menu2_actions_note(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.draw_header(o)
-			self.draw_square()
-			u.text_box1(o, "Note Vol", str(o.note_vol))
-			u.text_box3(o, "Pat", str(self.curPattern))
-			o.update_display(0)
-
-		if o.keyState[17] == 1:
-			m.draw_menu2_note(o)
-			o.update_display(0)
-		elif o.keyState[17] == 4:
-			u.draw_header(o)
-			self.draw_square()
-			u.text_box1(o, "Note Vol", str(o.note_vol))
-			u.text_box3(o, "Pat", str(self.curPattern))
-			o.update_display(0)
-
-		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[self.curPattern][_id][0] == 1:
-						#print('turn note off')
-						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[self.curPattern][_id][0] = 1
-						o.soundSlots[o.eSound].notes[self.curPattern][_id][1] = o.note_vol
-					u.draw_header(o)
-					self.draw_square()
-					u.text_box1(o, "Note Vol", str(o.note_vol))			
-					u.text_box3(o, "Pat", str(self.curPattern))
-					o.update_display(0)
-				_id += 1
-
-
-		
-	def draw_square(self):
-		o = self.FSM.owner 
-		size = 22
-		og_x = (o.width / 2) - (size * 2)
-		o_x = og_x
-		o_y = 127
-		_id = 0
-		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.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:
-				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
-			_id += 1
-			if _id % 4 == 0:
-				o_y -= size
-				o_x = og_x
-
-	def ReceiveMessage(self, message):
-		_id = 0
-		o = self.FSM.owner 
-		u.play_seq(o, message)
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-			pass
-		else:
-			u.draw_header(o)            
-			self.draw_square()  
-			u.text_box1(o, "Note Vol", str(o.note_vol))
-			u.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)    
-		
-	def Enter(self):
-		o = self.FSM.owner 
-		o.header_text = "Edit Song"
-		o.pub.register("beat", self)
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-			pass
-		else:
-			u.draw_header(o)
-			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()        
-		
-	def Execute(self):
-		o = self.FSM.owner 
-
-		m.menu1_actions(self, o)
-		m.menu2_actions_song(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.draw_header(o)
-			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:
-			m.draw_menu2_song(o)
-			o.update_display(0)
-		elif o.keyState[17] == 4:
-			u.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:
-			pass
-		else:
-			_id = 0
-			for k in self.FSM.owner.keyState:
-				if k == 1 and _id < 16:
-					self.new_song.append((_id + (o.pat_bank * 16)))
-					u.draw_header(o)
-					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 = u.breakup_song_text(o.song)
-		#lines = u.breakup_song_text(tmp_song)
-
-		if self.new_song != []:
-			#o.draw.text((20, 30), "New Song", font=o.h2, fill=o.pink)
-			lines = u.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 
-		u.play_seq(o, message)
-
-	def Exit(self):
-		o = self.FSM.owner 
-		self.FSM.owner.pub.unregister("beat", self)
-		if self.new_song != []:
-			o.song = self.new_song
-			o.songCycle = cycle(self.new_song)
-			self.curPattern = next(o.songCycle)
-			o.songStart = o.curPattern
-
-#==================================== 
-
-class File(State):
-	def __init__(self,FSM):
-		super(File, self).__init__(FSM)    
-		
-	def Enter(self):
-		self.FSM.stateLife = 1
-		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:
-			u.draw_header(o)
-			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):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			#self.draw_footer(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.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:
-			u.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:
-				m.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 
-		u.play_seq(o, message)
-		
-	def Exit(self):
-		self.FSM.owner.pub.unregister("beat", self)
-
-class Util(State):
-	def __init__(self,FSM):
-		super(Util, self).__init__(FSM)    
-		
-	def Enter(self):
-		o = self.FSM.owner 
-		o.header_text = "Utilities"
-		o.pub.register("beat", self)
-		self.menu = ["Clock", "Balls", "Defender", "Calculator", "Exit", "Shutdown", "Reboot", "Theme", "Ping", "Wifi", "Update", "About"]
-		self.cur_el = 0
-
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-			pass
-		else:
-			u.draw_header(o)
-			self.draw_footer(o)
-			self.draw_main(o)
-			o.update_display(0)
-
-		
-		super(Util, self).Enter()        
-		
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.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:
-			u.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:
-				m.util_command(self, o, self.menu[self.cur_el])
-		
-	def ReceiveMessage(self, message):
-		_id = 0
-		o = self.FSM.owner 
-		u.play_seq(o, message)
-		# if o.keyState[16] > 0 or o.keyState[17] > 0:
-		# 	pass
-		# else:
-		# 	u.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:
-			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):
-		self.FSM.owner.pub.unregister("beat", self)        
-
-
-
-class Ball(State):
-	def __init__(self,FSM):
-		super(Ball, 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:
-			u.draw_header(o)
-			o.update_display(0)
-		super(Ball, self).Enter()        
-		
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.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 
-		u.play_seq(o, message)
-		
-	def Exit(self):
-		self.FSM.owner.pub.unregister("beat", self)        
-
-#==================================== 
-
-
-class Clock(State):
-	def __init__(self,FSM):
-		super(Clock, self).__init__(FSM)    
-		
-	def Enter(self):
-		o = self.FSM.owner 
-		current_time = time.strftime("%-I:%M:%S")
-		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 = .5
-		self.ball_x_dir = 1
-		self.ball_y_dir = 1
-		
-		o.header_text = "Clock"
-		o.pub.register("beat", self)
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-			pass
-		else:
-			pass
-		super(Clock, self).Enter()        
-		
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-
-
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-			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 - 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.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):
-		o = self.FSM.owner 
-		u.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 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)    
-		
-	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/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]
-		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:
-			u.draw_header(o)
-			self.draw_main(o)			
-			
-			o.update_display(0)
-		super(SelTheme, self).Enter()    
-
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.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:
-			u.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:
-				m.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 
-		u.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:
-			u.draw_header(o)
-			self.draw_main(o)			
-			
-			o.update_display(0)
-		super(OpenSong, self).Enter()    
-
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.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:
-			u.draw_header(o)
-			self.draw_footer(o)
-			self.draw_main(o)
-			o.update_display(0)	
-			
-
-		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.save_config()
-				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 
-		u.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 
-	
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.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)
-		self.last_action = pygame.time.get_ticks()
-		self.caps = False
-		self.cur_but = 18
-		self.cur_letter = ""
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-			pass
-		else:
-			pass
-
-		self.skips = [7, 3, 11, 12, 13, 14, 15]
-		
-		self.lc_labels = [["p", "q", "r", "s"], ["t", "u", "v"], ["w", "x", "y", "z"], ["C", "A", "P", "S"], 
-				["g", "h", "i"], ["j", "k", "l"], ["m", "n", "o"], ["D", "E", "L"],
-				["_", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-"], ["a", "b", "c"], ["d", "e", "f"], ["O", "K"],
-				[], [], [], []]
-
-		self.uc_labels = [["P", "Q", "R", "S"], ["T", "U", "V"], ["W", "X", "Y", "Z"], ["C", "A", "P", "S"], 
-				["G", "H", "I"], ["J", "K", "L"], ["M", "N", "O"], ["D", "E", "L"],
-				["_", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-"], ["A", "B", "C"], ["D", "E", "F"], ["O", "K"],
-				[], [], [], []]
-
-		self.labels = self.lc_labels
-
-		#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:
-			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')	
-
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.draw_header(o)
-			self.draw(o)
-			#self.draw_main(o)
-			o.update_display(0)
-
-		if o.keyState[17] == 1:
-			m.draw_menu_saveas(o)
-			o.update_display(0)
-		elif o.keyState[17] == 4:
-			u.draw_header(o)
-			self.draw(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:
-			u.draw_header(o)
-			self.draw(o)
-			#self.draw_main(o)
-			o.update_display(0)	
-			
-
-		if o.keyState[16] > 0 or 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
-						if _iter < len(self.cycles):
-							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)
-
-					elif _iter == 3:
-						print('caps')
-						if self.caps:
-							self.caps = False
-							self.labels = self.lc_labels
-
-						else:
-							self.caps = True
-							self.labels = self.uc_labels
-						self.draw(o)
-						o.center_block(self.input_string, o.h2, [0, 0, o.width, y_size], o.light_grey)
-						self.cycles = []
-						for l in self.labels:
-							self.cycles.append(cycle(l))
-
-					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 
-		u.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
-
-			if _id == 8:
-				lab = "_12"
-
-			o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.blue)
-			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):
-		self.FSM.owner.pub.unregister("beat", self)        
-
-#==================================== 
-
-class LoadSound(State):
-	def __init__(self,FSM):
-		super(LoadSound, self).__init__(FSM)    
-		
-	def Enter(self):
-		o = self.FSM.owner
-		o.header_text = "Load Sound"
-		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:
-			pass
-		else:
-			u.draw_header(o)
-			self.draw_main(o)			
-			
-			o.update_display(0)
-		super(LoadSound, self).Enter()    
-
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.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:
-			u.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:
-
-			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
-					self.draw_main(o)
-					o.update_display(0)	
-					self.press_ticks_up = pygame.time.get_ticks()
-			
-					
-
-			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
-					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]:
-						pass
-					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')
-					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.load_song_dir += '/'
-						print('new up dir is ', o.load_song_dir)
-						self.menu = []
-						self.menu.append("..")
-						self.menu += self.get_file_list(o)
-
-						self.cur_el = 0
-
-				elif os.path.isdir(o.load_song_dir + self.menu[self.cur_el]):
-					print('this is a directory ', o.load_song_dir + self.menu[self.cur_el])
-					o.load_song_dir = o.load_song_dir + self.menu[self.cur_el] + '/'
-					self.menu = []
-					self.menu.append("..")
-					self.menu += self.get_file_list(o)
-					self.cur_el = 0
-
-				else:
-					print('this is not a directory ', o.load_song_dir + self.menu[self.cur_el])
-					o.soundSlots[o.eSound].file = o.load_song_dir + self.menu[self.cur_el]
-					o.soundSlots[o.eSound].volume = 16
-					o.soundSlots[o.eSound].pitch = 0
-					o.soundSlots[o.eSound].create_sound()
-					o.soundSlots[o.eSound].set_pitch()
-					o.last_load_sound_id = self.cur_el
-					self.FSM.ToTransition('toMain')
-
-	def get_file_list(self, o):
-		#os.path.isdir(o.load_song_dir + self.menu[self.cur_el])
-		dirs = os.listdir(o.load_song_dir)
-		dirs.sort()
-		for i in dirs:
-			if os.path.isdir(o.load_song_dir + i):
-				i += "/asdfasdfasf"
-				print(i, ' is a directory')
-			else:
-				print(i, ' is not a directory')
-		print(dirs)
-		return dirs
-
-	def draw_main(self, o):
-		al = []
-		ypos = 30
-		#print(self.menu)
-		if self.cur_el == 0:
-			_iter = 0
-			while len(al) < 4:
-				if _iter < len(self.menu):
-					#print('appending to al', _iter, ' ', len(self.menu))
-					al.append(self.menu[_iter])
-				else:
-					break
-				_iter += 1
-		elif self.cur_el == 1:
-			al.append(self.menu[self.cur_el - 1])
-			al.append(self.menu[self.cur_el])
-			if (self.cur_el + 1) < len(self.menu):
-				al.append(self.menu[self.cur_el + 1])
-			if (self.cur_el + 2) < len(self.menu):
-				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 
-		#print(al)
-		for i in al:
-			# if os.path.isdir(o.load_song_dir + i):
-			# 	i += "/"
-			# 	print(i, ' is a directory')
-			# else:
-			# 	print(i, ' is not a directory')
-
-			if i == self.menu[self.cur_el]:
-			#if _iter == self.cur_el:
-				if os.path.isdir(o.load_song_dir + i):
-					i += "/"
-				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:
-				if os.path.isdir(o.load_song_dir + i):
-					i += "/"
-				o.draw.rectangle((0, ypos, o.width, ypos + 20), outline=0, fill=o.blue)
-				#i += '/2342'
-				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", "Play", "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:
-				if _iter == 2:
-					if self.is_wav():
-						o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.light_grey)
-					else:
-						o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.dark_grey)	
-				else:
-					o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.light_grey)	
-			
-			xpos += width
-			_iter += 1
-		
-	def is_wav(self):
-		if len(self.menu[self.cur_el]) > 3 and (self.menu[self.cur_el][-1] == 'V' or self.menu[self.cur_el][-1] == 'v') and (self.menu[self.cur_el][-2] == 'A' or self.menu[self.cur_el][-2] == 'a') and (self.menu[self.cur_el][-3] == 'W' or self.menu[self.cur_el][-3] == 'w'):
-			return True
-		else:
-			return False
-
-	def ReceiveMessage(self, message):
-		o = self.FSM.owner 
-		u.play_seq(o, message)
-		
-	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)
-
-		u.draw_header(o)
-		o.update_display(0)
-		super(Ping, self).Enter()        
-		
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.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:
-			u.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 
-		u.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)
-
-		u.draw_header(o)
-		self.draw_main(o)
-		o.update_display(0)
-		super(Wifi, self).Enter()        
-		
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			u.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:
-			u.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 
-		u.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):
-		o = self.FSM.owner 
-		
-		self.gameFSM = FSM.DefenderFSM(o)
-
-		super(Defender, self).Enter()        
-		
-	def Execute(self):
-		o = self.FSM.owner 
-		m.menu1_actions(self, o)
-		if o.keyState[16] == 1:
-			m.draw_menu1(o)
-			o.update_display(0)
-		elif o.keyState[16] == 4:
-			#u.draw_header(o)
-			#self.draw_footer(o)
-			#self.draw_main(o)
-			#o.update_display(0)		
-			pass
-
-		if o.keyState[16] > 0 or o.keyState[17] > 0:
-
-		#if o.keyState[16] > 0:
-			pass
-		else:
-			self.gameFSM.Execute()
-		
-	def Exit(self):
-		pass
-
-#==================================== 
-#==================================== 
-
-
-
-# class Update(State):
-# 	def __init__(self,FSM):
-# 		super(Update, self).__init__(FSM)    
-		
-# 	def Enter(self):
-		
-# 		o = self.FSM.owner 
-# 		o.header_text = "Update"
-# 		o.pub.register("beat", self)
-# 		g = git.cmd.Git("/home/pi/zpc_ct/")
-# 		self.msg = g.pull()
-# 		if o.keyState[16] > 0 or o.keyState[17] > 0:
-# 			pass
-# 		else:
-# 			u.draw_header(o)
-# 			o.update_display(0)
-# 		super(Update, self).Enter()        
-		
-# 	def Execute(self):
-# 		o = self.FSM.owner 
-# 		m.menu1_actions(self, o)
-# 		if o.keyState[16] == 1:
-# 			m.draw_menu1(o)
-# 			o.update_display(0)
-# 		elif o.keyState[16] == 4:
-# 			u.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:
-# 			u.draw_header(o)
-# 			#self.draw_footer(o)
-# 			self.draw_main(o)
-# 			o.update_display(0)	
-
-# 		if o.keyState[16] > 0 or o.keyState[17] > 0:
-# 			pass
-# 		else:			
-# 			pass
-# 			#o.update_display(0)
-	
-# 	def draw_main(self, o):
-# 		#o.center_text(self.msg, o.h1, o.width, 25, o.light_grey)
-# 		o.center_block(self.msg, o.h2, [0, 0, o.width, o.height], o.light_grey)
-
-# 	def ReceiveMessage(self, message):
-# 		o = self.FSM.owner 
-# 		u.play_seq(o, message)
-		
-# 	def Exit(self):
-# 		self.FSM.owner.pub.unregister("beat", self)        
-
-#==================================== 
-
-
-
-# class Calculator(State):
-# 	def __init__(self,FSM):
-# 		super(Calculator, self).__init__(FSM)    
-		
-# 	def Enter(self):
-# 		o = self.FSM.owner 
-
-# 		o.pub.register("beat", self)
-		
-# 		self.num1 = ''
-# 		self.num2 = ''
-# 		self.op = ''
-# 		self.result = ''
-
-# 		self.labels = ['.', '0', '=', '/',
-# 						'1', '2', '3', '*',
-# 						'4', '5', '6', '-',
-# 						'7', '8', '9', '+',
-# 						'7', '8', '9', '+']
-
-# 		self.draw_main(o)
-# 		o.update_display(0)
-
-# 		super(Calculator, self).Enter()        
-		
-# 	def Execute(self):
-# 		o = self.FSM.owner 
-# 		m.menu1_actions(self, o)
-# 		if o.keyState[16] == 1:
-# 			m.draw_menu1(o)
-# 			o.update_display(0)
-# 		elif o.keyState[16] == 4:		
-# 			self.draw_main(o)
-# 			o.update_display(0)
-
-# 		if o.keyState[16] > 0:
-# 			pass
-# 		else:
-# 			if o.keyState[17] == 1:
-# 				self.num1 = ''
-# 				self.num2 = ''
-# 				self.op = ''
-# 				self.result = ''
-
-# 			self.check_keys(o)
-
-# 	def append_num(self, num):
-# 		ops = ['+', '-', '*', '/']
-# 		print('appending num ', num)
-# 		if num in ops:
-# 			if self.num1 != '':
-# 				self.op = num
-# 				self.num2 = ''
-# 				self.result = ''
-# 		elif num == '=':
-# 			print('this is that')
-# 			if self.num2 != '':
-# 				if self.result == '':
-# 					if self.op == '+':
-# 						self.result = float(self.num1) + float(self.num2)
-# 						print(self.result)
-# 					if self.op == '-':
-# 						self.result = float(self.num1) - float(self.num2)
-# 						print(self.result)
-# 					if self.op == '*':
-# 						self.result = float(self.num1) * float(self.num2)
-# 						print(self.result)
-# 					if self.op == '/':
-# 						self.result = float(self.num1) / float(self.num2)
-# 						print(self.result)
-# 				else:
-# 					if self.op != '':
-# 						if self.op == '+':
-# 							self.result = self.result + float(self.num2)
-# 							print(self.result)
-# 						if self.op == '-':
-# 							self.result = self.result - float(self.num2)
-# 							print(self.result)
-# 						if self.op == '*':
-# 							self.result = self.result * float(self.num2)
-# 							print(self.result)
-# 						if self.op == '/':
-# 							self.result = self.result / float(self.num2)
-# 							print(self.result)
-
-# 		else:
-# 			if self.result != '':
-# 				self.num1 = ''
-# 				self.num2 = ''
-# 				self.op = ''
-# 				self.result = ''
-# 			if self.op == '':
-# 				self.num1 += num
-# 				print('---append ', num)
-# 			else:
-# 				self.num2 += num
-# 				print('---append ', num)
-
-# 	def check_keys(self, o):
-# 		_iter = 0
-# 		for k in o.keyState:
-# 			if k == 1:
-# 				if _iter == 0:
-# 					if ('.' not in self.num1 and self.num2 == '') or (self.num2 != '' and '.' not in self.num2):
-# 						self.append_num('.')
-# 				if _iter == 1:
-# 					self.append_num('0')
-# 				if _iter == 2:
-# 					self.append_num('=')
-# 				if _iter == 3:
-# 					self.append_num('/')
-# 				if _iter == 4:
-# 					self.append_num('1')
-# 				if _iter == 5:
-# 					self.append_num('2')
-# 				if _iter == 6:
-# 					self.append_num('3')
-# 				if _iter == 7:
-# 					self.append_num('*')
-# 				if _iter == 8:
-# 					self.append_num('4')
-# 				if _iter == 9:
-# 					self.append_num('5')
-# 				if _iter == 10:
-# 					self.append_num('6')
-# 				if _iter == 11:
-# 					self.append_num('-')
-# 				if _iter == 12:
-# 					self.append_num('7')
-# 				if _iter == 13:
-# 					self.append_num('8')
-# 				if _iter == 14:
-# 					self.append_num('9')
-# 				if _iter == 15:
-# 					self.append_num('+')
-
-# 				self.draw_main(o)
-
-# 			_iter += 1
-
-# 	def draw_main(self, o):
-# 		print('drawing ', self.num1)
-# 		x_size = o.width / 4
-# 		y_size = o.height / 5
-# 		og_x = 0
-# 		o_x = og_x
-# 		o_y = o.height
-# 		text_padding = 6
-		
-# 		_id = 0
-# 		while _id < 20:
-# 			# lab = ""
-# 			# for i in self.labels[_id]:
-# 			# 	lab += i
-
-# 			lab = self.labels[_id]
-
-# 			o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.blue)
-# 			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)
-# 		#o.center_block('where is my fucking text', o.h2, [0, 0, o.width, y_size], o.light_grey)
-# 		if self.num1 != '':
-# 			if self.result != '':
-# 				o.center_block(str(self.result), o.h2, [0, 0, o.width, y_size], o.light_grey)
-# 			elif self.num2 != '':
-# 				o.center_block(str(self.num2), o.h2, [0, 0, o.width, y_size], o.light_grey)
-# 			elif self.op != '':
-# 				o.center_block(str(self.op), o.h2, [0, 0, o.width, y_size], o.light_grey)
-# 			else:
-# 				o.center_block(str(self.num1), o.h2, [0, 0, o.width, y_size], o.light_grey)
-# 			print('fucking do something')
-# 		else:
-# 			print('num1 is empty')
-# 		o.update_display(0)
-
-# 	def ReceiveMessage(self, message):
-# 		o = self.FSM.owner 
-# 		u.play_seq(o, message)
-
-# 	def Exit(self):
-# 		self.FSM.owner.pub.unregister("beat", self)
-
-#==================================== 
-
-# class About(State):
-# 	def __init__(self,FSM):
-# 		super(About, self).__init__(FSM)    
-		
-# 	def Enter(self):
-		
-# 		o = self.FSM.owner 
-# 		o.header_text = "About"
-# 		o.pub.register("beat", self)
-		
-# 		if o.keyState[16] > 0 or o.keyState[17] > 0:
-# 			pass
-# 		else:
-# 			u.draw_header(o)
-# 			o.update_display(0)
-# 			self.draw_main(o)
-# 		super(About, self).Enter()        
-		
-# 	def Execute(self):
-# 		o = self.FSM.owner 
-# 		m.menu1_actions(self, o)
-# 		if o.keyState[16] == 1:
-# 			m.draw_menu1(o)
-# 			o.update_display(0)
-# 		elif o.keyState[16] == 4:
-# 			u.draw_header(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:
-# 			u.draw_header(o)
-# 			self.draw_main(o)
-# 			o.update_display(0)	
-	
-# 	def draw_main(self, o):
-# 		o.center_block("rob@robzilla-beats.com", o.h2, [0, 0, o.width, o.height], o.light_grey)
-
-# 	def ReceiveMessage(self, message):
-# 		o = self.FSM.owner 
-# 		u.play_seq(o, message)
-		
-# 	def Exit(self):
-# 		self.FSM.owner.pub.unregister("beat", self)        

lib/menus.py

@@ -98,7 +98,18 @@ def draw_menu2_sample(o):
 				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)
+		
+		if _id == 14:
+			if o.erase == True:
+				o.center_block("Erase", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.pink)
+			else:
+				o.center_block("Erase", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 
+		if _id == 15:
+			if o.mute == True:
+				o.center_block("Mute", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.pink)
+			else:
+				o.center_block("Mute", 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
@@ -207,8 +218,7 @@ def draw_menu_saveas(o):
 			o.center_block("Select Folder", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		if _id == 7:
 			o.center_block("New Folder", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
-		if _id == 4:
-			o.center_block("Delete", 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
@@ -279,6 +289,7 @@ def menu1_actions(self, o):
 				o.update_display(0)
 		if o.keyState[11] == 1:
 			#o.save_song()
+
 			pass
 
 		if o.keyState[10] == 2:
@@ -476,6 +487,26 @@ def menu2_actions_sample(self, o):
 				o.soundSlots[i[0]].notes[i[1]][i[2]][1] = 0
 			o.undo_buf = []
 
+		if o.keyState[14] == 1:
+			o.erase = not o.erase
+			o.erase_buf = []
+			print('erase now is ', o.erase)
+			if o.erase:
+				o.mute = False
+				o.mute_buf = []
+			draw_menu2_sample(o)
+			o.update_display(0)
+
+		if o.keyState[15] == 1:
+			o.mute = not o.mute
+			o.mute_buf = []
+			print('mute now is ', o.mute)
+			if o.mute:
+				o.erase = False
+				o.erase_buf = []
+			draw_menu2_sample(o)
+			o.update_display(0)
+
 def menu2_actions_pattern(self, o):
 	if o.keyState[17] == 2:
 		if o.keyState[0] == 1:
@@ -593,6 +624,18 @@ def menu2_actions_note(self, o):
 			o.update_display(0)			
 					
 
+def menu2_actions_saveas(self, o):
+	if o.keyState[17] == 2:
+		if o.keyState[12] == 1:
+			print('select folder')
+			self.FSM.ToTransition('toSelectFolder')	
+		elif o.keyState[14] == 1:
+			print('new folder')
+			#o.song_dir
+			#os.mkdir(path)
+			self.FSM.ToTransition('toNewDir')	
+
+
 def util_command(self, o, command):
 	if command == "Clock":
 		self.FSM.ToTransition('toClock')		

lib/sAbout.py

@@ -14,7 +14,7 @@ class State(object):
 		pass
 	def Exit(self):
 		pass
-
+#====================================     
 class About(State):
 	def __init__(self,FSM):
 		super(About, self).__init__(FSM)    

lib/sBall.py

@@ -0,0 +1,118 @@
+import FSM
+import utils as u
+import menus as m
+import random
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+class Ball(State):
+	def __init__(self,FSM):
+		super(Ball, 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:
+			u.draw_header(o)
+			o.update_display(0)
+		super(Ball, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.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 
+		u.play_seq(o, message)
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)        

lib/sClock.py

@@ -0,0 +1,90 @@
+import FSM
+import utils as u
+import menus as m
+from datetime import date
+import time
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+class Clock(State):
+	def __init__(self,FSM):
+		super(Clock, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner 
+		current_time = time.strftime("%-I:%M:%S")
+		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 = .5
+		self.ball_x_dir = 1
+		self.ball_y_dir = 1
+		
+		o.header_text = "Clock"
+		o.pub.register("beat", self)
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			pass
+		super(Clock, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			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 - 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.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):
+		o = self.FSM.owner 
+		u.play_seq(o, message)
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)        

lib/sDefender.py

@@ -0,0 +1,52 @@
+import FSM
+import utils as u
+import menus as m
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+class Defender(State):
+	def __init__(self,FSM):
+		super(Defender, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner 
+		
+		self.gameFSM = FSM.DefenderFSM(o)
+
+		super(Defender, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			#u.draw_header(o)
+			#self.draw_footer(o)
+			#self.draw_main(o)
+			#o.update_display(0)		
+			pass
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+
+		#if o.keyState[16] > 0:
+			pass
+		else:
+			self.gameFSM.Execute()
+		
+	def Exit(self):
+		pass
+
+#==================================== 

lib/sEditSong.py

@@ -0,0 +1,121 @@
+import FSM
+import utils as u
+import menus as m
+from itertools import cycle
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+#====================================     
+
+
+class EditSong(State):
+	def __init__(self,FSM):
+		super(EditSong, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner 
+		o.header_text = "Edit Song"
+		o.pub.register("beat", self)
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			u.draw_header(o)
+			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()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+
+		m.menu1_actions(self, o)
+		m.menu2_actions_song(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.draw_header(o)
+			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:
+			m.draw_menu2_song(o)
+			o.update_display(0)
+		elif o.keyState[17] == 4:
+			u.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:
+			pass
+		else:
+			_id = 0
+			for k in self.FSM.owner.keyState:
+				if k == 1 and _id < 16:
+					self.new_song.append((_id + (o.pat_bank * 16)))
+					u.draw_header(o)
+					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 = u.breakup_song_text(o.song)
+		#lines = u.breakup_song_text(tmp_song)
+
+		if self.new_song != []:
+			#o.draw.text((20, 30), "New Song", font=o.h2, fill=o.pink)
+			lines = u.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 
+		u.play_seq(o, message)
+
+	def Exit(self):
+		o = self.FSM.owner 
+		self.FSM.owner.pub.unregister("beat", self)
+		if self.new_song != []:
+			o.song = self.new_song
+			o.songCycle = cycle(self.new_song)
+			self.curPattern = next(o.songCycle)
+			o.songStart = o.curPattern
+
+#==================================== 

lib/sEditSoundSequence.py

@@ -0,0 +1,130 @@
+import FSM
+import utils as u
+import menus as m
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+#====================================     
+
+class EditSoundSequence(State):
+	def __init__(self,FSM):
+		super(EditSoundSequence, self).__init__(FSM)    
+		
+	def Enter(self):
+		self.FSM.stateLife = 1
+		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:
+			u.draw_header(o)
+			self.draw_square()
+			u.text_box1(o, "Note Vol", str(o.note_vol))
+			u.text_box3(o, "Pat", str(self.curPattern))
+			o.update_display(0)
+		super(EditSoundSequence, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		m.menu2_actions_note(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.draw_header(o)
+			self.draw_square()
+			u.text_box1(o, "Note Vol", str(o.note_vol))
+			u.text_box3(o, "Pat", str(self.curPattern))
+			o.update_display(0)
+
+		if o.keyState[17] == 1:
+			m.draw_menu2_note(o)
+			o.update_display(0)
+		elif o.keyState[17] == 4:
+			u.draw_header(o)
+			self.draw_square()
+			u.text_box1(o, "Note Vol", str(o.note_vol))
+			u.text_box3(o, "Pat", str(self.curPattern))
+			o.update_display(0)
+
+		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[self.curPattern][_id][0] == 1:
+						#print('turn note off')
+						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[self.curPattern][_id][0] = 1
+						o.soundSlots[o.eSound].notes[self.curPattern][_id][1] = o.note_vol
+					u.draw_header(o)
+					self.draw_square()
+					u.text_box1(o, "Note Vol", str(o.note_vol))			
+					u.text_box3(o, "Pat", str(self.curPattern))
+					o.update_display(0)
+				_id += 1
+
+
+		
+	def draw_square(self):
+		o = self.FSM.owner 
+		size = 22
+		og_x = (o.width / 2) - (size * 2)
+		o_x = og_x
+		o_y = 127
+		_id = 0
+		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.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:
+				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
+			_id += 1
+			if _id % 4 == 0:
+				o_y -= size
+				o_x = og_x
+
+	def ReceiveMessage(self, message):
+		_id = 0
+		o = self.FSM.owner 
+		u.play_seq(o, message)
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			u.draw_header(o)            
+			self.draw_square()  
+			u.text_box1(o, "Note Vol", str(o.note_vol))
+			u.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)
+

lib/sEnterText.py

@@ -0,0 +1,221 @@
+import FSM
+import utils as u
+import menus as m
+import pygame
+from itertools import cycle
+from datetime import datetime
+from datetime import date
+
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+class EnterText(State):
+	def __init__(self,FSM):
+		super(EnterText, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner 
+	
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			#u.draw_header(o)
+			#self.draw_footer(o)
+			self.draw(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)
+		self.last_action = pygame.time.get_ticks()
+		self.caps = False
+		self.cur_but = 18
+		self.cur_letter = ""
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			pass
+
+		self.skips = [7, 3, 11, 12, 13, 14, 15]
+		
+		self.lc_labels = [["p", "q", "r", "s"], ["t", "u", "v"], ["w", "x", "y", "z"], ["C", "A", "P", "S"], 
+				["g", "h", "i"], ["j", "k", "l"], ["m", "n", "o"], ["D", "E", "L"],
+				["_", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-"], ["a", "b", "c"], ["d", "e", "f"], ["O", "K"],
+				[], [], [], []]
+
+		self.uc_labels = [["P", "Q", "R", "S"], ["T", "U", "V"], ["W", "X", "Y", "Z"], ["C", "A", "P", "S"], 
+				["G", "H", "I"], ["J", "K", "L"], ["M", "N", "O"], ["D", "E", "L"],
+				["_", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-"], ["A", "B", "C"], ["D", "E", "F"], ["O", "K"],
+				[], [], [], []]
+
+		self.labels = self.lc_labels
+
+		#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:
+			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')	
+
+		m.menu1_actions(self, o)
+		m.menu2_actions_saveas(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.draw_header(o)
+			self.draw(o)
+			#self.draw_main(o)
+			o.update_display(0)
+
+		if o.keyState[17] == 1:
+			m.draw_menu_saveas(o)
+			o.update_display(0)
+		elif o.keyState[17] == 4:
+			u.draw_header(o)
+			self.draw(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:
+			u.draw_header(o)
+			self.draw(o)
+			#self.draw_main(o)
+			o.update_display(0)	
+			
+
+		if o.keyState[16] > 0 or 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
+						if _iter < len(self.cycles):
+							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)
+
+					elif _iter == 3:
+						print('caps')
+						if self.caps:
+							self.caps = False
+							self.labels = self.lc_labels
+
+						else:
+							self.caps = True
+							self.labels = self.uc_labels
+						self.draw(o)
+						o.center_block(self.input_string, o.h2, [0, 0, o.width, y_size], o.light_grey)
+						self.cycles = []
+						for l in self.labels:
+							self.cycles.append(cycle(l))
+
+					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 
+		u.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
+
+			if _id == 8:
+				lab = "_12"
+
+			o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.blue)
+			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):
+		self.FSM.owner.pub.unregister("beat", self)        
+

lib/sExit.py

@@ -0,0 +1,39 @@
+import FSM
+import utils as u
+import menus as m
+import pygame
+import sys
+
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+
+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

lib/sFile.py

@@ -0,0 +1,141 @@
+import FSM
+import utils as u
+import menus as m
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+#====================================     
+class File(State):
+	def __init__(self,FSM):
+		super(File, self).__init__(FSM)    
+		
+	def Enter(self):
+		self.FSM.stateLife = 1
+		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:
+			u.draw_header(o)
+			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):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			#self.draw_footer(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.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:
+			u.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:
+				m.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 
+		u.play_seq(o, message)
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)

lib/sLoadSound.py

@@ -0,0 +1,264 @@
+import FSM
+import utils as u
+import menus as m
+import os
+import pygame
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+#====================================     
+
+class LoadSound(State):
+	def __init__(self,FSM):
+		super(LoadSound, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner
+		o.header_text = "Load Sound"
+		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)
+
+
+		dirs = u.get_folders(o.load_sound_dir)
+		files = u.get_files(o.load_sound_dir, '.wav')
+
+		print('directory is ', o.load_sound_dir)
+		print('dirs are ', dirs)
+		print('files are ', files)
+
+
+		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:
+			pass
+		else:
+			u.draw_header(o)
+			self.draw_main(o)			
+			
+			o.update_display(0)
+		super(LoadSound, self).Enter()    
+
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.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:
+			u.draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)				
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+
+			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
+					self.draw_main(o)
+					o.update_display(0)	
+					self.press_ticks_up = pygame.time.get_ticks()
+			
+			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
+					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]:
+						pass
+					else:
+						snd = pygame.mixer.Sound(o.load_sound_dir + self.menu[self.cur_el])
+						pygame.mixer.Sound.play(snd) 
+
+			if o.keyState[3] == 1:
+				if self.menu[self.cur_el] == '..':
+					print('directory up')
+					o.last_load_sound_id = None
+					if o.load_sound_dir == '/home/pi/zpc_ct/user/sounds/':
+						print('root dir - cant go up')
+					else:
+						o.load_sound_dir = os.path.dirname(os.path.dirname(o.load_sound_dir))
+						o.load_sound_dir += '/'
+						print('new up dir is ', o.load_sound_dir)
+						self.menu = []
+						self.menu.append("..")
+						self.menu += self.get_file_list(o)
+						self.cur_el = 0
+
+				elif os.path.isdir(o.load_sound_dir + self.menu[self.cur_el]):
+					print('this is a directory ', o.load_sound_dir + self.menu[self.cur_el])
+					o.load_sound_dir = o.load_sound_dir + self.menu[self.cur_el] + '/'
+					self.menu = []
+					self.menu.append("..")
+					self.menu += self.get_file_list(o)
+					self.cur_el = 0
+
+				else:
+					print('this is not a directory ', o.load_sound_dir + self.menu[self.cur_el])
+					o.soundSlots[o.eSound].file = o.load_sound_dir + self.menu[self.cur_el]
+					o.soundSlots[o.eSound].volume = 16
+					o.soundSlots[o.eSound].pitch = 0
+					o.soundSlots[o.eSound].create_sound()
+					o.soundSlots[o.eSound].set_pitch()
+					o.last_load_sound_id = self.cur_el
+					self.FSM.ToTransition('toMain')
+
+	def get_file_list(self, o):
+		dirs = os.listdir(o.load_sound_dir)
+		dirs.sort()
+		for i in dirs:
+			if os.path.isdir(o.load_sound_dir + i):
+				i += "/asdfasdfasf"
+				print(i, ' is a directory')
+			else:
+				print(i, ' is not a directory')
+		print(dirs)
+		return dirs
+
+	def draw_main(self, o):
+		al = []
+		ypos = 30
+		if self.cur_el == 0:
+			_iter = 0
+			while len(al) < 4:
+				if _iter < len(self.menu):
+					al.append(self.menu[_iter])
+				else:
+					break
+				_iter += 1
+
+		elif self.cur_el == 1:
+			al.append(self.menu[self.cur_el - 1])
+			al.append(self.menu[self.cur_el])
+			if (self.cur_el + 1) < len(self.menu):
+				al.append(self.menu[self.cur_el + 1])
+			if (self.cur_el + 2) < len(self.menu):
+				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 os.path.isdir(o.load_sound_dir + i):
+					i += "/"
+				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:
+				if os.path.isdir(o.load_sound_dir + i):
+					i += "/"
+				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", "Play", "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:
+				if _iter == 2:
+					if self.is_wav():
+						o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.light_grey)
+					else:
+						o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.dark_grey)	
+
+				else:
+					o.center_block(opts[_iter], o.h2, [xpos,yposa,xpos + width,yposb], o.light_grey)	
+			
+			xpos += width
+			_iter += 1
+		
+	def is_wav(self):
+		if len(self.menu[self.cur_el]) > 3 and (self.menu[self.cur_el][-1] == 'V' or self.menu[self.cur_el][-1] == 'v') and (self.menu[self.cur_el][-2] == 'A' or self.menu[self.cur_el][-2] == 'a') and (self.menu[self.cur_el][-3] == 'W' or self.menu[self.cur_el][-3] == 'w'):
+			return True
+		else:
+			return False
+
+	def ReceiveMessage(self, message):
+		o = self.FSM.owner 
+		u.play_seq(o, message)
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)

lib/sMain.py

@@ -0,0 +1,202 @@
+import FSM
+import utils as u
+import menus as m
+import pygame
+
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+#====================================     
+			
+class Main(State):
+	def __init__(self,FSM):
+		super(Main, self).__init__(FSM)    
+		
+	def Enter(self):
+		print('hello main')
+		self.FSM.owner.pub.register("beat", self)
+		self.FSM.stateLife = 1
+		o = self.FSM.owner 
+		o.header_text = "Sound Select"
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			u.draw_header(o)
+			self.draw_square()
+
+			u.text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
+			u.text_box2(o, "BPM", str(o.bpm))
+			u.text_box4(o, "Bank", str(o.note_bank))
+			u.text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+			o.update_display(0)
+
+		self.recording = True
+		self.record_queue = []
+		self.undo_queue = []
+		o.erase = False
+		o.erase_queue = []
+		o.mute = False
+		o.mute_queue = []
+
+		super(Main, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+
+		m.menu1_actions(self, o)
+		m.menu2_actions_sample(self, o)
+		#self.FSM.ToTransition('toClock')
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.draw_header(o)
+			self.draw_square()
+			u.text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
+			u.text_box2(o, "BPM", str(o.bpm))
+			u.text_box4(o, "Bank", str(o.note_bank))
+			u.text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+			o.button_repeater(1, [])
+			o.update_display(0)
+
+		if o.keyState[17] == 1:
+			m.draw_menu2_sample(o)
+			o.update_display(0)
+		elif o.keyState[17] == 4:
+			u.draw_header(o)
+			self.draw_square()
+			u.text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
+			u.text_box2(o, "BPM", str(o.bpm))
+			u.text_box4(o, "Bank", str(o.note_bank))
+			u.text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+			o.update_display(0)
+
+		_id = 0
+		for k in o.keyState:
+			if _id > 15:
+				pass
+			else:
+				if o.keyState[16] > 0 or o.keyState[17] > 0:
+					pass
+				else:
+					note = _id + o.note_bank * 16
+					if k == 1:
+						
+						self.record_queue = pygame.time.get_ticks()
+						print('bpm is ', o.half_bpm, ' ', self.record_queue)
+						if not o.erase and not o.mute:
+							o.soundSlots[note].play(o.note_vol)
+						o.eSound = note
+						u.draw_header(o)
+						u.text_box1(o, "SVol", str(o.slots[o.eSound].volume))
+						u.text_box2(o, "BPM", str(o.bpm))
+						u.text_box4(o, "Bank", str(o.note_bank))
+						u.text_box3(o, "Pitch", str(o.soundSlots[o.eSound].pitch))
+						self.draw_square()
+						o.update_display(0)
+						
+						if o.erase:
+							o.erase_buf.append(note)
+							print('adding to erase buf ', k)
+						if o.mute:
+							o.mute_buf.append(note)
+							print('adding to mute buf ', k)
+					if k == 3:
+						if note in o.erase_buf:
+							o.erase_buf.remove(note)
+							print('removing from erase buf ', note)
+
+						if note in o.mute_buf:
+							o.mute_buf.remove(note)
+							print('removing from mute buf ', note)
+			_id += 1
+
+	def ReceiveMessage(self, message):
+		o = self.FSM.owner 
+		if o.erase == True:
+			#print('do something to erase')
+			u.play_seq(o, message)
+		else:
+			u.play_seq(o, message)
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			u.draw_header(o)            
+			self.draw_square()   
+			u.text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
+			u.text_box2(o, "BPM", str(o.bpm))
+			u.text_box4(o, "Bank", str(o.note_bank))
+			u.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 
+		size = 22
+		og_x = (o.width / 2) - (size * 2)
+		o_x = og_x
+		o_y = 127
+		_id = o.note_bank * 16 
+	
+		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 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_grey, 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
+			_id += 1
+			if _id % 4 == 0:
+				o_y -= size
+				o_x = og_x
+
+	def has_sample(self, o, slot):
+		if o.soundSlots[slot].file != None:
+			return True
+		else:
+			return False
+
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)
+

lib/sNewDir.py

@@ -0,0 +1,222 @@
+import FSM
+import utils as u
+import menus as m
+import pygame
+from itertools import cycle
+from datetime import datetime
+from datetime import date
+import os
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+class NewDir(State):
+	def __init__(self,FSM):
+		super(NewDir, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner 
+	
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			#u.draw_header(o)
+			#self.draw_footer(o)
+			self.draw(o)
+			o.update_display(0)
+		self.input_string = ""
+		if o.sconf['title'] == 'blank':
+
+			self.input_string += 'new_folder' + str(datetime.today().strftime('%Y%m%d'))
+		else:
+
+			self.input_string += o.sconf['title']
+		#if 
+		o.header_text = "EnterText"
+		o.pub.register("beat", self)
+		self.last_action = pygame.time.get_ticks()
+		self.caps = False
+		self.cur_but = 18
+		self.cur_letter = ""
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			pass
+
+		self.skips = [7, 3, 11, 12, 13, 14, 15]
+		
+		self.lc_labels = [["p", "q", "r", "s"], ["t", "u", "v"], ["w", "x", "y", "z"], ["C", "A", "P", "S"], 
+				["g", "h", "i"], ["j", "k", "l"], ["m", "n", "o"], ["D", "E", "L"],
+				["_", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-"], ["a", "b", "c"], ["d", "e", "f"], ["O", "K"],
+				[], [], [], []]
+
+		self.uc_labels = [["P", "Q", "R", "S"], ["T", "U", "V"], ["W", "X", "Y", "Z"], ["C", "A", "P", "S"], 
+				["G", "H", "I"], ["J", "K", "L"], ["M", "N", "O"], ["D", "E", "L"],
+				["_", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-"], ["A", "B", "C"], ["D", "E", "F"], ["O", "K"],
+				[], [], [], []]
+
+		self.labels = self.lc_labels
+
+		#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(NewDir, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+
+		y_size = o.height / 4
+		if o.keyState[11] == 1:
+			if self.input_string != 'blank':
+				#o.title = self.input_string
+				#o.bpm = o.sconf['bpm']
+				#o.sconf['title'] = self.input_string
+				np = o.song_dir + '/' + self.input_string
+				os.mkdir(np)
+				print('fsm new dir ', np)
+				#o.save_song()
+				self.FSM.ToTransition('toEnterText')	
+
+		m.menu1_actions(self, o)
+		m.menu2_actions_saveas(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.draw_header(o)
+			self.draw(o)
+			#self.draw_main(o)
+			o.update_display(0)
+
+		if o.keyState[17] == 1:
+			m.draw_menu_saveas(o)
+			o.update_display(0)
+		elif o.keyState[17] == 4:
+			u.draw_header(o)
+			self.draw(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:
+			u.draw_header(o)
+			self.draw(o)
+			#self.draw_main(o)
+			o.update_display(0)	
+			
+
+		if o.keyState[16] > 0 or 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
+						if _iter < len(self.cycles):
+							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)
+
+					elif _iter == 3:
+						print('caps')
+						if self.caps:
+							self.caps = False
+							self.labels = self.lc_labels
+
+						else:
+							self.caps = True
+							self.labels = self.uc_labels
+						self.draw(o)
+						o.center_block(self.input_string, o.h2, [0, 0, o.width, y_size], o.light_grey)
+						self.cycles = []
+						for l in self.labels:
+							self.cycles.append(cycle(l))
+
+					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 
+		u.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
+
+			if _id == 8:
+				lab = "_12"
+
+			o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.blue)
+			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):
+		self.FSM.owner.pub.unregister("beat", self)        
+

lib/sOpenSong.py

@@ -0,0 +1,260 @@
+import FSM
+import utils as u
+import menus as m
+import pygame
+from itertools import cycle
+import glob
+import os
+
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+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()
+		files = u.get_files(o.song_dir, '.sng')
+		print('---new')
+		print(files)
+		files_trimmed = [os.path.basename(x) for x in files]
+		files_trimmed = [os.path.splitext(x)[0] for x in files_trimmed]
+		print('files trimmed ', files_trimmed)
+		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)
+		
+		#go to last selected
+		# 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
+		files_trimmed.insert(0, '..')
+		self.menu = files_trimmed
+		if '_blank' in self.menu:
+			self.menu.remove('_blank')
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			u.draw_header(o)
+			self.draw_main(o)			
+			
+			o.update_display(0)
+		super(OpenSong, self).Enter()    
+
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.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:
+			u.draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)	
+			
+
+		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])
+				if self.menu[self.cur_el] == '..':
+					print('move up dir')
+					if o.song_dir == o.base_song_dir:
+						print('what the fuck')
+					else:
+						print('old song dir ', o.song_dir)
+						o.song_dir = os.path.dirname(os.path.dirname(o.song_dir))
+						o.song_dir += '/'
+						print('new song dir ', o.song_dir)
+						files = u.get_files(o.song_dir, '.sng')
+						print('---new')
+						print(files)
+						files_trimmed = [os.path.basename(x) for x in files]
+						files_trimmed = [os.path.splitext(x)[0] for x in files_trimmed]
+						print('files trimmed ', files_trimmed)
+
+						#self.names = [os.path.basename(x) for x in self.globbed]
+						#self.names = [os.path.splitext(x)[0] for x in self.names]
+
+						#self.menu = self.names
+						files_trimmed.insert(0, '..')
+						self.menu = files_trimmed		
+						if '_blank' in self.menu:
+							self.menu.remove('_blank')
+						u.draw_header(o)
+						
+						self.draw_footer(o)
+						self.draw_main(o)
+						o.update_display(0)			
+
+				elif os.path.isdir(o.song_dir + self.menu[self.cur_el]):
+					o.song_dir += self.menu[self.cur_el] + '/'
+					print('new song dir is ', o.song_dir)
+					
+					files = u.get_files(o.song_dir, '.sng')
+					print('---new')
+					print(files)
+					files_trimmed = [os.path.basename(x) for x in files]
+					files_trimmed = [os.path.splitext(x)[0] for x in files_trimmed]
+					print('files trimmed ', files_trimmed)
+
+					self.names = [os.path.basename(x) for x in self.globbed]
+					self.names = [os.path.splitext(x)[0] for x in self.names]
+
+					self.menu = self.names
+					files_trimmed.insert(0, '..')
+					self.menu = files_trimmed		
+					if '_blank' in self.menu:
+						self.menu.remove('_blank')
+					u.draw_header(o)
+					
+					self.draw_footer(o)
+					self.draw_main(o)
+					o.update_display(0)			
+
+				else:
+					o.mconf['default_song'] = self.menu[self.cur_el]
+					o.save_config()
+					o.load_song()
+
+	def draw_main(self, o):
+		al = []
+		ypos = 30
+
+
+		print('cur el ', self.cur_el)
+		if self.cur_el > (len(self.menu) - 1):
+			self.cur_el = 0
+		if self.cur_el == 0:
+			_iter = 0
+			while _iter < 4:
+				if _iter < (len(self.menu)):
+					al.append(self.menu[_iter])
+				
+				_iter += 1
+
+
+		
+		# print('cur el ', self.cur_el)
+		# 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:
+				if os.path.isdir(o.song_dir + i):
+					i += "/"
+				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:
+				if os.path.isdir(o.song_dir + i):
+					i += "/"
+				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 
+		u.play_seq(o, message)
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)
+

lib/sPing.py

@@ -0,0 +1,76 @@
+import FSM
+import utils as u
+import menus as m
+import os
+#import socket 
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+
+
+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)
+		self.pinging = self.check_ping()
+		self.draw_main(o)
+		u.draw_header(o)
+		o.update_display(0)
+		super(Ping, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.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:
+			u.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 
+		u.play_seq(o, message)
+
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)
+
+#==================================== 

lib/sReboot.py

@@ -0,0 +1,43 @@
+import FSM
+import utils as u
+import menus as m
+import os
+import pygame
+import sys
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+
+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

lib/sSelTheme.py

@@ -0,0 +1,167 @@
+import FSM
+import utils as u
+import menus as m
+import pygame
+#from itertools import cycle
+import glob
+import os
+
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	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/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]
+		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:
+			u.draw_header(o)
+			self.draw_main(o)			
+			
+			o.update_display(0)
+		super(SelTheme, self).Enter()    
+
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.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:
+			u.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:
+				m.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 
+		u.play_seq(o, message)
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)

lib/sSelectFolder.py

@@ -0,0 +1,224 @@
+import FSM
+import utils as u
+import menus as m
+import pygame
+from itertools import cycle
+import glob
+import os
+
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+class SelectFolder(State):
+	def __init__(self,FSM):
+		super(SelectFolder, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner
+		o.header_text = "Select Folder"
+		o.pub.register("beat", self)
+		self.cur_el = 0
+		
+		files = u.get_files(o.song_dir, '.zzz')
+		files_trimmed = [os.path.basename(x) for x in files]
+		files_trimmed = [os.path.splitext(x)[0] for x in files_trimmed]
+		print('files trimmed ', files_trimmed)
+		files_trimmed.insert(0, '..')
+		self.menu = files_trimmed
+		if '_blank' in self.menu:
+			self.menu.remove('_blank')
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			u.draw_header(o)
+			self.draw_main(o)			
+			
+			o.update_display(0)
+		super(SelectFolder, self).Enter()    
+
+	def Execute(self):
+
+		#print('doing select folder')
+		o = self.FSM.owner 
+		#u.draw_header(o)
+		#o.update_display(0)
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)
+
+		if o.keyState[17] == 4:
+			u.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:
+			u.draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)	
+			
+
+		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[2] == 1:
+				print('old song dir is ', o.song_dir)
+				print('new song dir is ', self.menu[self.cur_el])
+				self.FSM.ToTransition('toEnterText')
+
+			if o.keyState[3] == 1:
+				if self.menu[self.cur_el] == '..':
+					print('move up dir')
+					if o.song_dir == o.base_song_dir:
+						pass
+					else:
+						print('old song dir ', o.song_dir)
+						o.song_dir = os.path.dirname(os.path.dirname(o.song_dir))
+						o.song_dir += '/'
+						print('new song dir ', o.song_dir)
+						files = u.get_files(o.song_dir, '.zzz')
+						files_trimmed = [os.path.basename(x) for x in files]
+						files_trimmed = [os.path.splitext(x)[0] for x in files_trimmed]
+						print('files trimmed ', files_trimmed)
+						files_trimmed.insert(0, '..')
+						self.menu = files_trimmed
+						if '_blank' in self.menu:
+							self.menu.remove('_blank')
+						u.draw_header(o)
+						
+						self.draw_footer(o)
+						self.draw_main(o)
+						o.update_display(0)			
+
+				elif os.path.isdir(o.song_dir + self.menu[self.cur_el]):
+					o.song_dir += self.menu[self.cur_el] + '/'
+					print('new song dir is ', o.song_dir)
+					
+					files = u.get_files(o.song_dir, '.zzz')
+					files_trimmed = [os.path.basename(x) for x in files]
+					files_trimmed = [os.path.splitext(x)[0] for x in files_trimmed]
+					print('files trimmed ', files_trimmed)
+					files_trimmed.insert(0, '..')
+					self.menu = files_trimmed
+					if '_blank' in self.menu:
+						self.menu.remove('_blank')
+					u.draw_header(o)
+					
+					self.draw_footer(o)
+					self.draw_main(o)
+					o.update_display(0)			
+
+				else:
+					pass
+					#o.mconf['default_song'] = self.menu[self.cur_el]
+					#o.save_config()
+					#o.load_song()
+
+	def draw_main(self, o):
+		al = []
+		ypos = 30
+		print('cur el ', self.cur_el)
+		if self.cur_el > (len(self.menu) - 1):
+			self.cur_el = 0
+		if self.cur_el == 0:
+			_iter = 0
+			while _iter < 4:
+				if _iter < (len(self.menu)):
+					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:
+				if os.path.isdir(o.song_dir + i):
+					i += "/"
+				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:
+				if os.path.isdir(o.song_dir + i):
+					i += "/"
+				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", "Use", "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 
+		u.play_seq(o, message)
+		
+	def Exit(self):
+		print('why the fuck are we leaving')
+		self.FSM.owner.pub.unregister("beat", self)
+

lib/sSelectPattern.py

@@ -0,0 +1,158 @@
+import FSM
+import utils as u
+import menus as m
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+#==================================== 
+			
+class SelectPattern(State):
+	def __init__(self,FSM):
+		super(SelectPattern, self).__init__(FSM)    
+		
+	def Enter(self):
+		self.FSM.stateLife = 1
+		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:
+			u.draw_header(o)
+			self.draw_square()
+			u.text_box1(o, "Pat", str(o.ePattern))
+			u.text_box4(o, "Bank", str(o.pat_bank))
+			o.update_display(0)
+		
+		super(SelectPattern, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		m.menu2_actions_pattern(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.draw_header(o)
+			self.draw_square()
+			u.text_box1(o, "Pat", str(o.ePattern))
+			u.text_box4(o, "Bank", str(o.pat_bank))
+			o.update_display(0)
+
+		if o.keyState[17] == 1:
+			m.draw_menu2_pattern(o)
+			o.update_display(0)
+		elif o.keyState[17] == 4:
+			u.draw_header(o)
+			self.get_active_patterns(o)
+			self.draw_square()
+			u.text_box1(o, "Pat", str(o.ePattern))
+			u.text_box4(o, "Bank", str(o.pat_bank))
+			
+			o.update_display(0)
+
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			_id = 0
+			for k in o.keyState:
+				if _id > 15:
+					pass
+				else:
+					if k == 1:
+						o.ePattern = (o.pat_bank * 16) +_id 
+
+						u.draw_header(o)
+						self.draw_square()
+						
+						u.text_box1(o, "Pat", str(o.ePattern))
+						u.text_box4(o, "Bank", str(o.pat_bank))
+						o.update_display(0)
+						
+
+				_id += 1        
+
+	def ReceiveMessage(self, message):
+		o = self.FSM.owner
+		u.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:
+				u.draw_header(o)
+				self.draw_square()
+				u.text_box1(o, "Pat", str(o.ePattern))
+				u.text_box4(o, "Bank", str(o.pat_bank))
+				o.update_display(0)
+
+	def draw_square(self):
+		o = self.FSM.owner 
+		size = 22
+		og_x = (o.width / 2) - (size * 2)
+		o_x = og_x
+		o_y = 127
+		_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.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.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_grey, 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)

lib/sSelectSound.py

@@ -0,0 +1,92 @@
+import FSM
+import utils as u
+import menus as m
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+#====================================     
+class SelectSound(State):
+	def __init__(self,FSM):
+		super(SelectSound, self).__init__(FSM)    
+		
+	def Enter(self):
+		self.FSM.stateLife = 1
+		o = self.FSM.owner 
+		o.header_text = "SelSou"
+		o.pub.register("beat", self)
+		u.draw_header(o)
+		self.draw_square()
+		o.update_display(0)
+		super(SelectSound, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.draw_header(o)
+			self.draw_square()
+			o.update_display(0)
+
+		if o.keyState[16] == 2:
+			if o.keyState[0] == 1:
+				self.FSM.ToTransition('toMain')
+		else:
+			_id = 0
+			for k in o.keyState:
+				if _id > 15:
+					pass
+				else:
+					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.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()
+						#print('now editing sound ', _id)    
+				_id += 1        
+
+	def ReceiveMessage(self, message):
+		_id = 0
+		o = self.FSM.owner 
+		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.update_display(0)
+		u.play_seq(o, message)
+
+	def draw_square(self):
+		o = self.FSM.owner 
+		size = 32
+		og_x = 110
+		o_x = og_x
+		o_y = 0
+		_id = 0
+	
+		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.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
+			_id += 1
+			if _id % 4 == 0:
+				o_y += size
+				o_x = og_x
+
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)

lib/sShutdown.py

@@ -0,0 +1,46 @@
+import FSM
+import utils as u
+import menus as m
+import os
+import pygame
+import sys
+
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	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
+

lib/sUtil.py

@@ -0,0 +1,146 @@
+import FSM
+import utils as u
+import menus as m
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+class Util(State):
+	def __init__(self,FSM):
+		super(Util, self).__init__(FSM)    
+		
+	def Enter(self):
+		o = self.FSM.owner 
+		o.header_text = "Utilities"
+		o.pub.register("beat", self)
+		self.menu = ["Clock", "Balls", "Defender", "Calculator", "Exit", "Shutdown", "Reboot", "Theme", "Ping", "Wifi", "Update", "About"]
+		self.cur_el = 0
+
+		if o.keyState[16] > 0 or o.keyState[17] > 0:
+			pass
+		else:
+			u.draw_header(o)
+			self.draw_footer(o)
+			self.draw_main(o)
+			o.update_display(0)
+
+		
+		super(Util, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.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:
+			u.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:
+				m.util_command(self, o, self.menu[self.cur_el])
+		
+	def ReceiveMessage(self, message):
+		_id = 0
+		o = self.FSM.owner 
+		u.play_seq(o, message)
+		# if o.keyState[16] > 0 or o.keyState[17] > 0:
+		# 	pass
+		# else:
+		# 	u.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:
+			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", "", "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):
+		self.FSM.owner.pub.unregister("beat", self)        
+
+

lib/sWifi.py

@@ -0,0 +1,85 @@
+import FSM
+import utils as u
+import menus as m
+import os
+import socket 
+#====================================     
+
+State = type("State", (object,), {})
+#====================================     
+class State(object):
+	def __init__(self, FSM):
+		self.FSM = FSM
+	def Enter(self):
+		pass
+	def Execute(self):
+		pass
+	def Exit(self):
+		pass
+
+
+
+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)
+
+		u.draw_header(o)
+		self.draw_main(o)
+		o.update_display(0)
+		super(Wifi, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		m.menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			m.draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			u.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:
+			u.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 
+		u.play_seq(o, message)
+
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)
+
+#==================================== 

lib/utils.py

@@ -1,3 +1,6 @@
+import glob
+import os
+
 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)
@@ -6,6 +9,36 @@ def draw_header(o):
 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:
+			if o.erase:
+				if _id in o.erase_buf:
+					#pass
+					s.notes[message[0]][message[1]][0] = 0
+					print('erasing')
+					#o.undo_buf.append(s.notes[message[0]][message[1]][0])
+				else:
+					o.notes_on[_id] = 1
+					o.soundSlots[_id].play(s.notes[message[0]][message[1]][1])
+			elif o.mute:
+				if _id in o.mute_buf:
+					#pass
+					#s.notes[message[0]][message[1]][0] = 0
+					print('muting')
+					#o.undo_buf.append(s.notes[message[0]][message[1]][0])
+				else:
+					o.notes_on[_id] = 1
+					o.soundSlots[_id].play(s.notes[message[0]][message[1]][1])
+			else:
+
+				o.notes_on[_id] = 1
+				o.soundSlots[_id].play(s.notes[message[0]][message[1]][1])
+		_id += 1
+
+def erase_note(o, message, pressed):
+	_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
@@ -113,3 +146,50 @@ def breakup_song_text(song):
 			_iter += 1
 		line1 = ".." + line1
 	return [line1, line2, line3, line4]
+
+def get_folders(path):
+	globbed = glob.glob(path + "/*/")
+	globbed.sort()
+
+
+		# dirs = os.listdir(o.load_sound_dir)
+		# dirs.sort()
+		# for i in dirs:
+		# 	if os.path.isdir(o.load_sound_dir + i):
+		# 		i += "/asdfasdfasf"
+		# 		print(i, ' is a directory')
+		# 	else:
+		# 		print(i, ' is not a directory')
+		# print(dirs)
+		# return dirs
+
+
+
+	return globbed
+
+def get_files(path, ext):
+	path += '/'
+	out = []
+	files = os.listdir(path)
+	files.sort()
+	print('from utils ', files)
+	for file in files:
+	    if os.path.isdir(path + file):
+	        out.append(file)
+	    else:
+	    	pass
+
+	for file in files:
+	    if file.lower().endswith(ext):
+	    	print(file, ' does end with ext')
+	    	if os.path.isdir(path + file):
+	        	#out.append(file)
+	        	pass
+	    	else:
+	    		#pass
+	        	out.append(file)
+	    else:
+	    	print(file, ' does not end with ext')
+	    	#pass
+
+	return out

main.py

@@ -162,6 +162,10 @@ class Prog:
 		self.last_load_sound_id = None
 		self.odub = False
 		self.undo_buf = []
+		self.erase_buf = []
+		self.erase = False
+		self.mute_buf = []
+		self.mute = False
 		self.black = "#000000"
 		self.bg_color = "#336699"
 		#self.color_a = "#FFFFFF"
@@ -193,7 +197,9 @@ class Prog:
 		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/user/themes/" + self.mconf['theme'] + ".thm")
-		self.load_song_dir = '/home/pi/zpc_ct/user/sounds/'
+		self.load_sound_dir = '/home/pi/zpc_ct/user/sounds/'
+		self.song_dir = self.mconf['song_dir']
+		self.base_song_dir = '/home/pi/zpc_ct/user/songs/'
 
 		self.light_grey = self.theme['light_grey']
 		self.apply_theme()
@@ -342,22 +348,7 @@ class Prog:
 	def button_repeater(self, state, enables):
 		if state == 0:
 			pass
-			# _iter = 0
-			# for b in self.keyState:
-			# 	if _iter in enables:
-			# 		if b == 2:
-			# 			if self.repeater_states[_iter] == None:
-			# 				#self.repeater_states[_iter] = pygame.time.get_ticks()
-			# 				pass
-			# 			else:
-			# 				t = pygame.time.get_ticks() - self.repeater_states[_iter]
-			# 				if t > 250:
-			# 					#self.repeater_states[_iter] = pygame.time.get_ticks()	
-			# 					#b = 0
-			# 					print('new tick ', _iter, ' ', b)
-
-			# 	_iter += 1
-			#self.repeater_states
+			
 		elif state == 1:
 			for i in self.repeater_states:
 				i = None
@@ -378,6 +369,8 @@ class Prog:
 		self.songStart = self.curPattern
 		bpm = (60000 / self.bpm) / 4
 		pygame.time.set_timer(TIMER, int(bpm))
+		GPIO.setup(29, GPIO.OUT)
+		GPIO.output(29, GPIO.LOW)
 		
 
 	def stop_playback(self):		
@@ -386,6 +379,8 @@ class Prog:
 		self.playhead = 0
 		self.curPattern = self.song[0]
 		pygame.time.set_timer(TIMER, 0)
+		GPIO.setup(29, GPIO.OUT)
+		GPIO.output(29, GPIO.HIGH)
 
 	def center_text(self, text, font, width, y, color):
 		w,h = font.getsize(text)
@@ -411,7 +406,8 @@ class Prog:
 		#self.red = self.theme["red"]
 
 	def save_song(self):
-		base_dir = "/home/pi/zpc_ct/user/songs/"
+		#base_dir = "/home/pi/zpc_ct/user/songs/"
+		base_dir = self.song_dir
 		title = self.sconf['title']
 		fname = base_dir + self.sconf['title'] + '.sng'
 		if os.path.exists(fname):
@@ -436,18 +432,21 @@ class Prog:
 		base_dir = "/home/pi/zpc_ct/"
 		print('before writing')
 		print(self.mconf['theme'])
+		self.mconf['song_dir'] = self.song_dir
 		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/user/themes/" + self.mconf['theme'] + ".thm")
+		self.song_dir = self.mconf['song_dir']
 
 	def load_song(self):
 		#self.stop_playback()
 		self.quit_mixer()
 		self.start_mixer()
-		base_dir = "/home/pi/zpc_ct/user/songs/"
+		#base_dir = "/home/pi/zpc_ct/user/songs/"
+		base_dir = self.song_dir
 		self.sconf = ConfigObj(base_dir + self.mconf['default_song'] + '.sng')
 		print(base_dir + self.mconf['default_song'] + '.sng')
 		self.last_load_sound_id = None