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/amj40 | |
| 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/amj40')
| -rwxr-xr-x | keyboards/amj40/keymaps/default/keymap.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/keyboards/amj40/keymaps/default/keymap.c b/keyboards/amj40/keymaps/default/keymap.c index c81317b84..406ea8d25 100755 --- a/keyboards/amj40/keymaps/default/keymap.c +++ b/keyboards/amj40/keymaps/default/keymap.c | |||
| @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 45 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ | 45 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ |
| 46 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,\ | 46 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,\ |
| 47 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,\ | 47 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,\ |
| 48 | KC_LCTL, KC_LGUI, KC_LALT, F(0), F(1), F(2), KC_RALT, KC_RCTL \ | 48 | KC_LCTL, KC_LGUI, KC_LALT, LT(_LOWER, KC_SPC),LT(_RAISE, KC_SPC),LT(_ADJUST, KC_LGUI), KC_RALT, KC_RCTL \ |
| 49 | ), | 49 | ), |
| 50 | 50 | ||
| 51 | /* Function Layer 1 HHKB style | 51 | /* Function Layer 1 HHKB style |
| @@ -106,24 +106,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 106 | 106 | ||
| 107 | }; | 107 | }; |
| 108 | 108 | ||
| 109 | |||
| 110 | |||
| 111 | |||
| 112 | enum function_id { | ||
| 113 | LAUNCH, | ||
| 114 | RGBLED_TOGGLE, | ||
| 115 | }; | ||
| 116 | |||
| 117 | const uint16_t PROGMEM fn_actions[] = { | ||
| 118 | [0] = ACTION_LAYER_TAP_KEY(_LOWER, KC_SPC), | ||
| 119 | [1] = ACTION_LAYER_TAP_KEY(_RAISE, KC_SPC), | ||
| 120 | [2] = ACTION_LAYER_TAP_KEY(_ADJUST, KC_LGUI), | ||
| 121 | |||
| 122 | }; | ||
| 123 | |||
| 124 | |||
| 125 | |||
| 126 | |||
| 127 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 109 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 128 | { | 110 | { |
| 129 | // MACRODOWN only works in this function | 111 | // MACRODOWN only works in this function |
