aa

config.txt

@@ -1,4 +1,4 @@
-default_song = 909
+default_song = Casio_SK-1
 theme = default
 title = default
 bpm = 90

lib/StatesProg.py

@@ -113,10 +113,12 @@ class Intro(State):
 		self.FSM.stateLife = 1
 		o = self.FSM.owner
 		o.header_text = "Starting up..."
+
 		o.draw.rectangle((0, 0, self.FSM.owner.width, self.FSM.owner.height), outline=0, fill=o.blue)
 		#u.draw_header(o)
 		#o.draw.rectangle((0, 0, o.width, o.height), outline=0, fill=o.blue)			
-		o.center_block("Starting up...", o.h2, [0, 0, o.width, o.height], o.light_grey)
+		o.center_block("zpc_ct", o.h4, [0, 0, o.width, o.height-40], o.light_grey)
+		o.center_block("Starting up...", o.h2, [0, 0, o.width, o.height+60], o.light_grey)
 		#o.display_thread.start()
 		o.update_display(0)
 		#o.update_display(0)

lib/menus.py

@@ -1,5 +1,6 @@
 import utils as u
 import pygame
+from itertools import cycle
 
 def draw_menu1(o):
 	bpm_inc = 4
@@ -63,9 +64,7 @@ def draw_menu2_sample(o):
 	text_padding = 6
 	_id = 0
 	while _id < 16:
-	   
 		o.draw.rectangle((o_x, o_y, o_x + x_size, o_y - y_size), outline=0, fill=o.dark_grey)
-
 		
 		if _id == 0:
 			o.center_block("Copy", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
@@ -75,6 +74,12 @@ def draw_menu2_sample(o):
 			o.center_block("Del", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 		if _id == 3:
 			o.center_block("Load", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		
+		if _id == 4:
+			if o.prev == True:
+				o.center_block("Prev", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.pink)
+			else:
+				o.center_block("Prev", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 
 		if _id == 8:
 			o.center_block("Vol-", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
@@ -141,6 +146,17 @@ def draw_menu2_pattern(o):
 		if _id == 7:
 			o.center_block("Bank +", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
 
+		if _id == 12:
+			if o.pat_odub:
+				o.center_block("Odub", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.pink)
+			else:
+				o.center_block("Odub", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.light_grey)
+		if _id == 13:
+			if o.pat_perf:
+				o.center_block("Perf", o.h2, [o_x, o_y, o_x + x_size, o_y - y_size], o.pink)
+			else:
+				o.center_block("Perf", 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:
@@ -229,11 +245,11 @@ def draw_menu_saveas(o):
 
 def menu1_actions(self, o):
 	if o.keyState[8] == 4 or o.keyState[8] == 3:
-		print('reset repeat from menu')
+		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[9] == 4 or o.keyState[9] == 3:
-		print('reset repeat from menu')
+		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[16] == 2:
@@ -329,39 +345,39 @@ def menu1_actions(self, o):
 
 def menu2_actions_sample(self, o):
 	if o.keyState[6] == 4 or o.keyState[6] == 3:
-		print('reset repeat from menu')
+		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[7] == 4 or o.keyState[7] == 3:
-		print('reset repeat from menu')
+		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[8] == 4 or o.keyState[8] == 3:
-		print('reset repeat from menu')
+		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[9] == 4 or o.keyState[9] == 3:
-		print('reset repeat from menu')
+		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[10] == 4 or o.keyState[10] == 3:
-		print('reset repeat from menu')
+		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[11] == 4 or o.keyState[11] == 3:
-		print('reset repeat from menu')
+		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[17] == 2:
 		if o.keyState[0] == 1:
 			if o.soundSlots[o.eSound].volume > 0:
-				print('copy')
+				#print('copy')
 				o.soundClipboard = [o.soundSlots[o.eSound].file, o.soundSlots[o.eSound].volume, o.soundSlots[o.eSound].pitch]
-				print(o.soundClipboard)
+				#print(o.soundClipboard)
 
 		if o.keyState[1] == 1:
 			if o.soundClipboard != []:
-				print('pasting ', o.soundClipboard)				
+				#print('pasting ', o.soundClipboard)				
 				o.soundSlots[o.eSound].file = o.soundClipboard[0]
 				o.soundSlots[o.eSound].volume = o.soundClipboard[1]
 				o.soundSlots[o.eSound].pitch = o.soundClipboard[2]
@@ -369,14 +385,20 @@ def menu2_actions_sample(self, o):
 				o.soundSlots[o.eSound].set_pitch()
 			
 		if o.keyState[2] == 1:
-			print('delete sound ', o.eSound)
+			#print('delete sound ', o.eSound)
 			o.soundSlots[o.eSound].file = None
 			o.soundSlots[o.eSound].volume = 16
 			o.soundSlots[o.eSound].pitch = 0
 		if o.keyState[3] == 1:
-			print('load')
+			#print('load')
 			o.FSM.FSM.ToTransition("toLoadSound")
 
+
+		if o.keyState[4] == 1:
+			o.prev = not o.prev
+			draw_menu2_sample(o)
+			o.update_display(0)
+
 		if o.keyState[8] == 2:
 			if (o.repeater_states[8] != None and ((pygame.time.get_ticks() - o.repeater_states[8]) > 500)):
 				if o.soundSlots[o.eSound].volume > 0:
@@ -476,12 +498,12 @@ def menu2_actions_sample(self, o):
 		if o.keyState[12] == 1:
 			o.odub = not o.odub
 			o.undo_buf = []
-			print('odub now is ', o.odub)
+			#print('odub now is ', o.odub)
 			draw_menu2_sample(o)
 			o.update_display(0)
 
 		if o.keyState[13] == 1:
-			print('undo something')
+			#print('undo something')
 			for i in o.undo_buf:
 				o.soundSlots[i[0]].notes[i[1]][i[2]][0] = 0
 				o.soundSlots[i[0]].notes[i[1]][i[2]][1] = 0
@@ -490,7 +512,7 @@ def menu2_actions_sample(self, o):
 		if o.keyState[14] == 1:
 			o.erase = not o.erase
 			o.erase_buf = []
-			print('erase now is ', o.erase)
+			#print('erase now is ', o.erase)
 			if o.erase:
 				o.mute = False
 				o.mute_buf = []
@@ -500,7 +522,7 @@ def menu2_actions_sample(self, o):
 		if o.keyState[15] == 1:
 			o.mute = not o.mute
 			o.mute_buf = []
-			print('mute now is ', o.mute)
+			#print('mute now is ', o.mute)
 			if o.mute:
 				o.erase = False
 				o.erase_buf = []
@@ -554,6 +576,42 @@ def menu2_actions_pattern(self, o):
 				u.text_center(o, "Pattern Bank", str(o.pat_bank))
 				o.update_display(0)		
 				
+#--------------------------------------------
+		elif o.keyState[12] == 1:
+			o.pat_odub = not o.pat_odub
+			if o.pat_odub:
+				if o.playing:
+					o.stop_playback()
+				o.song_in = [o.curPattern]
+				if o.pat_perf:
+					pass
+				else:
+					o.pat_perf = True
+			else:
+				o.pat_perf = False
+				o.song = o.song_in
+				o.pat_buf = o.song_in
+				o.song_in = []
+				o.songCycle = cycle(o.song)
+				o.songStart = o.song[0]
+
+			draw_menu2_pattern(o)
+			o.update_display(0)		
+				
+
+		elif o.keyState[13] == 1:
+			o.pat_perf = not o.pat_perf
+			if o.pat_perf:
+				o.pat_buf = o.song
+				o.song = []
+				print('song is now ', o.song)
+			else:
+				o.song = o.pat_buf
+				print('song is now ', o.song)
+
+			draw_menu2_pattern(o)
+			o.update_display(0)		
+
 def menu2_actions_song(self, o):
 	if o.keyState[17] == 2:
 		
@@ -573,11 +631,11 @@ def menu2_actions_song(self, o):
 
 def menu2_actions_note(self, o):
 	if o.keyState[8] == 4 or o.keyState[8] == 3:
-		print('reset repeat from menu')
+		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[9] == 4 or o.keyState[9] == 3:
-		print('reset repeat from menu')
+		#print('reset repeat from menu')
 		o.button_repeater(1,[])
 
 	if o.keyState[17] == 2:
@@ -619,7 +677,7 @@ def menu2_actions_note(self, o):
 			else:
 				o.patternFollow = True
 
-			print('pattern follow is ', o.patternFollow)
+			#print('pattern follow is ', o.patternFollow)
 			draw_menu2_note(o)
 			o.update_display(0)			
 					
@@ -627,12 +685,10 @@ def menu2_actions_note(self, o):
 def menu2_actions_saveas(self, o):
 	if o.keyState[17] == 2:
 		if o.keyState[12] == 1:
-			print('select folder')
+			#print('select folder')
 			self.FSM.ToTransition('toSelectFolder')	
 		elif o.keyState[14] == 1:
-			print('new folder')
-			#o.song_dir
-			#os.mkdir(path)
+			#print('new folder')
 			self.FSM.ToTransition('toNewDir')	
 
 
@@ -645,7 +701,6 @@ def util_command(self, o, command):
 		self.FSM.ToTransition('toDefender')	
 	elif command == "Calculator":
 		self.FSM.ToTransition('toCalculator')	
-
 	elif command == "Exit":
 		self.FSM.ToTransition('toExit')		
 	elif command == "Theme":
@@ -654,7 +709,6 @@ def util_command(self, o, command):
 		self.FSM.ToTransition('toReboot')		
 	elif command == "Update":
 		self.FSM.ToTransition('toUpdate')	
-		#os.system("sudo reboot")
 	elif command == "Shutdown":
 		self.FSM.ToTransition('toShutdown')		
 	elif command == "Ping":
@@ -669,14 +723,15 @@ def file_command(self, o, command):
 		if o.sconf['title'] != "blank":
 			o.save_song()
 		else:
-			print('cant save over blank')
+			pass
+			#print('cant save over blank')
 	
 	elif command == "Open":
 		self.FSM.ToTransition('toOpenSong')	
 	elif command == "Save As":
 		self.FSM.ToTransition('toEnterText')	
 	elif command == "New":
-		#self.FSM.ToTransition('toEnterText')
-		#o.title = '_blank'
+		o.song_dir = o.base_song_dir
 		o.mconf['default_song'] = '_blank'
-		o.load_song()
+		o.load_song()
+		self.FSM.ToTransition('toMain')	

lib/sEditSoundSequence.py

@@ -31,8 +31,8 @@ class EditSoundSequence(State):
 		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))
+			u.text_box3(o, "Vol", str(o.note_vol))
+			u.text_box1(o, "Pat", str(self.curPattern))
 			o.update_display(0)
 		super(EditSoundSequence, self).Enter()        
 		
@@ -46,8 +46,8 @@ class EditSoundSequence(State):
 		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))
+			u.text_box3(o, "Vol", str(o.note_vol))
+			u.text_box1(o, "Pat", str(self.curPattern))
 			o.update_display(0)
 
 		if o.keyState[17] == 1:
@@ -56,8 +56,8 @@ class EditSoundSequence(State):
 		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))
+			u.text_box3(o, "Vol", str(o.note_vol))
+			u.text_box1(o, "Pat", str(self.curPattern))
 			o.update_display(0)
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
@@ -75,8 +75,8 @@ class EditSoundSequence(State):
 						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))
+					u.text_box3(o, "Vol", str(o.note_vol))			
+					u.text_box1(o, "Pat", str(self.curPattern))
 					o.update_display(0)
 				_id += 1
 		
@@ -112,8 +112,8 @@ class EditSoundSequence(State):
 		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))
+			u.text_box3(o, "Vol", str(o.note_vol))
+			u.text_box1(o, "Pat", str(self.curPattern))
 		if o.patternFollow:
 			self.curPattern = message[0]
 		else:

lib/sMain.py

@@ -32,8 +32,8 @@ class Main(State):
 		else:
 			u.draw_header(o)
 			self.draw_square()
-
-			u.text_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
+			u.text_box1(o, "Pat", str(o.curPattern))
+			#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))
@@ -60,7 +60,8 @@ class Main(State):
 		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_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
+			u.text_box1(o, "Pat", str(o.curPattern))
 			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))
@@ -73,7 +74,8 @@ class Main(State):
 		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_box1(o, "Vol", str(o.soundSlots[o.eSound].volume))
+			u.text_box1(o, "Pat", str(o.curPattern))
 			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))
@@ -90,11 +92,12 @@ class Main(State):
 					note = _id + o.note_bank * 16
 					if k == 1:						
 						self.record_queue = pygame.time.get_ticks()
-						if not o.erase and not o.mute:
+						if not o.erase and not o.mute and o.prev:
 							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_box1(o, "SVol", str(o.slots[o.eSound].volume))
+						u.text_box1(o, "Pat", str(o.curPattern))
 						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))
@@ -123,7 +126,8 @@ class Main(State):
 		else:
 			u.draw_header(o)            
 			self.draw_square()   
-			u.text_box1(o, "SVol", str(o.soundSlots[o.eSound].volume))
+			u.text_box1(o, "Pat", str(o.curPattern))
+			#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))			         

lib/sSelectPattern.py

@@ -1,6 +1,7 @@
 import FSM
 import utils as u
 import menus as m
+from itertools import cycle
 #====================================     
 
 State = type("State", (object,), {})
@@ -29,6 +30,8 @@ class SelectPattern(State):
 		self.cur_playing = 0
 		self.active_patterns = []
 		self.get_active_patterns(o)
+		o.pat_buf = o.song
+		self.new_song = []
 
 		if o.keyState[16] > 0 or o.keyState[17] > 0:
 			pass
@@ -75,6 +78,17 @@ class SelectPattern(State):
 					pass
 				else:
 					if k == 1:
+						if o.pat_perf:
+							this = o.ePattern = (o.pat_bank * 16) +_id 
+							#print('we should play ', this)	
+							o.song = [this]
+							o.songCycle = cycle(o.song)
+							o.songStart = this
+							if not o.playing:
+								
+								
+								o.start_playback()
+								u.play_seq(o, [o.curPattern, 0])
 						o.ePattern = (o.pat_bank * 16) +_id 
 
 						u.draw_header(o)
@@ -99,6 +113,17 @@ class SelectPattern(State):
 				u.text_box1(o, "Pat", str(o.ePattern))
 				u.text_box4(o, "Bank", str(o.pat_bank))
 				o.update_display(0)
+			# if o.pat_odub:
+			# 	print('add to record queue ', o.song[0])
+			# else:
+			# 	print('not recording')
+		#print(message)
+		if o.pat_odub:
+			if message[1] == 0:
+				if len(o.song) > 0:
+					#print('adding to rec', o.song[0])
+					o.song_in.append(o.song[0])
+					#print('adding to song_in ', o.song_in)
 
 	def draw_square(self):
 		o = self.FSM.owner 
@@ -139,4 +164,15 @@ class SelectPattern(State):
 			_iter += 1
 	
 	def Exit(self):
-		self.FSM.owner.pub.unregister("beat", self)
+		o = self.FSM.owner 
+		o.pub.unregister("beat", self)
+		# if len(o.song) < 1 and len(o.pat_buf) > 0:
+		# 	o.song = o.pat_buf
+		# 	o.pat_buf = []
+		o.pat_perf = False
+		
+		o.song = o.pat_buf
+		o.pat_buf = []
+		o.songCycle = cycle(o.song)
+		o.songStart = o.song[0]
+		#print('song is ', o.song)

main.py

@@ -76,6 +76,7 @@ class Prog:
 		self.h1 = ImageFont.truetype("/home/pi/zpc_ct/fonts/Pixellari.ttf", 30)
 		self.h2 = ImageFont.truetype("/home/pi/zpc_ct/fonts/Pixellari.ttf", 20)
 		self.h3 = ImageFont.truetype("/home/pi/zpc_ct/fonts/Pixellari.ttf", 54)
+		self.h4 = ImageFont.truetype("/home/pi/zpc_ct/fonts/Pixellari.ttf", 72)
 		
 		self.disp = st7789.ST7789(
 			spi,
@@ -139,6 +140,11 @@ class Prog:
 		self.olive = "#80D52A"
 		self.notes_on = []
 		self.clear_notes_on()
+		self.prev = True
+		self.pat_odub = False
+		self.pat_perf = False
+		self.pat_buf = None
+		self.song_in = []
 
 		self.press_ticks_up = None
 		self.press_ticks_down = None
@@ -289,26 +295,39 @@ class Prog:
 			pygame.time.set_timer(TIMER, int(bpm))
 
 	def start_playback(self):
-		self.playing = True
-		self.playhead = -1
-		self.playhead = 0
-		self.songCycle = cycle(self.song)
-		self.curPattern = next(self.songCycle)
-		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)
+		if len(self.song) > 0:
+			self.playing = True
+			self.playhead = -1
+			self.playhead = 0
+			self.songCycle = cycle(self.song)
+			self.curPattern = next(self.songCycle)
+			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):
 		self.playing = False
 		self.playhead = -1
 		self.playhead = 0
-		self.curPattern = self.song[0]
+		if len(self.song) > 0:
+			self.curPattern = self.song[0]
+		else:
+			self.curPattern = 0
 		pygame.time.set_timer(TIMER, 0)
 		GPIO.setup(29, GPIO.OUT)
 		GPIO.output(29, GPIO.HIGH)
+		if self.pat_odub:
+			print('stopping with odub')
+			self.pat_perf = False
+			self.pat_odub = False
+			self.song = self.song_in
+			self.pat_buf = self.song_in
+			self.song_in = []
+			self.songCycle = cycle(self.song)
+			self.songStart = self.song[0]
 
 	def center_text(self, text, font, width, y, color):
 		w,h = font.getsize(text)

runner.sh

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