Skip to content

Add support for sharp (#) and flat (b) notes for playNote #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ScruffR wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add support for sharp (#) and flat (b) notes for playNote #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e2384e
Add support for sharp (
ScruffR Jul 1, 2016
a645a11
Add support for sharp (#) and flat (b) notes
ScruffR Jul 1, 2016
93c43b8
Add functions whichButtonsOn()/firstButtonOn()
ScruffR Jul 1, 2016
20a1f16
Add functions whichButtonsOn()/firstButtonOn()
ScruffR Jul 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 36 additions & 6 deletions firmware/InternetButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,24 @@ uint8_t InternetButton::allButtonsOff(){
}
}

uint8_t InternetButton::whichButtonsOn(){
uint8_t ret = 0;
ret |= digitalRead(b1) << 1; // bit 1 0b00000010
ret |= digitalRead(b2) << 2; // bit 2 0b00000100
ret |= digitalRead(b3) << 3; // bit 3 0b00001000
ret |= digitalRead(b4) << 4; // bit 4 0b00010000
return ret;
}

uint8_t InternetButton::firstButtonOn(){
uint8_t ret = 0;
if (digitalRead(b1)) return 1;
if (digitalRead(b2)) return 2;
if (digitalRead(b3)) return 3;
if (digitalRead(b4)) return 4;
return 0;
}

void InternetButton::rainbow(uint8_t wait) {
uint16_t i, j;

Expand Down Expand Up @@ -204,6 +222,7 @@ uint8_t InternetButton::lowestLed(){
return ledPos;
}

// song string can look like this "C4,1,C#4,1,Db4,1" for sharp (#) and flat (b) notes
void InternetButton::playSong(String song){
char inputStr[200];
song.toCharArray(inputStr,200);
Expand All @@ -216,12 +235,7 @@ void InternetButton::playSong(String song){

while(duration != NULL){
note = strtok(NULL,",");
Serial.println(note);
duration = strtok(NULL,", \n");
Serial.println(duration);
//if(atoi(duration) <= 0){
// break;
//}
playNote(note,atoi(duration));
}
}
Expand All @@ -233,11 +247,17 @@ void InternetButton::playNote(String note, int duration){

//if(9 - int(command.charAt(1)) != null){
char octavo[5];
String tempString = note.substring(1,2);
String tempString = note.substring(note.length()-1,note.length());
tempString.toCharArray(octavo,5);
octave = atoi(octavo);
//}

Serial.print(note);
Serial.print(" ");
Serial.print(octave);
Serial.print(" ");
Serial.println(duration);

if(duration != 0){
duration = 1000/duration;
}
Expand Down Expand Up @@ -272,6 +292,16 @@ void InternetButton::playNote(String note, int duration){
//return -1;
}

switch(note.charAt(1)) {
case '#': // sharp
noteNum++;
break;
case 'b': // flat
noteNum--;
default:
break;
}

// based on equation at http://www.phy.mtu.edu/~suits/NoteFreqCalcs.html and the Verdi tuning
// fn = f0*(2^1/12)^n where n = number of half-steps from the reference frequency f0
freq = float(256*pow(1.05946,( 12.0*(octave-4) +noteNum)));
Expand Down
2 changes: 2 additions & 0 deletions firmware/InternetButton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class InternetButton {
buttonOn(uint8_t i),
allButtonsOn(void),
allButtonsOff(void),
whichButtonsOn(),
firstButtonOn(),
lowestLed(void);
int
readX(void),
Expand Down