Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck

Browse source
This commit is contained in:
IBNobody 2016-04-16 19:32:29 -05:00
commit bc65f73c64
3 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
keyboard/preonic/keymaps/default/keymap.c
View file

@ -186,48 +186,48 @@ const uint16_t PROGMEM fn_actions[] = {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
float start_up[][2] = { float start_up[][2] = {
{440.0*pow(2.0,(50)/12.0), 20}, {440.0*pow(2.0,(14)/12.0), 20},
{440.0*pow(2.0,(62)/12.0), 8}, {440.0*pow(2.0,(26)/12.0), 8},
{440.0*pow(2.0,(54)/12.0), 20}, {440.0*pow(2.0,(18)/12.0), 20},
{440.0*pow(2.0,(62)/12.0), 8} {440.0*pow(2.0,(26)/12.0), 8}
}; };
float tone_qwerty[][2] = { float tone_qwerty[][2] = {
{440.0*pow(2.0,(59)/12.0), 8}, {440.0*pow(2.0,(23)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 8}, {440.0*pow(2.0,(24)/12.0), 8},
{0, 4}, {0, 4},
{440.0*pow(2.0,(67)/12.0), 16} {440.0*pow(2.0,(31)/12.0), 16}
}; };
float tone_colemak[][2] = { float tone_colemak[][2] = {
{440.0*pow(2.0,(59)/12.0), 8}, {440.0*pow(2.0,(23)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 8}, {440.0*pow(2.0,(24)/12.0), 8},
{0, 4}, {0, 4},
{440.0*pow(2.0,(67)/12.0), 12}, {440.0*pow(2.0,(31)/12.0), 12},
{0, 4}, {0, 4},
{440.0*pow(2.0,(71)/12.0), 12} {440.0*pow(2.0,(35)/12.0), 12}
}; };
float tone_dvorak[][2] = { float tone_dvorak[][2] = {
{440.0*pow(2.0,(59)/12.0), 8}, {440.0*pow(2.0,(23)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 8}, {440.0*pow(2.0,(24)/12.0), 8},
{0, 4}, {0, 4},
{440.0*pow(2.0,(67)/12.0), 8}, {440.0*pow(2.0,(31)/12.0), 8},
{0, 4}, {0, 4},
{440.0*pow(2.0,(69)/12.0), 8}, {440.0*pow(2.0,(33)/12.0), 8},
{0, 4}, {0, 4},
{440.0*pow(2.0,(67)/12.0), 8} {440.0*pow(2.0,(31)/12.0), 8}
}; };
float tone_music[][2] = { float tone_music[][2] = {
{440.0*pow(2.0,(48)/12.0), 8}, {440.0*pow(2.0,(12)/12.0), 8},
{440.0*pow(2.0,(50)/12.0), 8}, {440.0*pow(2.0,(14)/12.0), 8},
{440.0*pow(2.0,(52)/12.0), 8}, {440.0*pow(2.0,(16)/12.0), 8},
{440.0*pow(2.0,(53)/12.0), 8}, {440.0*pow(2.0,(17)/12.0), 8},
{440.0*pow(2.0,(55)/12.0), 8}, {440.0*pow(2.0,(19)/12.0), 8},
{440.0*pow(2.0,(57)/12.0), 8}, {440.0*pow(2.0,(21)/12.0), 8},
{440.0*pow(2.0,(59)/12.0), 8}, {440.0*pow(2.0,(23)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 8} {440.0*pow(2.0,(24)/12.0), 8}
}; };
#endif #endif
@ -333,9 +333,9 @@ void process_action_user(keyrecord_t *record) {
if (IS_LAYER_ON(_MUSIC)) { if (IS_LAYER_ON(_MUSIC)) {
if (record->event.pressed) { if (record->event.pressed) {
play_note(((double)261.626)*pow(2.0, -2.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF); play_note(((double)261.626)*pow(2.0, -3.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
} else { } else {
stop_note(((double)261.626)*pow(2.0, -2.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row))); stop_note(((double)261.626)*pow(2.0, -3.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
} }
} }

12
quantum/audio.c
View file

@ -12,6 +12,8 @@
#define PI 3.14159265 #define PI 3.14159265
#define CPU_PRESCALER 8
// #define PWM_AUDIO // #define PWM_AUDIO
#ifdef PWM_AUDIO #ifdef PWM_AUDIO
@ -244,12 +246,12 @@ ISR(TIMER3_COMPA_vect) {
// ICR3 = (int)(((double)F_CPU) / frequency); // Set max to the period // ICR3 = (int)(((double)F_CPU) / frequency); // Set max to the period
// OCR3A = (int)(((double)F_CPU) / frequency) >> 1; // Set compare to half the period // OCR3A = (int)(((double)F_CPU) / frequency) >> 1; // Set compare to half the period
voice_place %= voices; voice_place %= voices;
if (place > (frequencies[voice_place] / 500)) { if (place > (frequencies[voice_place] / 50)) {
voice_place = (voice_place + 1) % voices; voice_place = (voice_place + 1) % voices;
place = 0.0; place = 0.0;
} }
ICR3 = (int)(((double)F_CPU) / frequencies[voice_place]); // Set max to the period ICR3 = (int)(((double)F_CPU) / (frequencies[voice_place] * CPU_PRESCALER)); // Set max to the period
OCR3A = (int)(((double)F_CPU) / frequencies[voice_place]) >> 1 * duty_place; // 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++; place++;
// if (duty_counter > (frequencies[voice_place] / 500)) { // if (duty_counter > (frequencies[voice_place] / 500)) {
// duty_place = (duty_place % 3) + 1; // duty_place = (duty_place % 3) + 1;
@ -281,8 +283,8 @@ ISR(TIMER3_COMPA_vect) {
place -= SINE_LENGTH; place -= SINE_LENGTH;
#else #else
if (note_frequency > 0) { if (note_frequency > 0) {
ICR3 = (int)(((double)F_CPU) / note_frequency); // Set max to the period ICR3 = (int)(((double)F_CPU) / (note_frequency * CPU_PRESCALER)); // Set max to the period
OCR3A = (int)(((double)F_CPU) / note_frequency) >> 1; // Set compare to half the period OCR3A = (int)(((double)F_CPU) / (note_frequency * CPU_PRESCALER)) >> 1; // Set compare to half the period
} else { } else {
ICR3 = 0; ICR3 = 0;
OCR3A = 0; OCR3A = 0;

6
quantum/keymap_common.c
View file

@ -35,9 +35,9 @@ extern keymap_config_t keymap_config;
#include "audio.h" #include "audio.h"
float goodbye[][2] = { float goodbye[][2] = {
{440.0*pow(2.0,(67)/12.0), 8}, {440.0*pow(2.0,(31)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 8}, {440.0*pow(2.0,(24)/12.0), 8},
{440.0*pow(2.0,(55)/12.0), 12}, {440.0*pow(2.0,(19)/12.0), 12},
}; };
#endif #endif