diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-07-16 16:04:02 +1000 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-07-15 23:04:02 -0700 |
| commit | f14629ed1cd7c7ec9089604d64f29a99981558e8 (patch) | |
| tree | a3691f4f3cb0c941694c16a3a94f73befb6ef6ec /keyboards/thevankeyboards/minivan | |
| parent | 2a231457bd494079c36cf3e07c9b887016adb491 (diff) | |
| download | qmk_firmware-f14629ed1cd7c7ec9089604d64f29a99981558e8.tar.gz qmk_firmware-f14629ed1cd7c7ec9089604d64f29a99981558e8.zip | |
Remove/migrate action_get_macro()s from default keymaps (#5625)
* Remove/migrate action_get_macro()s from default keymaps
* Leave these breaks alone
Diffstat (limited to 'keyboards/thevankeyboards/minivan')
| -rw-r--r-- | keyboards/thevankeyboards/minivan/keymaps/default/keymap.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c index bc6c213f0..ac19f8ccd 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c | |||
| @@ -14,16 +14,17 @@ extern keymap_config_t keymap_config; | |||
| 14 | #define _L2 4 | 14 | #define _L2 4 |
| 15 | #define _L3 5 | 15 | #define _L3 5 |
| 16 | 16 | ||
| 17 | // Macro name shortcuts | ||
| 18 | #define QWERTY M(_QW) | ||
| 19 | #define DVORAK M(_DV) | ||
| 20 | #define COLEMAK M(_CM) | ||
| 21 | |||
| 22 | // Curly braces have their own keys. These are defined to make them not mess up | 17 | // Curly braces have their own keys. These are defined to make them not mess up |
| 23 | // the grid in layer 2. | 18 | // the grid in layer 2. |
| 24 | #define L_CURBR LSFT(KC_LBRC) | 19 | #define L_CURBR LSFT(KC_LBRC) |
| 25 | #define R_CURBR LSFT(KC_RBRC) | 20 | #define R_CURBR LSFT(KC_RBRC) |
| 26 | 21 | ||
| 22 | enum custom_keycodes { | ||
| 23 | DVORAK = SAFE_RANGE, | ||
| 24 | QWERTY, | ||
| 25 | COLEMAK | ||
| 26 | }; | ||
| 27 | |||
| 27 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 28 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 28 | [_QW] = LAYOUT( /* Qwerty */ | 29 | [_QW] = LAYOUT( /* Qwerty */ |
| 29 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 30 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
| @@ -68,24 +69,25 @@ void persistent_default_layer_set(uint16_t default_layer) { | |||
| 68 | default_layer_set(default_layer); | 69 | default_layer_set(default_layer); |
| 69 | } | 70 | } |
| 70 | 71 | ||
| 71 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 72 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 72 | { | 73 | switch(keycode) { |
| 73 | switch(id) { | 74 | case DVORAK: |
| 74 | case _DV: | ||
| 75 | if (record->event.pressed) { | 75 | if (record->event.pressed) { |
| 76 | persistent_default_layer_set(1UL<<_DV); | 76 | persistent_default_layer_set(1UL<<_DV); |
| 77 | } | 77 | } |
| 78 | break; | 78 | return false; |
| 79 | case _QW: | 79 | case QWERTY: |
| 80 | if (record->event.pressed) { | 80 | if (record->event.pressed) { |
| 81 | persistent_default_layer_set(1UL<<_QW); | 81 | persistent_default_layer_set(1UL<<_QW); |
| 82 | } | 82 | } |
| 83 | break; | 83 | return false; |
| 84 | case _CM: | 84 | case COLEMAK: |
| 85 | if (record->event.pressed) { | 85 | if (record->event.pressed) { |
| 86 | persistent_default_layer_set(1UL<<_CM); | 86 | persistent_default_layer_set(1UL<<_CM); |
| 87 | } | 87 | } |
| 88 | break; | 88 | return false; |
| 89 | default: | ||
| 90 | return true; | ||
| 89 | } | 91 | } |
| 90 | return MACRO_NONE; | 92 | return true; |
| 91 | }; | 93 | }; |
