about

config.txt

@@ -1,4 +1,4 @@
-default_song = snaps
+default_song = fire_eat
 theme = default
 title = default
 bpm = 90

lib/FSM.py

@@ -90,7 +90,8 @@ class ProgFSM(Char):
         'Wifi',
         'Defender',
         'Update',
-        'Calculator'
+        'Calculator',
+        'About'
         ]
         
         for s in state_list:

lib/StatesProg.py

@@ -742,6 +742,8 @@ def util_command(self, o, command):
 		self.FSM.ToTransition('toPing')	
 	elif command == "Wifi":
 		self.FSM.ToTransition('toWifi')	
+	elif command == "About":
+		self.FSM.ToTransition('toAbout')	
 
 def file_command(self, o, command):
 	if command == "Save":
@@ -964,7 +966,7 @@ class Main(State):
 
 						o.soundSlots[note].play(o.note_vol)
 						o.eSound = note
-						print('now editing sound ', o.eSound) 
+						#print('now editing sound ', o.eSound) 
 						draw_header(o)
 						#text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
 						text_box1(o, "SVol", str(o.slots[o.eSound].volume))
@@ -992,7 +994,7 @@ class Main(State):
 		if self.record_queue != []:
 			cur_time = pygame.time.get_ticks()
 			note_pos = (cur_time - self.record_queue) - (o.half_bpm / 2)
-			print(note_pos)
+			#print(note_pos)
 			if o.odub == True:
 				if note_pos > (o.half_bpm):
 					_note = 0
@@ -1322,13 +1324,13 @@ class SelectPattern(State):
 		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])
+		#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)
+				#print('checking soundSlot ', s.id)
 				pat_used = 0
 				for p in s.notes[pat_iter]:
 					if self.active_patterns[_iter] == 1:
@@ -1336,13 +1338,13 @@ class SelectPattern(State):
 					if p[0] == 1:
 						#pat_used = 1
 						self.active_patterns[_iter] = 1
-						print('found ', pat_iter, ' -- ', p[0])
+						#print('found ', pat_iter, ' -- ', p[0])
 						break
 				#self.active_patterns.append(pat_used)
 			pat_iter += 1
 			_iter += 1
 	
-		print('active patterns ', self.active_patterns)
+		#print('active patterns ', self.active_patterns)
 
 	def Exit(self):
 		self.FSM.owner.pub.unregister("beat", self)
@@ -1401,11 +1403,11 @@ class EditSoundSequence(State):
 			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')
+						#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')
+						#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
 					draw_header(o)
@@ -1455,7 +1457,7 @@ class EditSoundSequence(State):
 			self.curPattern = message[0]
 		else:
 			self.curPattern = o.ePattern
-		print('message ', message)
+		#print('message ', message)
 		o.update_display(0)
 		
 	def Exit(self):
@@ -1697,7 +1699,7 @@ class Util(State):
 		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"]
+		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:
@@ -3182,4 +3184,49 @@ class Calculator(State):
 	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:
+			draw_header(o)
+			o.update_display(0)
+			self.draw_main(o)
+		super(About, self).Enter()        
+		
+	def Execute(self):
+		o = self.FSM.owner 
+		menu1_actions(self, o)
+		if o.keyState[16] == 1:
+			draw_menu1(o)
+			o.update_display(0)
+		elif o.keyState[16] == 4:
+			draw_header(o)
+			self.draw_main(o)
+			o.update_display(0)
+
+		if o.keyState[0] == 1 or o.keyState[0] == 3 or o.keyState[1] == 1 or o.keyState[1] == 3 or o.keyState[2] == 1 or o.keyState[2] == 3 or o.keyState[3] == 1 or o.keyState[3] == 3:
+			draw_header(o)
+			self.draw_main(o)
+			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("rob@robzilla-beats.com", o.h2, [0, 0, o.width, o.height], o.light_grey)
+
+	def ReceiveMessage(self, message):
+		o = self.FSM.owner 
+		play_seq(o, message)
+		
+	def Exit(self):
+		self.FSM.owner.pub.unregister("beat", self)        

main.py

@@ -285,6 +285,7 @@ class Prog:
 
 	def update_keys(self):
 		_id = 0 
+		#print('key 1 ', self.keyState[1])
 		for k in self.keyState:
 			if k == 0:
 				if _id in self.keys:
@@ -543,7 +544,7 @@ while not done:
 			p.curPattern = next(p.songCycle)
 
 		#blink internal led
-		if p.playhead  % 8 == 0:
+		if p.playhead  % 4 == 0:
 			GPIO.setup(29, GPIO.OUT)
 			GPIO.output(29, GPIO.LOW)
 		else:

new_wifi.txt

@@ -1,17 +0,0 @@
-this
-that
-the other
-
-network={
-    psk="this_ssid"
-    psk="this_pass"
-
-network={
-    psk="this_ssid"
-    psk="this_pass"
-}
-
-    psk="this_ssid"
-    psk="this_pass"
-}
-