diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-02-15 15:07:13 +1100 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-02-14 20:07:13 -0800 |
| commit | 9e4ac6cf29e6b2ce950135c8f877c95f2d1f1d55 (patch) | |
| tree | df6cfe88ce0f51ea5ca7fd6b93aae7eaed67d8a5 /keyboards/amj60 | |
| parent | d5bc7fc1575543eb27cffcc465a8f0c4e11b7de7 (diff) | |
| download | qmk_firmware-9e4ac6cf29e6b2ce950135c8f877c95f2d1f1d55.tar.gz qmk_firmware-9e4ac6cf29e6b2ce950135c8f877c95f2d1f1d55.zip | |
Migrate fn_actions for default keymaps (#4935)
* Migrate fn_actions for default keymaps
* Rename the Grave/Escape Shift masks
* No need for shift_esc_shift_mask
* Change breaks to return false
* Right align pointers
* Add default case
* Separate cases with empty lines
Diffstat (limited to 'keyboards/amj60')
| -rw-r--r-- | keyboards/amj60/keymaps/iso_split_rshift/keymap.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/keyboards/amj60/keymaps/iso_split_rshift/keymap.c b/keyboards/amj60/keymaps/iso_split_rshift/keymap.c index b5fd731dd..ca5fa92be 100644 --- a/keyboards/amj60/keymaps/iso_split_rshift/keymap.c +++ b/keyboards/amj60/keymaps/iso_split_rshift/keymap.c | |||
| @@ -111,21 +111,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 111 | [_SFX] = LAYOUT_iso_splitrshift( | 111 | [_SFX] = LAYOUT_iso_splitrshift( |
| 112 | RESET, _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, KC_BSPC, \ | 112 | RESET, _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, KC_BSPC, \ |
| 113 | _______, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, KC_BSLS, \ | 113 | _______, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, KC_BSLS, \ |
| 114 | _______, F(2), F(3), _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, XXXXXXX, KC_ENT, \ | 114 | _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, XXXXXXX, KC_ENT, \ |
| 115 | _______, F(4), F(5), F(6), F(7), F(8), F(9), _______, _______, KC_0, _______, KC_SLSH, KC_UP, _______, \ | 115 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_0, _______, KC_SLSH, KC_UP, _______, \ |
| 116 | _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT), | 116 | _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT), |
| 117 | }; | 117 | }; |
| 118 | 118 | ||
| 119 | enum function_id { | ||
| 120 | LAUNCH, | ||
| 121 | RGBLED_TOGGLE, | ||
| 122 | }; | ||
| 123 | |||
| 124 | const uint16_t PROGMEM fn_actions[] = { | ||
| 125 | [1] = ACTION_FUNCTION(LAUNCH), | ||
| 126 | [10] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_ENT), | ||
| 127 | }; | ||
| 128 | |||
| 129 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 119 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 130 | { | 120 | { |
| 131 | // MACRODOWN only works in this function | 121 | // MACRODOWN only works in this function |
