#define _DVORAK 2
#define _LOWER 3
#define _RAISE 4
+#define _MUSIC 5
#define _ADJUST 6
-#define _MUSIC 7
-#define _STOPPER 5
// Macro name shortcuts
#define QWERTY M(_QWERTY)
[_ADJUST] = {
{KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12},
{_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL},
- {_______, _______, _______, AUD_ON, AUD_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______},
+ {_______, _______, _______, AUD_ON, AUD_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______},
{_______, _______, _______, MUS_ON, MUS_OFF, _______, _______, _______, _______, _______, _______, _______},
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
},
*
*/
[_MUSIC] = {
- {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
-},
-
-/* Stopper
- *
- */
-[_STOPPER] = {
{XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
{XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
{XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
{XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
- {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}
+ {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}
}
};
{440.0*pow(2.0,(23)/12.0), 8},
{440.0*pow(2.0,(24)/12.0), 8}
};
-float ode_to_joy[][2] = SONG(ODE_TO_JOY);
+float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
float goodbye[][2] = SONG(GOODBYE_SOUND);
#endif
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
layer_off(_MUSIC);
- layer_off(_STOPPER);
stop_all_notes();
#endif
}
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
init_notes();
- set_tempo(150);
- PLAY_NOTE_ARRAY(ode_to_joy, false, .25);
+ PLAY_NOTE_ARRAY(music_scale, false, 0);
layer_on(_MUSIC);
- layer_on(_STOPPER);
#endif
}
break;
void matrix_init_user(void) {
#ifdef AUDIO_ENABLE
init_notes();
+ _delay_ms(10);
PLAY_NOTE_ARRAY(start_up, false, 0);
#endif
}
void play_goodbye_tone()
{
PLAY_NOTE_ARRAY(goodbye, false, 0);
- _delay_ms(2000);
+ _delay_ms(150);
}
\ No newline at end of file
double frequency = 0;
int volume = 0;
long position = 0;
-int duty_place = 1;
-int duty_counter = 0;
double frequencies[8] = {0, 0, 0, 0, 0, 0, 0, 0};
int volumes[8] = {0, 0, 0, 0, 0, 0, 0, 0};
bool repeat = true;
uint8_t * sample;
uint16_t sample_length = 0;
-
+double freq = 0;
bool notes = false;
bool note = false;
bool notes_repeat;
float notes_rest;
bool note_resting = false;
-int note_flipper = 0;
uint8_t current_note = 0;
uint8_t rest_counter = 0;
+uint8_t vibrato_counter = 0;
+float vibrato_strength = 0;
+
+float polyphony_rate = 0;
+
audio_config_t audio_config;
#endif
}
+float mod(float a, int b)
+{
+ float r = fmod(a, b);
+ return r < 0 ? r + b : r;
+}
ISR(TIMER3_COMPA_vect) {
if (note) {
OCR4A = sum;
}
#else
- if (frequencies[voice_place] > 0) {
- // if (frequencies[voice_place] > 880.0) {
- // if (note_flipper == 100) {
- // note_flipper = 0;
- // return;
- // }
- // note_flipper++;
- // } else {
- // note_flipper = 0;
- // }
- // ICR3 = (int)(((double)F_CPU) / frequency); // Set max to the period
- // OCR3A = (int)(((double)F_CPU) / frequency) >> 1; // Set compare to half the period
-
- double freq;
- if (false) {
- voice_place %= voices;
- if (place > (frequencies[voice_place] / 50)) {
- voice_place = (voice_place + 1) % voices;
- place = 0.0;
+ if (voices > 0) {
+ if (false && polyphony_rate > 0) {
+ if (voices > 1) {
+ voice_place %= voices;
+ if (place++ > (frequencies[voice_place] / polyphony_rate / CPU_PRESCALER / voices)) {
+ voice_place = (voice_place + 1) % voices;
+ place = 0.0;
+ }
}
- freq = frequencies[voice_place];
+ if (vibrato_strength > 0) {
+ freq = frequencies[voice_place] * pow(VIBRATO_LUT[(int)vibrato_counter], vibrato_strength);
+ vibrato_counter = mod((vibrato_counter + 1), VIBRATO_LUT_LENGTH);
+ } else {
+ freq = frequencies[voice_place];
+ }
} else {
if (frequency != 0) {
if (frequency < frequencies[voices - 1]) {
- frequency = frequency * 1.01454533494;
+ frequency = frequency * pow(2, 440/frequencies[voices - 1]/12/4);
} else if (frequency > frequencies[voices - 1]) {
- frequency = frequency * 0.98566319864;
+ frequency = frequency * pow(2, -440/frequencies[voices - 1]/12/4);
}
} else {
frequency = frequencies[voices - 1];
}
- freq = frequency;
+
+ if (false && vibrato_strength > 0) {
+ freq = frequency * pow(VIBRATO_LUT[(int)vibrato_counter], vibrato_strength);
+ vibrato_counter = mod((vibrato_counter + 1 + 440/frequencies[voices - 1]), VIBRATO_LUT_LENGTH);
+ } else {
+ freq = frequency;
+ }
}
ICR3 = (int)(((double)F_CPU) / (freq * CPU_PRESCALER)); // Set max to the period
OCR3A = (int)((((double)F_CPU) / (freq * 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;
- // duty_counter = 0;
- // }
- // duty_counter++;
}
#endif
}
place -= SINE_LENGTH;
#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)) * note_timbre); // Set compare to half the period
+ float freq;
+
+ if (false && vibrato_strength > 0) {
+ freq = note_frequency * pow(VIBRATO_LUT[(int)vibrato_counter], vibrato_strength);
+ vibrato_counter = mod((vibrato_counter + 1), VIBRATO_LUT_LENGTH);
+ } else {
+ freq = note_frequency;
+ }
+
+ ICR3 = (int)(((double)F_CPU) / (freq * CPU_PRESCALER)); // Set max to the period
+ OCR3A = (int)((((double)F_CPU) / (freq * CPU_PRESCALER)) * note_timbre); // Set compare to half the period
} else {
ICR3 = 0;
OCR3A = 0;