g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no need for length of play_notes array with macro

daktil_thumb_popravljen
Jack Humbert 2016-04-16 23:15:40 -04:00
parent 720e67e558 45f10b4c4b
commit e7b9959819
7 changed files with 54 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
keyboard/atomic/keymaps/pvc/keymap.c
View File

@ -75,8 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}, },
}; };
#define IS_LAYER_ON(layer) (layer_state & (1UL << (layer)))
#define IS_LAYER_OFF(layer) (!IS_LAYER_ON(layer))
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
@ -201,24 +199,14 @@ Q_NOTE(_B8 ) ,
}; };
float tone_rs[][2] = { float tone_rs[][2] = {
Q_NOTE(_F8 ) , Q_NOTE(_A4 ) ,
Q_NOTE(_G8 ) , Q_NOTE(_A4 ) ,
Q_NOTE(_GS8 ) , Q_NOTE(_A4 ) ,
Q_NOTE(_A8 ) , Q_NOTE(_A4 ) ,
Q_NOTE(_AS8 ) , Q_NOTE(_AS8 ) ,
Q_NOTE(_B8 ) , Q_NOTE(_B8 ) ,
}; };
float tone_fn[][2] = {
{440.0*pow(2.0,(59)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 8},
{0, 4},
{440.0*pow(2.0,(67)/12.0), 16},
{0, 4},
{440.0*pow(2.0,(69)/12.0), 16},
{0, 4},
{440.0*pow(2.0,(67)/12.0), 16}
};
#endif #endif
void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order) void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order)
@ -253,18 +241,18 @@ void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t l
const uint16_t PROGMEM fn_actions[] = { const uint16_t PROGMEM fn_actions[] = {
}; };
#define ARRAY_SIZE(x) ((sizeof x) / (sizeof *x)) //#define MUSIC_ARRAY_SIZE(x) (((int)(sizeof(x) / (sizeof(x[0][0])))) / 2)
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{ {
// MACRODOWN only works in this function // MACRODOWN only works in this function
switch(id) { switch(id) {
case M_LW: case M_LW:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
println("PlayNotes LW"); println("PlayNotes LW");
print_val_hex32(ARRAY_SIZE(tone_lw)); PLAY_NOTE_ARRAY(tone_lw, false, STACCATO);
play_notes(&tone_lw, 96, false);
#endif #endif
layer_on(_LW); layer_on(_LW);
update_tri_layer(_LW, _RS, _FN); update_tri_layer(_LW, _RS, _FN);
@ -277,7 +265,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
println("PlayNotes RS"); println("PlayNotes RS");
play_notes(&tone_rs, 6, false); PLAY_NOTE_ARRAY(tone_rs, false, LEGATO);
#endif #endif
layer_on(_RS); layer_on(_RS);
update_tri_layer(_LW, _RS, _FN); update_tri_layer(_LW, _RS, _FN);
@ -295,33 +283,19 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
float start_up[][2] = { float start_up[][2] = {
Q_NOTE(_E4 ) , Q_NOTE(_E4 ) ,
{0,1} ,
Q_NOTE(_E4 ) , Q_NOTE(_E4 ) ,
{0,1} ,
Q_NOTE(_F4 ) , Q_NOTE(_F4 ) ,
{0,1} ,
Q_NOTE(_G4 ) , Q_NOTE(_G4 ) ,
{0,1} ,
Q_NOTE(_G4 ) , Q_NOTE(_G4 ) ,
{0,1} ,
Q_NOTE(_F4 ) , Q_NOTE(_F4 ) ,
{0,1} ,
Q_NOTE(_E4 ) , Q_NOTE(_E4 ) ,
{0,1} ,
Q_NOTE(_D4 ) , Q_NOTE(_D4 ) ,
{0,1} ,
Q_NOTE(_C4 ) , Q_NOTE(_C4 ) ,
{0,1} ,
Q_NOTE(_C4 ) , Q_NOTE(_C4 ) ,
{0,1} ,
Q_NOTE(_D4 ) , Q_NOTE(_D4 ) ,
{0,1} ,
Q_NOTE(_E4 ) , Q_NOTE(_E4 ) ,
{0,1} ,
H_NOTE(_E4 ) , H_NOTE(_E4 ) ,
{0,1} ,
Q_NOTE(_D4 ) , Q_NOTE(_D4 ) ,
{0,1} ,
H_NOTE(_D4 ) , H_NOTE(_D4 ) ,
}; };
#endif #endif
@ -329,7 +303,7 @@ H_NOTE(_D4 ) ,
void matrix_init_user(void) { void matrix_init_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
init_notes(); init_notes();
play_notes(&start_up, 29, false); PLAY_NOTE_ARRAY(start_up, false, STACCATO);
println("Matrix Init"); println("Matrix Init");
#endif #endif
} }

10
keyboard/planck/keymaps/default/keymap.c
View File

@ -194,7 +194,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _QW: case _QW:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_qw, false, 0); PLAY_NOTE_ARRAY(tone_qw, false, 0);
#endif #endif
default_layer_set(1UL<<_QW); default_layer_set(1UL<<_QW);
} }
@ -202,7 +202,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _CM: case _CM:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_cm, false, 0); PLAY_NOTE_ARRAY(tone_cm, false, 0);
#endif #endif
default_layer_set(1UL<<_CM); default_layer_set(1UL<<_CM);
} }
@ -210,7 +210,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _DV: case _DV:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_dv, false, 0); PLAY_NOTE_ARRAY(tone_dv, false, 0);
#endif #endif
default_layer_set(1UL<<_DV); default_layer_set(1UL<<_DV);
} }
@ -254,7 +254,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
audio_on(); audio_on();
play_notes(&start_up, false, 0); PLAY_NOTE_ARRAY(start_up, false, 0);
#endif #endif
} }
break; break;
@ -265,6 +265,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
void matrix_init_user(void) { void matrix_init_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
init_notes(); init_notes();
play_notes(&start_up, false, 0); PLAY_NOTE_ARRAY(start_up, false, 0);
#endif #endif
} }

15
keyboard/preonic/keymaps/default/keymap.c
View File

@ -3,11 +3,6 @@
#include "eeconfig.h" #include "eeconfig.h"
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#include "audio.h" #include "audio.h"
#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), \
0 + (12*2), 2 + (12*2), 4 + (12*2), 5 + (12*2), 7 + (12*2), 9 + (12*2), 11 + (12*2), \
0 + (12*3), 2 + (12*3), 4 + (12*3), 5 + (12*3), 7 + (12*3), 9 + (12*3), 11 + (12*3), \
0 + (12*4), 2 + (12*4), 4 + (12*4), 5 + (12*4), 7 + (12*4), 9 + (12*4), 11 + (12*4), }
#endif #endif
// Each layer gets a name for readability, which is then used in the keymap matrix below. // Each layer gets a name for readability, which is then used in the keymap matrix below.
@ -242,7 +237,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _QWERTY: case _QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_qwerty, false, 0); PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
#endif #endif
persistant_default_layer_set(1UL<<_QWERTY); persistant_default_layer_set(1UL<<_QWERTY);
} }
@ -250,7 +245,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _COLEMAK: case _COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_colemak, false, 0); PLAY_NOTE_ARRAY(tone_colemak, false, 0);
#endif #endif
persistant_default_layer_set(1UL<<_COLEMAK); persistant_default_layer_set(1UL<<_COLEMAK);
} }
@ -258,7 +253,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _DVORAK: case _DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_dvorak, false, 0); PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
#endif #endif
persistant_default_layer_set(1UL<<_DVORAK); persistant_default_layer_set(1UL<<_DVORAK);
} }
@ -302,7 +297,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
audio_on(); audio_on();
play_notes(&start_up, false, 0); PLAY_NOTE_ARRAY(start_up, false, 0);
#endif #endif
} }
break; break;
@ -317,7 +312,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case 9: case 9:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_music, false, 0); PLAY_NOTE_ARRAY(tone_music, false, 0);
layer_on(_MUSIC); layer_on(_MUSIC);
#endif #endif
} }

12
quantum/audio.c
View File

@ -181,7 +181,7 @@ void init_notes() {
DDRC |= _BV(PORTC6); DDRC |= _BV(PORTC6);
TIMSK3 &= ~_BV(OCIE3A); // Turn off 3A interputs TIMSK3 &= ~_BV(OCIE3A); // Turn off 3A interputs
TCCR3A = 0x0; // Options not needed TCCR3A = 0x0; // Options not needed
TCCR3B = _BV(CS31) | _BV(CS30) | _BV(WGM32); // 64th prescaling and CTC TCCR3B = _BV(CS31) | _BV(CS30) | _BV(WGM32); // 64th prescaling and CTC
OCR3A = SAMPLE_DIVIDER - 1; // Correct count/compare, related to sample playback OCR3A = SAMPLE_DIVIDER - 1; // Correct count/compare, related to sample playback
@ -202,14 +202,14 @@ ISR(TIMER3_COMPA_vect) {
if (voices == 1) { if (voices == 1) {
// SINE // SINE
OCR4A = pgm_read_byte(&sinewave[(uint16_t)place]) >> 2; OCR4A = pgm_read_byte(&sinewave[(uint16_t)place]) >> 2;
// SQUARE // SQUARE
// if (((int)place) >= 1024){ // if (((int)place) >= 1024){
// OCR4A = 0xFF >> 2; // OCR4A = 0xFF >> 2;
// } else { // } else {
// OCR4A = 0x00; // OCR4A = 0x00;
// } // }
// SAWTOOTH // SAWTOOTH
// OCR4A = (int)place / 4; // OCR4A = (int)place / 4;
@ -298,9 +298,9 @@ ISR(TIMER3_COMPA_vect) {
note_position++; note_position++;
bool end_of_note = false; bool end_of_note = false;
if (ICR3 > 0) if (ICR3 > 0)
end_of_note = (note_position >= (note_length / ICR3 * 0xFFFF)); end_of_note = (note_position >= (note_length / ICR3 * 0xFFFF));
else else
end_of_note = (note_position >= (note_length * 0x7FF)); end_of_note = (note_position >= (note_length * 0x7FF));
if (end_of_note) { if (end_of_note) {
current_note++; current_note++;
@ -412,7 +412,7 @@ if (audio_config.enable && voices < 8) {
if (frequency != 0) { if (frequency != 0) {
double starting_f = frequency; double starting_f = frequency;
if (frequency < freq) { if (frequency < freq) {
for (double f = starting_f; f <= freq; f += ((freq - starting_f) / 2000.0)) { for (double f = starting_f; f <= freq; f += ((freq - starting_f) / 2000.0)) {
frequency = f; frequency = f;
} }
} else if (frequency > freq) { } else if (frequency > freq) {

23
quantum/audio.h
View File

@ -4,6 +4,9 @@
#include <util/delay.h> #include <util/delay.h>
#include "musical_notes.h" #include "musical_notes.h"
#ifndef AUDIO_H
#define AUDIO_H
typedef union { typedef union {
uint8_t raw; uint8_t raw;
struct { struct {
@ -19,6 +22,22 @@ void audio_off(void);
void play_sample(uint8_t * s, uint16_t l, bool r); void play_sample(uint8_t * s, uint16_t l, bool r);
void play_note(double freq, int vol); void play_note(double freq, int vol);
void stop_note(double freq); void stop_note(double freq);
void stop_all_notes(); void stop_all_notes(void);
void init_notes(); 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_length, bool n_repeat, float n_rest);
#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), \
0 + (12*2), 2 + (12*2), 4 + (12*2), 5 + (12*2), 7 + (12*2), 9 + (12*2), 11 + (12*2), \
0 + (12*3), 2 + (12*3), 4 + (12*3), 5 + (12*3), 7 + (12*3), 9 + (12*3), 11 + (12*3), \
0 + (12*4), 2 + (12*4), 4 + (12*4), 5 + (12*4), 7 + (12*4), 9 + (12*4), 11 + (12*4), }
// 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.
// The global float array for the song must be used here.
#define NOTE_ARRAY_SIZE(x) ((int)(sizeof(x) / (sizeof(x[0]))))
#define PLAY_NOTE_ARRAY(note_array, note_repeat, note_rest_style) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), (note_repeat), (note_rest_style));
#endif

4
quantum/keymap_common.c
View File

@ -191,7 +191,7 @@ static action_t keycode_to_action(uint16_t keycode)
case RESET: ; // RESET is 0x5000, which is why this is here case RESET: ; // RESET is 0x5000, which is why this is here
clear_keyboard(); clear_keyboard();
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&goodbye_tune, false, 0); PLAY_NOTE_ARRAY(goodbye_tune, false, 0);
#endif #endif
_delay_ms(250); _delay_ms(250);
#ifdef ATREUS_ASTAR #ifdef ATREUS_ASTAR
@ -204,7 +204,7 @@ static action_t keycode_to_action(uint16_t keycode)
debug_enable = true; debug_enable = true;
break; break;
case 0x5002 ... 0x50FF: case 0x5002 ... 0x50FF:
// MAGIC actions (BOOTMAGIC without the boot) // MAGIC actions (BOOTMAGIC without the boot)
if (!eeconfig_is_enabled()) { if (!eeconfig_is_enabled()) {
eeconfig_init(); eeconfig_init();
} }

7
quantum/musical_notes.h
View File

@ -9,7 +9,7 @@
#define WHOLE_NOTE(note) {(NOTE##note), 64} #define WHOLE_NOTE(note) {(NOTE##note), 64}
#define HALF_NOTE(note) {(NOTE##note), 32} #define HALF_NOTE(note) {(NOTE##note), 32}
#define QUARTER_NOTE(note) {(NOTE##note), 16} #define QUARTER_NOTE(note) {(NOTE##note), 16}
#define EIGTH_NOTE(note) {(NOTE##note), 8} #define EIGHTH_NOTE(note) {(NOTE##note), 8}
#define SIXTEENTH_NOTE(note) {(NOTE##note), 4} #define SIXTEENTH_NOTE(note) {(NOTE##note), 4}
// Note Types Short // Note Types Short
@ -19,6 +19,11 @@
#define E_NOTE(n) EIGTH_NOTE(n) #define E_NOTE(n) EIGTH_NOTE(n)
#define S_NOTE(n) SIXTEENTH_NOTE(n) #define S_NOTE(n) SIXTEENTH_NOTE(n)
// Note Styles
// Staccato makes sure there is a rest between each note. Think: TA TA TA
// Legato makes notes flow together. Think: TAAA
#define STACCATO 0.01
#define LEGATO 0
// Notes - # = Octave // Notes - # = Octave
#define NOTE_REST 0.00 #define NOTE_REST 0.00