summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
Diffstat (limited to 'quantum')
-rw-r--r--quantum/audio.c59
-rw-r--r--quantum/audio.h7
-rw-r--r--quantum/keymap_common.c15
-rw-r--r--quantum/musical_notes.h49
-rw-r--r--quantum/song_list.h23
5 files changed, 118 insertions, 35 deletions
diff --git a/quantum/audio.c b/quantum/audio.c
index 6bd6532a3a..e0413051a0 100644
--- a/quantum/audio.c
+++ b/quantum/audio.c
@@ -4,7 +4,7 @@
#include <avr/pgmspace.h>
#include <avr/interrupt.h>
#include <avr/io.h>
-
+#include "print.h"
#include "audio.h"
#include "keymap_common.h"
@@ -57,9 +57,11 @@ bool notes = false;
bool note = false;
float note_frequency = 0;
float note_length = 0;
+float note_tempo = TEMPO_DEFAULT;
+float note_timbre = TIMBRE_DEFAULT;
uint16_t note_position = 0;
float (* notes_pointer)[][2];
-uint8_t notes_length;
+uint8_t notes_count;
bool notes_repeat;
float notes_rest;
bool note_resting = false;
@@ -255,7 +257,8 @@ ISR(TIMER3_COMPA_vect) {
place = 0.0;
}
ICR3 = (int)(((double)F_CPU) / (frequencies[voice_place] * CPU_PRESCALER)); // Set max to the period
- OCR3A = (int)(((double)F_CPU) / (frequencies[voice_place] * CPU_PRESCALER)) >> 1 * duty_place; // Set compare to half the period
+ OCR3A = (int)((((double)F_CPU) / (frequencies[voice_place] * CPU_PRESCALER)) * note_timbre); // Set compare to half the period
+ //OCR3A = (int)(((double)F_CPU) / (frequencies[voice_place] * CPU_PRESCALER)) >> 1 * duty_place; // Set compare to half the period
place++;
// if (duty_counter > (frequencies[voice_place] / 500)) {
// duty_place = (duty_place % 3) + 1;
@@ -288,7 +291,7 @@ ISR(TIMER3_COMPA_vect) {
#else
if (note_frequency > 0) {
ICR3 = (int)(((double)F_CPU) / (note_frequency * CPU_PRESCALER)); // Set max to the period
- OCR3A = (int)(((double)F_CPU) / (note_frequency * CPU_PRESCALER)) >> 1; // Set compare to half the period
+ OCR3A = (int)((((double)F_CPU) / (note_frequency * CPU_PRESCALER)) * note_timbre); // Set compare to half the period
} else {
ICR3 = 0;
OCR3A = 0;
@@ -304,7 +307,7 @@ ISR(TIMER3_COMPA_vect) {
end_of_note = (note_position >= (note_length * 0x7FF));
if (end_of_note) {
current_note++;
- if (current_note >= notes_length) {
+ if (current_note >= notes_count) {
if (notes_repeat) {
current_note = 0;
} else {
@@ -327,10 +330,10 @@ ISR(TIMER3_COMPA_vect) {
note_resting = false;
#ifdef PWM_AUDIO
note_frequency = (*notes_pointer)[current_note][0] / SAMPLE_RATE;
- note_length = (*notes_pointer)[current_note][1];
+ note_length = (*notes_pointer)[current_note][1] * (note_tempo / 100);
#else
note_frequency = (*notes_pointer)[current_note][0];
- note_length = (*notes_pointer)[current_note][1] / 4;
+ note_length = ((*notes_pointer)[current_note][1] / 4) * (note_tempo / 100);
#endif
}
note_position = 0;
@@ -344,15 +347,16 @@ ISR(TIMER3_COMPA_vect) {
}
}
-void play_notes(float (*np)[][2], uint8_t n_length, bool n_repeat, float n_rest) {
+void play_notes(float (*np)[][2], uint8_t n_count, bool n_repeat, float n_rest) {
if (audio_config.enable) {
if (note)
stop_all_notes();
+ notes = true;
notes_pointer = np;
- notes_length = n_length;
+ notes_count = n_count;
notes_repeat = n_repeat;
notes_rest = n_rest;
@@ -360,10 +364,10 @@ if (audio_config.enable) {
current_note = 0;
#ifdef PWM_AUDIO
note_frequency = (*notes_pointer)[current_note][0] / SAMPLE_RATE;
- note_length = (*notes_pointer)[current_note][1];
+ note_length = (*notes_pointer)[current_note][1] * (note_tempo / 100);
#else
note_frequency = (*notes_pointer)[current_note][0];
- note_length = (*notes_pointer)[current_note][1] / 4;
+ note_length = ((*notes_pointer)[current_note][1] / 4) * (note_tempo / 100);
#endif
note_position = 0;
@@ -375,7 +379,6 @@ if (audio_config.enable) {
TCCR3A |= _BV(COM3A1);
#endif
- notes = true;
}
}
@@ -405,6 +408,7 @@ if (audio_config.enable && voices < 8) {
if (notes)
stop_all_notes();
+ note = true;
#ifdef PWM_AUDIO
freq = freq / SAMPLE_RATE;
#endif
@@ -436,7 +440,34 @@ if (audio_config.enable && voices < 8) {
TCCR3A |= _BV(COM3A1);
#endif
- note = true;
}
-} \ No newline at end of file
+}
+
+void set_timbre(float timbre)
+{
+ note_timbre = timbre;
+}
+
+void set_tempo(float tempo)
+{
+ note_tempo = tempo;
+}
+
+void decrease_tempo(uint8_t tempo_change)
+{
+ note_tempo += (float) tempo_change;
+}
+
+void increase_tempo(uint8_t tempo_change)
+{
+ if (note_tempo - (float) tempo_change < 10)
+ {
+ note_tempo = 10;
+ }
+ else
+ {
+ note_tempo -= (float) tempo_change;
+ }
+}
+
diff --git a/quantum/audio.h b/quantum/audio.h
index e1bc23ffed..05d314c940 100644
--- a/quantum/audio.h
+++ b/quantum/audio.h
@@ -3,6 +3,7 @@
#include <avr/io.h>
#include <util/delay.h>
#include "musical_notes.h"
+#include "song_list.h"
#ifndef AUDIO_H
#define AUDIO_H
@@ -24,8 +25,12 @@ void play_note(double freq, int vol);
void stop_note(double freq);
void stop_all_notes(void);
void init_notes(void);
-void play_notes(float (*np)[][2], uint8_t n_length, bool n_repeat, float n_rest);
+void play_notes(float (*np)[][2], uint8_t n_count, bool n_repeat, float n_rest);
+void set_timbre(float timbre);
+void set_tempo(float tempo);
+void increase_tempo(uint8_t tempo_change);
+void decrease_tempo(uint8_t tempo_change);
#define SCALE (int []){ 0 + (12*0), 2 + (12*0), 4 + (12*0), 5 + (12*0), 7 + (12*0), 9 + (12*0), 11 + (12*0), \
0 + (12*1), 2 + (12*1), 4 + (12*1), 5 + (12*1), 7 + (12*1), 9 + (12*1), 11 + (12*1), \
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index d38e6fdb20..2001438b90 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "backlight.h"
#include "keymap_midi.h"
#include "bootloader.h"
+#include "eeconfig.h"
extern keymap_config_t keymap_config;
@@ -33,15 +34,13 @@ extern keymap_config_t keymap_config;
#include <inttypes.h>
#ifdef AUDIO_ENABLE
#include "audio.h"
+
#ifndef TONE_GOODBYE
- #define TONE_GOODBYE { \
- {440.0*pow(2.0,(31)/12.0), 8}, \
- {440.0*pow(2.0,(24)/12.0), 8}, \
- {440.0*pow(2.0,(19)/12.0), 12}, \
- }
- #endif
- float tone_goodbye[][2] = TONE_GOODBYE;
-#endif
+ #define TONE_GOODBYE OLKB_GOODBYE
+ #endif /*! TONE_GOODBYE */
+
+ float tone_goodbye[][2] = SONG(TONE_GOODBYE);
+#endif /* AUDIO_ENABLE */
static action_t keycode_to_action(uint16_t keycode);
diff --git a/quantum/musical_notes.h b/quantum/musical_notes.h
index 837f6a069d..ccdc34f270 100644
--- a/quantum/musical_notes.h
+++ b/quantum/musical_notes.h
@@ -2,22 +2,38 @@
#define MUSICAL_NOTES_H
// Tempo Placeholder
-#define TEMPO 120
+#define TEMPO_DEFAULT 100
+
+
+#define SONG(notes...) { notes }
// Note Types
-#define WHOLE_NOTE(note) {(NOTE##note), 64}
-#define HALF_NOTE(note) {(NOTE##note), 32}
-#define QUARTER_NOTE(note) {(NOTE##note), 16}
-#define EIGHTH_NOTE(note) {(NOTE##note), 8}
-#define SIXTEENTH_NOTE(note) {(NOTE##note), 4}
+#define MUSICAL_NOTE(note, duration) {(NOTE##note), duration}
+#define WHOLE_NOTE(note) MUSICAL_NOTE(note, 64)
+#define HALF_NOTE(note) MUSICAL_NOTE(note, 32)
+#define QUARTER_NOTE(note) MUSICAL_NOTE(note, 16)
+#define EIGHTH_NOTE(note) MUSICAL_NOTE(note, 8)
+#define SIXTEENTH_NOTE(note) MUSICAL_NOTE(note, 4)
+
+#define WHOLE_DOT_NOTE(note) MUSICAL_NOTE(note, 64+32)
+#define HALF_DOT_NOTE(note) MUSICAL_NOTE(note, 32+16)
+#define QUARTER_DOT_NOTE(note) MUSICAL_NOTE(note, 16+8)
+#define EIGHTH_DOT_NOTE(note) MUSICAL_NOTE(note, 8+4)
+#define SIXTEENTH_DOT_NOTE(note) MUSICAL_NOTE(note, 4+2)
-// Note Types Short
-#define W_NOTE(n) WHOLE_NOTE(n)
-#define H_NOTE(n) HALF_NOTE(n)
-#define Q_NOTE(n) QUARTER_NOTE(n)
-#define E_NOTE(n) EIGTH_NOTE(n)
-#define S_NOTE(n) SIXTEENTH_NOTE(n)
+// Note Type Shortcuts
+#define M__NOTE(note, duration) MUSICAL_NOTE(note, duration)
+#define W__NOTE(n) WHOLE_NOTE(n)
+#define H__NOTE(n) HALF_NOTE(n)
+#define Q__NOTE(n) QUARTER_NOTE(n)
+#define E__NOTE(n) EIGHTH_NOTE(n)
+#define S__NOTE(n) SIXTEENTH_NOTE(n)
+#define WD_NOTE(n) WHOLE_DOT_NOTE(n)
+#define HD_NOTE(n) HALF_DOT_NOTE(n)
+#define QD_NOTE(n) QUARTER_DOT_NOTE(n)
+#define ED_NOTE(n) EIGHTH_DOT_NOTE(n)
+#define SD_NOTE(n) SIXTEENTH_DOT_NOTE(n)
// Note Styles
// Staccato makes sure there is a rest between each note. Think: TA TA TA
@@ -25,6 +41,15 @@
#define STACCATO 0.01
#define LEGATO 0
+// Note Timbre
+// Changes how the notes sound
+#define TIMBRE_12 0.125
+#define TIMBRE_25 0.250
+#define TIMBRE_50 0.500
+#define TIMBRE_75 0.750
+#define TIMBRE_DEFAULT TIMBRE_50
+
+
// Notes - # = Octave
#define NOTE_REST 0.00
#define NOTE_C0 16.35
diff --git a/quantum/song_list.h b/quantum/song_list.h
new file mode 100644
index 0000000000..b626c3fa6b
--- /dev/null
+++ b/quantum/song_list.h
@@ -0,0 +1,23 @@
+#include "musical_notes.h"
+
+#ifndef SONG_LIST_H
+#define SONG_LIST_H
+
+#define ODE_TO_JOY \
+ Q__NOTE(_E4), Q__NOTE(_E4), Q__NOTE(_F4), Q__NOTE(_G4), \
+ Q__NOTE(_G4), Q__NOTE(_F4), Q__NOTE(_E4), Q__NOTE(_D4), \
+ Q__NOTE(_C4), Q__NOTE(_C4), Q__NOTE(_D4), Q__NOTE(_E4), \
+ QD_NOTE(_E4), E__NOTE(_D4), H__NOTE(_D4),
+
+#define ROCK_A_BYE_BABY \
+ QD_NOTE(_B4), E__NOTE(_D4), Q__NOTE(_B5), \
+ H__NOTE(_A5), Q__NOTE(_G5), \
+ QD_NOTE(_B4), E__NOTE(_D5), Q__NOTE(_G5), \
+ H__NOTE(_FS5),
+
+#define OLKB_GOODBYE \
+ E__NOTE(_E7), \
+ E__NOTE(_A6), \
+ ED_NOTE(_E6),
+
+#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 01:41:39 +0000