diff options
| -rw-r--r-- | keyboard/planck/Makefile | 4 | ||||
| -rw-r--r-- | keyboard/planck/keymaps/default/keymap.c | 183 | ||||
| -rw-r--r-- | keyboard/preonic/Makefile | 2 | ||||
| -rw-r--r-- | keyboard/preonic/config.h | 4 | ||||
| -rw-r--r-- | keyboard/preonic/keymaps/default/keymap.c | 17 | ||||
| -rw-r--r-- | quantum/audio.c | 5 | ||||
| -rw-r--r-- | quantum/audio.h | 6 | ||||
| -rw-r--r-- | quantum/keymap_common.c | 16 | 
8 files changed, 150 insertions, 87 deletions
| diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 83b8303b02..01d9e3ce9a 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -139,10 +139,10 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096  #   change to "no" to disable the options, or define them in the makefile.mk in   #   the appropriate keymap folder that will get included automatically  # -BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000) +BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)  MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)  EXTRAKEY_ENABLE = yes       # Audio control and System control(+450) -CONSOLE_ENABLE = yes        # Console for debug(+400) +CONSOLE_ENABLE = no         # Console for debug(+400)  COMMAND_ENABLE = yes        # Commands for debug and configuration  NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work  BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c index a6edefefd9..aecddec4a1 100644 --- a/keyboard/planck/keymaps/default/keymap.c +++ b/keyboard/planck/keymaps/default/keymap.c @@ -11,24 +11,27 @@  // The underscores don't mean anything - you can have a layer called STUFF or any other name.  // Layer names don't all need to be of the same length, obviously, and you can also skip them  // entirely and just use numbers. -#define _QW 0 -#define _CM 1 -#define _DV 2 -#define _LW 3 -#define _RS 4 -#define _AD 5 +#define _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _ADJUST 5 +#define _MUSIC 6  // Macro name shortcuts -#define QWERTY M(_QW) -#define COLEMAK M(_CM) -#define DVORAK M(_DV) -#define LOWER M(_LW) -#define RAISE M(_RS) +#define QWERTY M(_QWERTY) +#define COLEMAK M(_COLEMAK) +#define DVORAK M(_DVORAK) +#define LOWER M(_LOWER) +#define RAISE M(_RAISE)  #define M_BL 5  #ifdef AUDIO_ENABLE    #define AUD_OFF M(6)    #define AUD_ON M(7)  #endif +#define MUS_OFF M(8) +#define MUS_ON M(9)  // Fillers to make layering more clear  #define _______ KC_TRNS @@ -47,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |   * `-----------------------------------------------------------------------------------'   */ -[_QW] = { +[_QWERTY] = {    {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},    {KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},    {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT }, @@ -65,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |   * `-----------------------------------------------------------------------------------'   */ -[_CM] = { +[_COLEMAK] = {    {KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC},    {KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT},    {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT }, @@ -83,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |   * `-----------------------------------------------------------------------------------'   */ -[_DV] = { +[_DVORAK] = {    {KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC},    {KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH},    {KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT }, @@ -101,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |   * `-----------------------------------------------------------------------------------'   */ -[_LW] = { +[_LOWER] = {    {KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC},    {KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},    {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______}, @@ -119,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |   * `-----------------------------------------------------------------------------------'   */ -[_RS] = { +[_RAISE] = {    {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},    {KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},    {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______}, @@ -130,16 +133,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   * ,-----------------------------------------------------------------------------------.   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |   * |------+------+------+------+------+-------------+------+------+------+------+------| - * |      |      |      |Aud on|Audoff|      |      |Qwerty|Colemk|Dvorak|      |      | + * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |   * |------+------+------+------+------+------|------+------+------+------+------+------|   * |      |      |      |      |      |      |      |      |      |      |      |      |   * |------+------+------+------+------+------+------+------+------+------+------+------|   * |      |      |      |      |      |             |      |      |      |      |      |   * `-----------------------------------------------------------------------------------'   */ -[_AD] = { +[_ADJUST] = {    {_______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, -  {_______, _______, _______, AUD_ON,  AUD_OFF, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______}, +  {_______, _______, _______, AUD_ON,  AUD_OFF, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______}, +  {_______, _______, _______, MUS_ON,  MUS_OFF, _______, _______, _______, _______, _______, _______, _______}, +  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +}, + +/* Music (reserved for process_action_user) + * + */ +[_MUSIC] = { +  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, +  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},    {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},    {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}  } @@ -150,87 +163,102 @@ const uint16_t PROGMEM fn_actions[] = {  };  #ifdef AUDIO_ENABLE -float start_up[][2] = { -  {440.0*pow(2.0,(67)/12.0), 12}, -  {440.0*pow(2.0,(64)/12.0), 8}, -  {440.0*pow(2.0,(55)/12.0), 8}, -  {440.0*pow(2.0,(60)/12.0), 8}, -  {440.0*pow(2.0,(64)/12.0), 20} +float tone_startup[][2] = { +  {440.0*pow(2.0,(31)/12.0), 12}, +  {440.0*pow(2.0,(28)/12.0), 8}, +  {440.0*pow(2.0,(19)/12.0), 8}, +  {440.0*pow(2.0,(24)/12.0), 8}, +  {440.0*pow(2.0,(28)/12.0), 20}  }; -float tone_qw[][2] = { -  {440.0*pow(2.0,(59)/12.0), 8}, -  {440.0*pow(2.0,(60)/12.0), 8}, +float tone_qwerty[][2] = { +  {440.0*pow(2.0,(23)/12.0), 8}, +  {440.0*pow(2.0,(24)/12.0), 8},    {0, 4}, -  {440.0*pow(2.0,(67)/12.0), 16} +  {440.0*pow(2.0,(31)/12.0), 16}  }; -float tone_cm[][2] = { -  {440.0*pow(2.0,(59)/12.0), 8}, -  {440.0*pow(2.0,(60)/12.0), 8}, +float tone_colemak[][2] = { +  {440.0*pow(2.0,(23)/12.0), 8}, +  {440.0*pow(2.0,(24)/12.0), 8},    {0, 4}, -  {440.0*pow(2.0,(67)/12.0), 12}, +  {440.0*pow(2.0,(31)/12.0), 12},    {0, 4}, -  {440.0*pow(2.0,(71)/12.0), 12} +  {440.0*pow(2.0,(35)/12.0), 12}  }; -float tone_dv[][2] = { -  {440.0*pow(2.0,(59)/12.0), 8}, -  {440.0*pow(2.0,(60)/12.0), 8}, +float tone_dvorak[][2] = { +  {440.0*pow(2.0,(23)/12.0), 8}, +  {440.0*pow(2.0,(24)/12.0), 8},    {0, 4}, -  {440.0*pow(2.0,(67)/12.0), 8}, +  {440.0*pow(2.0,(31)/12.0), 8},    {0, 4}, -  {440.0*pow(2.0,(69)/12.0), 8}, +  {440.0*pow(2.0,(33)/12.0), 8},    {0, 4}, -  {440.0*pow(2.0,(67)/12.0), 8} +  {440.0*pow(2.0,(31)/12.0), 8} +}; + +float tone_music[][2] = { +  {440.0*pow(2.0,(12)/12.0), 8}, +  {440.0*pow(2.0,(14)/12.0), 8}, +  {440.0*pow(2.0,(16)/12.0), 8}, +  {440.0*pow(2.0,(17)/12.0), 8}, +  {440.0*pow(2.0,(19)/12.0), 8}, +  {440.0*pow(2.0,(21)/12.0), 8}, +  {440.0*pow(2.0,(23)/12.0), 8}, +  {440.0*pow(2.0,(24)/12.0), 8}  };  #endif +void persistant_default_layer_set(uint16_t default_layer) { +  eeconfig_write_default_layer(default_layer); +  default_layer_set(default_layer); +} +  const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)  { -  // MACRODOWN only works in this function        switch(id) { -        case _QW: +        case _QWERTY:            if (record->event.pressed) {              #ifdef AUDIO_ENABLE -              play_notes(&tone_qw, 4, false, 0); +              PLAY_NOTE_ARRAY(tone_qwerty, false, 0);              #endif -            default_layer_set(1UL<<_QW); +            persistant_default_layer_set(1UL<<_QWERTY);            }            break; -        case _CM: +        case _COLEMAK:            if (record->event.pressed) {              #ifdef AUDIO_ENABLE -              play_notes(&tone_cm, 6, false, 0); +              PLAY_NOTE_ARRAY(tone_colemak, false, 0);              #endif -            default_layer_set(1UL<<_CM); +            persistant_default_layer_set(1UL<<_COLEMAK);            }            break; -        case _DV: +        case _DVORAK:            if (record->event.pressed) {              #ifdef AUDIO_ENABLE -              play_notes(&tone_dv, 8, false, 0); +              PLAY_NOTE_ARRAY(tone_dvorak, false, 0);              #endif -            default_layer_set(1UL<<_DV); +            persistant_default_layer_set(1UL<<_DVORAK);            }            break; -        case _LW: +        case _LOWER:            if (record->event.pressed) { -            layer_on(_LW); -            update_tri_layer(_LW, _RS, _AD); +            layer_on(_LOWER); +            update_tri_layer(_LOWER, _RAISE, _ADJUST);            } else { -            layer_off(_LW); -            update_tri_layer(_LW, _RS, _AD); +            layer_off(_LOWER); +            update_tri_layer(_LOWER, _RAISE, _ADJUST);            }            break; -        case _RS: +        case _RAISE:            if (record->event.pressed) { -            layer_on(_RS); -            update_tri_layer(_LW, _RS, _AD); +            layer_on(_RAISE); +            update_tri_layer(_LOWER, _RAISE, _ADJUST);            } else { -            layer_off(_RS); -            update_tri_layer(_LW, _RS, _AD); +            layer_off(_RAISE); +            update_tri_layer(_LOWER, _RAISE, _ADJUST);            }            break;          case M_BL: @@ -254,7 +282,23 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)            if (record->event.pressed) {              #ifdef AUDIO_ENABLE                audio_on(); -              play_notes(&start_up, 5, false, 0); +              PLAY_NOTE_ARRAY(tone_startup, false, 0); +            #endif +          } +        break; +        case 8: +          if (record->event.pressed) { +            #ifdef AUDIO_ENABLE +              layer_off(_MUSIC); +              stop_all_notes(); +            #endif +          } +        break; +        case 9: +          if (record->event.pressed) { +            #ifdef AUDIO_ENABLE +              PLAY_NOTE_ARRAY(tone_music, false, 0); +              layer_on(_MUSIC);              #endif            }          break; @@ -262,9 +306,24 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)      return MACRO_NONE;  }; +uint8_t starting_note = 0x0C; +int offset = 7; + +void process_action_user(keyrecord_t *record) { + +  if (IS_LAYER_ON(_MUSIC)) { +    if (record->event.pressed) { +        play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF); +    } else { +        stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row))); +    } +  } + +} +  void matrix_init_user(void) {    #ifdef AUDIO_ENABLE      init_notes(); -    play_notes(&start_up, 5, false, 0); +    PLAY_NOTE_ARRAY(tone_startup, false, 0);    #endif  } diff --git a/keyboard/preonic/Makefile b/keyboard/preonic/Makefile index 9199968c3d..3504e27201 100644 --- a/keyboard/preonic/Makefile +++ b/keyboard/preonic/Makefile @@ -133,7 +133,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096  BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)  MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)  EXTRAKEY_ENABLE = yes       # Audio control and System control(+450) -CONSOLE_ENABLE = yes        # Console for debug(+400) +CONSOLE_ENABLE = no        # Console for debug(+400)  COMMAND_ENABLE = yes        # Commands for debug and configuration  NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work  BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality diff --git a/keyboard/preonic/config.h b/keyboard/preonic/config.h index 5528667fa7..bb9d29dab7 100644 --- a/keyboard/preonic/config.h +++ b/keyboard/preonic/config.h @@ -73,10 +73,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.   */  /* disable debug print */ -#define NO_DEBUG +// #define NO_DEBUG  /* disable print */ -#define NO_PRINT +// #define NO_PRINT  /* disable action features */  //#define NO_ACTION_LAYER diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c index 1223793cfa..48bc72dab7 100644 --- a/keyboard/preonic/keymaps/default/keymap.c +++ b/keyboard/preonic/keymaps/default/keymap.c @@ -3,11 +3,6 @@  #include "eeconfig.h"  #ifdef AUDIO_ENABLE    #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  // 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:            if (record->event.pressed) {              #ifdef AUDIO_ENABLE -              play_notes(&tone_qwerty, 4, false, 0); +              PLAY_NOTE_ARRAY(tone_qwerty, false, 0);              #endif              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:            if (record->event.pressed) {              #ifdef AUDIO_ENABLE -              play_notes(&tone_colemak, 6, false, 1); +              PLAY_NOTE_ARRAY(tone_colemak, false, 0);              #endif              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:            if (record->event.pressed) {              #ifdef AUDIO_ENABLE -              play_notes(&tone_dvorak, 8, false, 10); +              PLAY_NOTE_ARRAY(tone_dvorak, false, 0);              #endif              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) {              #ifdef AUDIO_ENABLE                audio_on(); -              play_notes(&start_up, 4, false, 0); +              PLAY_NOTE_ARRAY(start_up, false, 0);              #endif            }          break; @@ -317,7 +312,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)          case 9:            if (record->event.pressed) {              #ifdef AUDIO_ENABLE -              play_notes(&tone_music, 8, false, 0); +              PLAY_NOTE_ARRAY(tone_music, false, 0);                layer_on(_MUSIC);              #endif            } @@ -344,6 +339,6 @@ void process_action_user(keyrecord_t *record) {  void matrix_init_user(void) {    #ifdef AUDIO_ENABLE      init_notes(); -    play_notes(&start_up, 4, false, 0); +    play_notes(&start_up, false, 0);    #endif  } diff --git a/quantum/audio.c b/quantum/audio.c index 58b9ab76bf..3ccd5ab9bc 100644 --- a/quantum/audio.c +++ b/quantum/audio.c @@ -353,7 +353,6 @@ if (audio_config.enable) {      if (note)          stop_all_notes(); -    notes = true;      notes_pointer = np;      notes_count = n_count; @@ -378,6 +377,8 @@ if (audio_config.enable) {          TIMSK3 |= _BV(OCIE3A);          TCCR3A |= _BV(COM3A1);      #endif + +    notes = true;  }  } @@ -407,7 +408,6 @@ if (audio_config.enable && voices < 8) {      if (notes)          stop_all_notes(); -    note = true;      #ifdef PWM_AUDIO          freq = freq / SAMPLE_RATE;      #endif @@ -439,6 +439,7 @@ if (audio_config.enable && voices < 8) {          TCCR3A |= _BV(COM3A1);      #endif +    note = true;  }  } diff --git a/quantum/audio.h b/quantum/audio.h index 8012aa6bf1..3aba8370ac 100644 --- a/quantum/audio.h +++ b/quantum/audio.h @@ -31,6 +31,12 @@ 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), \ +						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. diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index ce1d007f3a..c705b7a730 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -34,12 +34,14 @@ extern keymap_config_t keymap_config;  #include <inttypes.h>  #ifdef AUDIO_ENABLE      #include "audio.h" - -    float goodbye[][2] = { -        {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}, -    }; +    #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  static action_t keycode_to_action(uint16_t keycode); @@ -190,7 +192,7 @@ static action_t keycode_to_action(uint16_t keycode)          case RESET: ; // RESET is 0x5000, which is why this is here              clear_keyboard();              #ifdef AUDIO_ENABLE -                PLAY_NOTE_ARRAY(goodbye, false, 0); +                PLAY_NOTE_ARRAY(tone_goodbye, false, 0);              #endif              _delay_ms(250);              #ifdef ATREUS_ASTAR | 
