Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

updates preonic default keymap

Browse source
This commit is contained in:
Jack Humbert 2016-04-25 00:22:35 -04:00
parent 130a485bf7
commit 9fb1e5441f
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,10 +24,8 @@
#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)
@ -163,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+-------------+------+------+------+------+------| * |------+------+------+------+------+-------------+------+------+------+------+------|
* | | | |Audoff|Aud on|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | * | | | |Audoff|Aud on|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | |
* |------+------+------+------+------+------|------+------+------+------+------+------| * |------+------+------+------+------+------|------+------+------+------+------+------|
* | | | |Musoff|Mus on| | | | | | | | * | |Voice-|Voice+|Musoff|Mus on| | | | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------| * |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | | * | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------' * `-----------------------------------------------------------------------------------'
@ -310,6 +308,16 @@ 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); // gets rid of tick
PLAY_NOTE_ARRAY(start_up, false, 0);
#endif
}
#ifdef AUDIO_ENABLE
uint8_t starting_note = 0x0C; uint8_t starting_note = 0x0C;
int offset = 7; int offset = 7;
@ -325,18 +333,10 @@ void process_action_user(keyrecord_t *record) {
} }
void matrix_init_user(void) {
_delay_ms(10); // gets rid of tick
play_startup_tone();
}
void play_startup_tone()
{
PLAY_NOTE_ARRAY(start_up, false, 0);
}
void play_goodbye_tone() void play_goodbye_tone()
{ {
PLAY_NOTE_ARRAY(goodbye, false, 0); PLAY_NOTE_ARRAY(goodbye, false, 0);
_delay_ms(150); _delay_ms(150);
} }
#endif