Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

updates planck default keymap

Browse source
This commit is contained in:
Jack Humbert 2016-04-25 00:15:21 -04:00
parent f32f80cf32
commit 130a485bf7
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
keyboard/planck/keymaps/default/keymap.c
View file

@ -30,10 +30,8 @@ extern keymap_config_t keymap_config;
#define LOWER M(_LOWER) #define LOWER M(_LOWER)
#define RAISE M(_RAISE) #define RAISE M(_RAISE)
#define M_BL 5 #define M_BL 5
#ifdef AUDIO_ENABLE
#define AUD_OFF M(6) #define AUD_OFF M(6)
#define AUD_ON M(7) #define AUD_ON M(7)
#endif
#define MUS_OFF M(8) #define MUS_OFF M(8)
#define MUS_ON M(9) #define MUS_ON M(9)
#define VC_IN M(10) #define VC_IN M(10)
@ -172,7 +170,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+-------------+------+------+------+------+------| * |------+------+------+------+------+-------------+------+------+------+------+------|
* | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| | * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| |
* |------+------+------+------+------+------|------+------+------+------+------+------| * |------+------+------+------+------+------|------+------+------+------+------+------|
* | | | |Mus on|Musoff| | | | | | | | * | |Voice-|Voice+|Mus on|Musoff| | | | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------| * |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | | * | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------' * `-----------------------------------------------------------------------------------'
@ -208,7 +206,6 @@ float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
float goodbye[][2] = SONG(GOODBYE_SOUND); float goodbye[][2] = SONG(GOODBYE_SOUND);
#endif #endif
@ -351,6 +348,20 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
return MACRO_NONE; return MACRO_NONE;
}; };
void matrix_init_user(void) {
#ifdef AUDIO_ENABLE
_delay_ms(20); // stops the tick
PLAY_NOTE_ARRAY(tone_startup, false, 0);
#endif
}
#ifdef AUDIO_ENABLE
void play_goodbye_tone()
{
PLAY_NOTE_ARRAY(goodbye, false, 0);
_delay_ms(150);
}
uint8_t starting_note = 0x0C; uint8_t starting_note = 0x0C;
int offset = 7; int offset = 7;
@ -365,16 +376,4 @@ void process_action_user(keyrecord_t *record) {
} }
} }
void matrix_init_user(void) {
#ifdef AUDIO_ENABLE
_delay_ms(10); // stops the tick
PLAY_NOTE_ARRAY(tone_startup, false, 0);
#endif #endif
}
void play_goodbye_tone()
{
PLAY_NOTE_ARRAY(goodbye, false, 0);
_delay_ms(150);
}