Updated code and readme.

Author: mlurbe97

README.md

@@ -10,21 +10,24 @@
 This project is based on my interest in learning to play the piano in my spare time. As everyone knows, learning to play an instrument is difficult and requires a lot of time and dedication. In my case, I am a computer engineer and for lack of time I decided to start a project to start playing the piano using a software teacher implemented with LED lights on each piano key. My interest in this software has increased throughout the development and has ended up becoming a bot that plays the piano.
 </p>
 
-## **PROGRAMS OF THIS PROJECT**
+## **PROGRAMS AVAILABLE ON THIS PROJECT**
 
 ### PIANO PLAYING BOT
 
 - Program *pianoPlayPi.py* is the program to play with Servo motors.
 - Folder  *partitures* contains example music sheets to play with previous program.
+- **Actual version of the code supports only multiple notes with same tempo in the same thread. Multi-thread is supported for simulate two virtual hands with their own partiture.**
 
 ### VIRTUAL PIANO
 
 - Program *buzzerPi.py* is a program to play songs with a passive buzzer using the frequencies of piano notes. To play multiple notes at the same time you need as many as notes are wanted to play at the same time.
+- **Actual version of the code only supports one note each time.**
 
 ### LEARNING TO PLAY THE PIANO
 
 - Program *ledPi.py* is a program to learn to play the piano using a servo controller for switching LEDs, each LED corresponds to one note, you need as many LEDs as notes are wanted to play. 
 - This program was the first implementation and was designed to learn to play the piano by placing a LED on top of each key to play it every time a LED was turned on.
+- **Actual version of the code supports multiple notes with same tempo in the same thread. No multi-thread support yet.**
 
 **GOOGLE ASSISTANT SUPPORT**
 

buzzerPi.py

@@ -7,14 +7,15 @@
 #	under certain conditions; type `show c' for details.
 
 ########################################
-#		Imports		       #
+#			Imports					   #
 ########################################
 import time
 import sys
 import RPi.GPIO as GPIO
+#end Imports.
 
 ########################################
-#	Initialize buzzer      #
+#			Initialize buzzer	       #
 ########################################
 
 #Disable warnings (optional)
@@ -23,19 +24,21 @@
 #Select GPIO mode
 GPIO.setmode(GPIO.BCM);
 
-#Set BUZZER  - pin 23 as output
+#Set BUZZER  - pin 23 as output (as many as notes)
 BUZZER =23;
 GPIO.setup(BUZZER,GPIO.OUT);
+#end Initialize buzzer.
 
 ########################################
-#	Global variables               #
+#		Global variables               #
 ########################################
 
 # Song to be played.
 song = [];
+#end Global variables.
 
 ########################################
-#	Music notes available          #
+#		Music notes available          #
 ########################################
 
 # Frecuency of each note.
@@ -65,29 +68,45 @@
 ########################################
 
 # Values of each type of note.
-redonda = 0.8;
-blanca = 0.4;
-negra = 0.3;
+dobleredonda = 3.2
+redonda = 1.6;
+blancaplus = 1.2;
+blancasemi = 1;
+blanca = 0.8;
+negraplus = 0.6;
+negrasemi = 0.5;
+negra = 0.4;
 corchea = 0.2;
 semicorchea = 0.1;
+ssemicorchea = 0.05;
+sssemicorchea = 0.025;
 
 # Each tempo with each value.
 tempo_notes = {
+	"dr":dobleredonda,
 	"r":redonda,
+	"b+":blancaplus,
+	"b-":blancasemi,
 	"b":blanca,
+	"n+":negraplus,
+	"n-":negrasemi,
 	"n":negra,
 	"c":corchea,
-	"sc":semicorchea
+	"sc":semicorchea,
+	"ssc":ssemicorchea,
+	"sssc":sssemicorchea
 };
+#end Note tempo defines.
 
 ########################################
-#	play_note function             #
+#			usage function             #
 ########################################
 def usage(program_name):
 	print("Usage:\n\tpython3 "+program_name+" partitures/partiture.txt\nor:\n\t./"+program_name+" partitures/partiture.txt");
+#end usage function.
 
 ########################################
-#	play_note function             #
+#		play_note function             #
 ########################################
 def play_note(the_note):
 	halveWaveTime = 1 / (the_note[0] * 2 );
@@ -98,9 +117,10 @@ def play_note(the_note):
 		GPIO.output(BUZZER, False);
 		time.sleep(halveWaveTime);
 	time.sleep(the_note[1] *0.1);
+#end play_note function.
 
 ########################################
-#	get_partitures function        #
+#		get_partitures function        #
 ########################################
 def get_partiture(partiture):
 	try:
@@ -116,9 +136,10 @@ def get_partiture(partiture):
 			song.append(tupla);
 		except:
 			continue;
+#end get_partitures function.
 
 #########################################
-#    Read arguments and get partiture   #
+#    Read arguments and get partitures  #
 #########################################
 
 # Get program name.
@@ -138,11 +159,22 @@ def get_partiture(partiture):
 
 # Get the partiture.
 get_partiture(partiture);
+#end Read arguments and get partitures.
 
 #########################################
-#		Play Song		#
+#			Play Song					#
 #########################################
 print('Playing piano, press Ctrl-C to quit...')
-while True:
-	for note in song:
-		play_note(note);
+try:
+	while True:
+		reset();
+		for note in song:
+			play_note(note);
+		print("The song has ended, playing again...");
+except KeyboardInterrupt:
+	reset();
+	print("Turning off the piano.");
+	sys.exit(1);
+#end Play Song.
+
+#end Program.

ledPi.py

@@ -7,16 +7,17 @@
 #	under certain conditions; type `show c' for details.
 
 ########################################
-#		Imports		       #
+#			Imports					   #
 ########################################
 import busio
 import time
 import sys
 from adafruit_pca9685 import PCA9685
 from board import SCL, SDA
+#end Imports.
 
 ########################################
-#	Initialize I2C bus             #
+#		Initialize I2C bus             #
 ########################################
 
 # Create the I2C bus interface.
@@ -27,19 +28,22 @@
 
 # Set the PWM frequency to 60hz.
 pca.frequency = 60;
+#end Initialize I2C bus.
 
 ########################################
-#	Global variables               #
+#		Global variables               #
 ########################################
 
 # Led brightness.
 on = 0xffff;
 off = 0;
+
 # Song to be played.
 song = [];
+#end Global variables.
 
 ########################################
-#	Music notes available          #
+#		Music notes available          #
 ########################################
 
 # Channel of each LED.
@@ -63,50 +67,71 @@
 	"si":si,
 	"do2":do2
 };
+#end Music notes available.
 
 ########################################
-#	Tempo notes defines            #
+#		Note tempo defines             #
 ########################################
 
 # Values of each type of note.
-redonda = 0.8;
-blanca = 0.4;
-negra = 0.3;
+dobleredonda = 3.2
+redonda = 1.6;
+blancaplus = 1.2;
+blancasemi = 1;
+blanca = 0.8;
+negraplus = 0.6;
+negrasemi = 0.5;
+negra = 0.4;
 corchea = 0.2;
 semicorchea = 0.1;
+ssemicorchea = 0.05;
+sssemicorchea = 0.025;
 
 # Each tempo with each value.
 tempo_notes = {
+	"dr":dobleredonda,
 	"r":redonda,
+	"b+":blancaplus,
+	"b-":blancasemi,
 	"b":blanca,
+	"n+":negraplus,
+	"n-":negrasemi,
 	"n":negra,
 	"c":corchea,
-	"sc":semicorchea
+	"sc":semicorchea,
+	"ssc":ssemicorchea,
+	"sssc":sssemicorchea
 };
+#end Note tempo defines.
 
 ########################################
-#	play_note function             #
+#			usage function             #
 ########################################
 def usage(program_name):
 	print("Usage:\n\tpython3 "+program_name+" partitures/partiture.txt\nor:\n\t./"+program_name+" partitures/partiture.txt");
+#end usage function.
 
 ########################################
-#	play_note function             #
+#		play_note function             #
 ########################################
 def play_note(the_note):
-	the_note[0].duty_cycle = on;
-	time.sleep(the_note[1]);
-	the_note[0].duty_cycle = off;
+	for note in the_notes:
+		note[0].duty_cycle = on;
+	time.sleep(the_notes[1]);
+	for note in the_notes:
+		note[0].duty_cycle = off;
+#end play_note function.
 
 ########################################
-#	    reset function             #
+#			reset function             #
 ########################################
 def reset():
 	for note in music_notes:
 		music_notes[note].duty_cycle = off;
+#end reset function.
 
 ########################################
-#	get_partitures function        #
+#		get_partitures function        #
 ########################################
 def get_partiture(partiture):
 	try:
@@ -115,16 +140,21 @@ def get_partiture(partiture):
 		print("No partiture called partitures/"+str(partiture)+" found.");
 		sys.exit(1);
 	song_content = song_file.read().split("\n");
-	for note in song_content:
+	for notes in song_content:
 		try:
-			values = note.split(",");	
-			tupla = (music_notes[values[0]],tempo_notes[values[1]]);
-			song.append(tupla);
+			tuple_notes = notes.split("\t");
+			list_notes = [];
+			for note in tuple_notes:
+				values = note.split(",");
+				tupla = (music_notes[values[0]],tempo_notes[values[1]]);
+				list_notes.append(tupla);
+			song.append(list_notes);
 		except:
 			continue;
+#end get_partitures function.
 
 #########################################
-#    Read arguments and get partiture   #
+#    Read arguments and get partitures  #
 #########################################
 
 # Get program name.
@@ -150,13 +180,22 @@ def get_partiture(partiture):
 
 # Get the partiture.
 get_partiture(partiture);
+#end Read arguments and get partitures.
 
 #########################################
-#		Play Song		#
+#			Play Song					#
 #########################################
 print('Playing piano, press Ctrl-C to quit...')
-while True:
+try:
+	while True:
+		reset();
+		for note in song:
+			play_note(note);
+		print("The song has ended, playing again...");
+except KeyboardInterrupt:
 	reset();
-	for note in song:
-		play_note(note);
-	
+	print("Turning off the piano.");
+	sys.exit(1);
+#end Play Song.
+
+#end Program.