Skip to content
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

RTTTL fixed #18

Open
wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

RTTTL fixed #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Escornabot/Bot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ void Bot::init()
// init buzzer
#if USE_BUZZER
BUZZER.init();
BUZZER.beep();
//BUZZER.beep();
BUZZER.playRttl(RTTL_STARTUP);
#endif

#if USE_SIMPLE_LED
Expand Down
76 changes: 37 additions & 39 deletions Escornabot/Buzzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,90 +68,88 @@ void Buzzer::beep(uint16_t frequency)

//////////////////////////////////////////////////////////////////////

static const uint16_t FREQUENCIES[] =
static const uint16_t FREQUENCIES[] = // 12 notes, 4 octaves (4 to 7)
{
440, 466, 494, 523, 554, 587, 622, 659, 698, 740, 784, 831,
880, 932, 987, 1046, 1108, 1174, 1244,1318, 1396, 1479, 1567, 1661,
1760, 1864, 1975, 2093, 2217, 2349, 2489, 2637, 2793, 2959, 3135, 3322,
3520, 3729, 3951, 4186, 4434, 4698, 4978, 5274, 5587, 5919, 6271, 6644,
7040, 7458, 7902, 8372, 8869, 9397, 9956, 10548, 11175, 11839, 12543, 13289,
14080, 14917, 15804, 16744, 17739, 18794, 19912, 21096, 22350, 23679, 25087,
// C, C#, D, D#, E, F, F#, G, G#, A, A#, B,
262, 277, 294, 311, 330, 349, 370, 392, 415, 440, 466, 494,
523, 554, 587, 622, 659, 698, 740, 784, 831, 880, 932, 987,
1046, 1108, 1174, 1244, 1318, 1396, 1479, 1567, 1661, 1760, 1864, 1975,
2093, 2217, 2349, 2489, 2637, 2793, 2959, 3135, 3322, 3520, 3729, 3951
};


//////////////////////////////////////////////////////////////////////

void Buzzer::playRttl(const char* rttl)
{
// song name
// song name - discarded
while (*rttl && *rttl != ':') rttl++;
rttl++;

// default values
uint8_t default_duration= 16, default_octave = 5;
uint16_t bps = 320;
uint8_t default_octave = 5;
uint16_t default_duration= 16, bpm = 320;
while (*rttl && *rttl != ':')
{
switch (*rttl)
{
case 'd': // note duration
rttl += 2;
rttl += 2; // skip 'd='
default_duration = atoi(rttl);
while (*rttl >= '0' && *rttl <= '9') rttl++;
while (*rttl >= '0' && *rttl <= '9') rttl++; // discard used numbers
break;

case 'o': // octave
rttl += 2;
rttl += 2; // skip 'o='
default_octave = atoi(rttl);
while (*rttl >= '0' && *rttl <= '9') rttl++;
while (*rttl >= '0' && *rttl <= '9') rttl++; // discard used numbers
break;

case 'b': // beats per second
rttl += 2;
bps = atoi(rttl);
while (*rttl >= '0' && *rttl <= '9') rttl++;
case 'b': // beats per minute
rttl += 2; // skip 'b='
bpm = atoi(rttl);
while (*rttl >= '0' && *rttl <= '9') rttl++; // discard used numbers
break;

default:
rttl++;
rttl++; // discard invalid character
}
}
rttl++;
rttl++; // discard ':'

// play notes
// list of notes
uint16_t duration = default_duration;
int8_t note = -1;
uint8_t octave = default_octave;
while (*rttl)
{
if (*rttl >= 0 && *rttl <= 9)
if (*rttl >= '0' && *rttl <= '9')
{
// eat numbers
if (note < 0) duration = atoi(rttl) * bps / 60;
else octave = atoi(rttl);
while (*rttl >= '0' && *rttl <= '9') rttl++;
if (note < 0) duration = atoi(rttl);
else octave = atoi(rttl);
while (*rttl >= '0' && *rttl <= '9') rttl++; // discard used numbers
}
else
{
// eat note
switch (*rttl)
{
// tone
// C C# D D# E F F# G G# A A# B <-- octave
case 'p': note = 0; break;
case 'a': note = 1; break;
case 'b': note = 3; break;
case 'c': note = 4; break;
case 'd': note = 6; break;
case 'e': note = 8; break;
case 'f': note = 9; break;
case 'g': note = 10; break;
case 'c': note = 1; break;
case 'd': note = 3; break;
case 'e': note = 5; break;
case 'f': note = 6; break;
case 'g': note = 8; break;
case 'a': note = 10; break;
case 'b': note = 12; break;
case '#': note++; break;

case ',': case '\0':

if (note != -1 && octave >= 4 && octave <= 8) {
if (note > 0) tone(_pin,
FREQUENCIES[((octave - 4) * 10) + note - 1]);
delay(1000 / duration);
if (note > 0)
tone(_pin, FREQUENCIES[((octave - 4) * 12) + note - 1]);
delay(1000 * 60 / bpm / duration * 4); // https://github.com/ArminJo/PlayRtttl/blob/master/src/PlayRtttl.cpp#L597
noTone(_pin);
}

Expand All @@ -160,7 +158,7 @@ void Buzzer::playRttl(const char* rttl)
octave = default_octave;
break;
}
rttl++;
rttl++; // next
}
}
}
Expand Down
15 changes: 11 additions & 4 deletions Escornabot/Buzzer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,17 @@ See LICENSE.txt for details
#ifndef _BUZZER_H
#define _BUZZER_H

#define RTTL_INTEL ":d=16,o=5,b=320:d,p,d,p,d,p,g,p,g,p,g,p,d,p,d,p,d,p,a,p,a,p,"
#define RTTL_FIDO ":d=16,o=6,b=800:f,4p,f,4p,f,4p,f,4p,c,4p,c,4p,c,4p,c,"
#define RTTL_MOSAIC ":d=8,o=6,b=400:c,e,g,e,c,g,e,g,c,g,c,e,c,g,e,g,e,c,"
#define RTTL_ELISA ":d=4,o=7,b=125:e,d#,e,d#,e,b#,d,c,8a,"
// https://www.vex.net/~lawrence/ringtones.html
// https://adamonsoon.github.io/rtttl-play/

#define RTTL_INTEL ":d=8,o=5,b=320:d,p,d,p,d,p,g,p,g,p,g,p,d,p,d,p,d,p,a,p,a,p,"
#define RTTL_FIDO ":d=16,o=6,b=800:f,4p,f,4p,f,4p,f,4p,c,4p,c,4p,c,4p,c,"
#define RTTL_MOSAIC ":d=8,o=6,b=400:c,e,g,e,c,g,e,g,c,g,c,e,c,g,e,g,e,c,"
#define RTTL_ELISA ":d=8,o=6,b=125:e,d#,e,d#,e,b5,d,c,a,"
#define RTTL_GUP ":d=16,o=6,b=140:c,p,e,p,g,"
#define RTTL_STARTUP "fanfare:d=16,o=6,b=180:e,8p,e,p,e,p,4g,"
#define RTTL_BTTF ":d=16,o=5,b=200:4g.,p,4c.,p,2f#.,p,g.,p,a.,p,8g,p,8e,p,8c,p,4f#,p,g.,p,a.,p,8g.,p,8d.,p,8g.,p,8d.6,p,4d.6,p,4c#6,p,b.,p,c#.6,p,2d.6,"
#define RTTL_TEST ":d=16,o=4,b=200:c,c#,d,d#,e,f,f#,g,g#,a,a#,b,c5,c#5,d5,d#5,e5,f5,f#5,g5,g#5,a5,a#5,b5,c6,c#6,d6,d#6,e6,f6,f#6,g6,g#6,a6,a#6,b6,c7,c#7,d7,d#7,e7,f7,f#7,g7,g#7,a7,a#7,b7,"

#define BUZZER_BEEP_FREQUENCY 4699
#define BUZZER_BEEP_MILLIS 100
Expand Down