diff options
| author | Balz Guenat <balz.guenat@gmail.com> | 2017-08-07 21:54:06 +0200 |
|---|---|---|
| committer | Balz Guenat <balz.guenat@gmail.com> | 2017-08-07 21:54:06 +0200 |
| commit | d18df8ef7a7e0528a29fdc96d4843ace54605121 (patch) | |
| tree | 44f75b9bccd3efa130d622736726a5f1c83531f6 /keyboards/minidox/keymaps/that_canadian/keymap.c | |
| parent | 308bec28bb76f4305d0f084252d7cf207f1b3d83 (diff) | |
| parent | 933701c2129c0c585ecd8ba37c41b091a7dc687f (diff) | |
Merge remote-tracking branch 'upstream/master' into bananasplit
# Conflicts:
# keyboards/bananasplit/Makefile
# keyboards/bananasplit/bananasplit.c
# keyboards/bananasplit/bananasplit.h
# keyboards/bananasplit/config.h
# keyboards/bananasplit/keymaps/default/keymap.c
# keyboards/bananasplit/rules.mk
Diffstat (limited to 'keyboards/minidox/keymaps/that_canadian/keymap.c')
| -rw-r--r-- | keyboards/minidox/keymaps/that_canadian/keymap.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/keyboards/minidox/keymaps/that_canadian/keymap.c b/keyboards/minidox/keymaps/that_canadian/keymap.c index 5d55d18251..b1ca139b7b 100644 --- a/keyboards/minidox/keymaps/that_canadian/keymap.c +++ b/keyboards/minidox/keymaps/that_canadian/keymap.c @@ -40,11 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Z | X | C | V | B | | N | M | , | . | / | * `----------------------------------' `----------------------------------' * ,--------------------. ,------,-------------. -<<<<<<< HEAD * | Shift| LOWER| | | | RAISE| Ctrl | -======= - * | Ctrl | LOWER| | | | RAISE| Shift| ->>>>>>> a4958a532da154b9dd6f6144836a73f9de641f74 * `-------------| Space| |BckSpc|------+------. * | | | | * `------' `------' @@ -105,9 +101,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,----------------------------------. ,----------------------------------. * | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | Up | F9 | F10 | * |------+------+------+------+------| |------+------+------+------+------| - * | F11 | F12 | | | | | | Left | Down |Right |caltde| + * | F11 | F12 | |RGBSAI|RGBSAD| | | Left | Down |Right |caltde| * |------+------+------+------+------| |------+------+------+------+------| - * | Reset| | | | | | | | F8 |Taskmg| | + * | Reset|RGBTOG|RGBMOD|RGBHUI|RGBHUD| |RGBVAI|RGBVAD| F8 |Taskmg| | * `----------------------------------' `----------------------------------' * ,--------------------. ,------,-------------. * | | LOWER| | | | RAISE| | @@ -123,10 +119,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -#ifdef AUDIO_ENABLE -float tone_qwerty[][2] = SONG(QWERTY_SOUND); -#endif - void persistant_default_layer_set(uint16_t default_layer) { eeconfig_update_default_layer(default_layer); default_layer_set(default_layer); @@ -136,9 +128,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_qwerty, false, 0); - #endif persistant_default_layer_set(1UL<<_QWERTY); } return false; |