summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
Diffstat (limited to 'quantum')
-rw-r--r--quantum/audio.c56
-rw-r--r--quantum/audio.h6
-rw-r--r--quantum/musical_notes.h13
-rw-r--r--quantum/song_list.h6
4 files changed, 65 insertions, 16 deletions
diff --git a/quantum/audio.c b/quantum/audio.c
index 119bd92298..9b9589f133 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) / (note_frequency * 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,8 +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)) >> 2; // 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;
@@ -305,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 {
@@ -328,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;
@@ -345,7 +347,7 @@ 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) {
@@ -354,7 +356,7 @@ if (audio_config.enable) {
notes = true;
notes_pointer = np;
- notes_length = n_length;
+ notes_count = n_count;
notes_repeat = n_repeat;
notes_rest = n_rest;
@@ -362,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;
@@ -439,4 +441,32 @@ if (audio_config.enable && voices < 8) {
}
-} \ 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 762c980643..8012aa6bf1 100644
--- a/quantum/audio.h
+++ b/quantum/audio.h
@@ -24,8 +24,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);
// These macros are used to allow play_notes to play an array of indeterminate
// length. This works around the limitation of C's sizeof operation on pointers.
diff --git a/quantum/musical_notes.h b/quantum/musical_notes.h
index d2256a7736..2170f3f18b 100644
--- a/quantum/musical_notes.h
+++ b/quantum/musical_notes.h
@@ -2,7 +2,8 @@
#define MUSICAL_NOTES_H
// Tempo Placeholder
-#define TEMPO 120
+#define TEMPO_DEFAULT 100
+
#define SONG(notes...) { notes }
@@ -21,7 +22,6 @@
#define EIGHTH_DOT_NOTE(note) MUSICAL_NOTE(note, 8+4)
#define SIXTEENTH_DOT_NOTE(note) MUSICAL_NOTE(note, 4+2)
-
// Note Type Shortcuts
#define M__NOTE(note, duration) MUSICAL_NOTE(note, duration)
#define W__NOTE(n) WHOLE_NOTE(n)
@@ -41,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
index ef25eac35a..ef36a1cddf 100644
--- a/quantum/song_list.h
+++ b/quantum/song_list.h
@@ -9,4 +9,10 @@
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),
+
#endif \ No newline at end of file
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-23 17:02:34 +0000