diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-01-25 02:38:44 +1100 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-01-24 07:38:44 -0800 |
| commit | b5feae07c27eb8fcac07d165091cce186e253be8 (patch) | |
| tree | 7e2b6a079eea2cef831af9bf23f6754744134bd9 | |
| parent | 5d1ea88bf7c16b858dd94d9a0ce5a351a49f6e07 (diff) | |
| download | qmk_firmware-b5feae07c27eb8fcac07d165091cce186e253be8.tar.gz qmk_firmware-b5feae07c27eb8fcac07d165091cce186e253be8.zip | |
Remove unused fn_actions[] and action_function() in default keymaps (#4829)
18 files changed, 18 insertions, 153 deletions
diff --git a/keyboards/alu84/keymaps/default/keymap.c b/keyboards/alu84/keymaps/default/keymap.c index 10dbe273a..8c0801070 100755 --- a/keyboards/alu84/keymaps/default/keymap.c +++ b/keyboards/alu84/keymaps/default/keymap.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #include QMK_KEYBOARD_H | 1 | #include QMK_KEYBOARD_H |
| 2 | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | ||
| 3 | 2 | ||
| 4 | #define _BL 0 | 3 | #define _BL 0 |
| 5 | #define _FN1 1 | 4 | #define _FN1 1 |
| @@ -108,37 +107,3 @@ void led_set_user(uint8_t usb_led) { | |||
| 108 | } | 107 | } |
| 109 | 108 | ||
| 110 | } | 109 | } |
| 111 | |||
| 112 | enum function_id { | ||
| 113 | SHIFT_ESC, | ||
| 114 | }; | ||
| 115 | |||
| 116 | const uint16_t PROGMEM fn_actions[] = { | ||
| 117 | [0] = ACTION_FUNCTION(SHIFT_ESC), | ||
| 118 | }; | ||
| 119 | |||
| 120 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 121 | static uint8_t shift_esc_shift_mask; | ||
| 122 | switch (id) { | ||
| 123 | case SHIFT_ESC: | ||
| 124 | shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; | ||
| 125 | if (record->event.pressed) { | ||
| 126 | if (shift_esc_shift_mask) { | ||
| 127 | add_key(KC_GRV); | ||
| 128 | send_keyboard_report(); | ||
| 129 | } else { | ||
| 130 | add_key(KC_ESC); | ||
| 131 | send_keyboard_report(); | ||
| 132 | } | ||
| 133 | } else { | ||
| 134 | if (shift_esc_shift_mask) { | ||
| 135 | del_key(KC_GRV); | ||
| 136 | send_keyboard_report(); | ||
| 137 | } else { | ||
| 138 | del_key(KC_ESC); | ||
| 139 | send_keyboard_report(); | ||
| 140 | } | ||
| 141 | } | ||
| 142 | break; | ||
| 143 | } | ||
| 144 | } \ No newline at end of file | ||
diff --git a/keyboards/amjpad/keymaps/default/keymap.c b/keyboards/amjpad/keymaps/default/keymap.c index 1ec81e6db..01621d54f 100644 --- a/keyboards/amjpad/keymaps/default/keymap.c +++ b/keyboards/amjpad/keymaps/default/keymap.c | |||
| @@ -4,9 +4,6 @@ | |||
| 4 | #include "rgblight.h" | 4 | #include "rgblight.h" |
| 5 | #endif | 5 | #endif |
| 6 | 6 | ||
| 7 | // Used for SHIFT_ESC | ||
| 8 | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | ||
| 9 | |||
| 10 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 7 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
| 11 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 8 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
| 12 | // Layer names don't all need to be of the same length, obviously, and you can also skip them | 9 | // Layer names don't all need to be of the same length, obviously, and you can also skip them |
| @@ -66,37 +63,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 66 | KC_P0, LT(_FL,KC_PDOT), KC_PENT \ | 63 | KC_P0, LT(_FL,KC_PDOT), KC_PENT \ |
| 67 | ), | 64 | ), |
| 68 | }; | 65 | }; |
| 69 | |||
| 70 | enum function_id { | ||
| 71 | SHIFT_ESC, | ||
| 72 | }; | ||
| 73 | |||
| 74 | const uint16_t PROGMEM fn_actions[] = { | ||
| 75 | [0] = ACTION_FUNCTION(SHIFT_ESC), | ||
| 76 | }; | ||
| 77 | |||
| 78 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 79 | static uint8_t shift_esc_shift_mask; | ||
| 80 | switch (id) { | ||
| 81 | case SHIFT_ESC: | ||
| 82 | shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; | ||
| 83 | if (record->event.pressed) { | ||
| 84 | if (shift_esc_shift_mask) { | ||
| 85 | add_key(KC_GRV); | ||
| 86 | send_keyboard_report(); | ||
| 87 | } else { | ||
| 88 | add_key(KC_ESC); | ||
| 89 | send_keyboard_report(); | ||
| 90 | } | ||
| 91 | } else { | ||
| 92 | if (shift_esc_shift_mask) { | ||
| 93 | del_key(KC_GRV); | ||
| 94 | send_keyboard_report(); | ||
| 95 | } else { | ||
| 96 | del_key(KC_ESC); | ||
| 97 | send_keyboard_report(); | ||
| 98 | } | ||
| 99 | } | ||
| 100 | break; | ||
| 101 | } | ||
| 102 | } | ||
diff --git a/keyboards/bface/keymaps/default/keymap.c b/keyboards/bface/keymaps/default/keymap.c index 9c41014bc..a3e9bc957 100644 --- a/keyboards/bface/keymaps/default/keymap.c +++ b/keyboards/bface/keymaps/default/keymap.c | |||
| @@ -41,7 +41,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 41 | KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS | 41 | KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS |
| 42 | ), // */ | 42 | ), // */ |
| 43 | }; | 43 | }; |
| 44 | |||
| 45 | const uint16_t PROGMEM fn_actions[] = { | ||
| 46 | [0] = ACTION_LAYER_MOMENTARY(1), | ||
| 47 | }; | ||
diff --git a/keyboards/cospad/keymaps/default/keymap.c b/keyboards/cospad/keymaps/default/keymap.c index 3cea2f8e6..f066ad677 100644 --- a/keyboards/cospad/keymaps/default/keymap.c +++ b/keyboards/cospad/keymaps/default/keymap.c | |||
| @@ -63,11 +63,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 63 | KC_P0, RESET, KC_PENT), | 63 | KC_P0, RESET, KC_PENT), |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | |||
| 67 | const uint16_t PROGMEM fn_actions[] = { | ||
| 68 | [0] = MO(_FL), | ||
| 69 | }; | ||
| 70 | |||
| 71 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 72 | switch (keycode) { | 67 | switch (keycode) { |
| 73 | case BL_TOGG: | 68 | case BL_TOGG: |
diff --git a/keyboards/cu75/keymaps/default/keymap.c b/keyboards/cu75/keymaps/default/keymap.c index 9fbd41089..e8abbb6f1 100644 --- a/keyboards/cu75/keymaps/default/keymap.c +++ b/keyboards/cu75/keymaps/default/keymap.c | |||
| @@ -61,12 +61,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 61 | ), | 61 | ), |
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | const uint16_t PROGMEM fn_actions[] = { | ||
| 65 | ACTION_FUNCTION(LFK_CLEAR), // FN0 - reset layers | ||
| 66 | ACTION_FUNCTION(LFK_ESC_TILDE), // FN1 - esc+shift = ~, else escape | ||
| 67 | }; | ||
| 68 | |||
| 69 | |||
| 70 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 64 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 71 | { | 65 | { |
| 72 | // MACRODOWN only works in this function | 66 | // MACRODOWN only works in this function |
diff --git a/keyboards/cu75/keymaps/iso/keymap.c b/keyboards/cu75/keymaps/iso/keymap.c index 7f5952c1c..040029084 100644 --- a/keyboards/cu75/keymaps/iso/keymap.c +++ b/keyboards/cu75/keymaps/iso/keymap.c | |||
| @@ -60,12 +60,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 60 | ), | 60 | ), |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | const uint16_t PROGMEM fn_actions[] = { | ||
| 64 | ACTION_FUNCTION(LFK_CLEAR), // FN0 - reset layers | ||
| 65 | ACTION_FUNCTION(LFK_ESC_TILDE), // FN1 - esc+shift = ~, else escape | ||
| 66 | }; | ||
| 67 | |||
| 68 | |||
| 69 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 63 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 70 | { | 64 | { |
| 71 | // MACRODOWN only works in this function | 65 | // MACRODOWN only works in this function |
diff --git a/keyboards/ergodox_ez/keymaps/testing/keymap.c b/keyboards/ergodox_ez/keymaps/testing/keymap.c index df0ed073f..2fdd12236 100644 --- a/keyboards/ergodox_ez/keymaps/testing/keymap.c +++ b/keyboards/ergodox_ez/keymaps/testing/keymap.c | |||
| @@ -28,10 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 28 | 28 | ||
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | const uint16_t PROGMEM fn_actions[] = { | ||
| 32 | [1] = ACTION_LAYER_TAP_TOGGLE(1) | ||
| 33 | }; | ||
| 34 | |||
| 35 | // leaving this in place for compatibilty with old keymaps cloned and re-compiled. | 31 | // leaving this in place for compatibilty with old keymaps cloned and re-compiled. |
| 36 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 32 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 37 | { | 33 | { |
diff --git a/keyboards/handwired/traveller/keymaps/default/keymap.c b/keyboards/handwired/traveller/keymaps/default/keymap.c index 13d889ab8..f7f08268f 100644 --- a/keyboards/handwired/traveller/keymaps/default/keymap.c +++ b/keyboards/handwired/traveller/keymaps/default/keymap.c | |||
| @@ -157,11 +157,8 @@ Right hand nav keys work pretty well chorded with the Right hand Hi Key | |||
| 157 | const uint16_t PROGMEM fn_actions[] = { | 157 | const uint16_t PROGMEM fn_actions[] = { |
| 158 | [_QW] = ACTION_LAYER_ON(_QW,ON_RELEASE), // return to QWERTY layer | 158 | [_QW] = ACTION_LAYER_ON(_QW,ON_RELEASE), // return to QWERTY layer |
| 159 | [_LW] = ACTION_LAYER_TAP_TOGGLE(_LW), // Turn on LW when holding, or tap 3 times to switch | 159 | [_LW] = ACTION_LAYER_TAP_TOGGLE(_LW), // Turn on LW when holding, or tap 3 times to switch |
| 160 | [_HI] = ACTION_LAYER_TAP_TOGGLE(_HI), // Turn on LW when holding, or tap 3 times to switch | ||
| 161 | [_NAV] = ACTION_LAYER_TOGGLE(_NAV), | 160 | [_NAV] = ACTION_LAYER_TOGGLE(_NAV), |
| 162 | [_FKEYS] = ACTION_LAYER_TOGGLE(_FKEYS), | 161 | [_FKEYS] = ACTION_LAYER_TOGGLE(_FKEYS), |
| 163 | [_LWOUT] = ACTION_LAYER_OFF(_LW,ON_RELEASE), | ||
| 164 | [_HIOUT] = ACTION_LAYER_OFF(_HI,ON_RELEASE), | ||
| 165 | 162 | ||
| 166 | // Functions | 163 | // Functions |
| 167 | [RGBLED_TOGGLE] = ACTION_FUNCTION(RGBLED_TOGGLE), | 164 | [RGBLED_TOGGLE] = ACTION_FUNCTION(RGBLED_TOGGLE), |
diff --git a/keyboards/katana60/keymaps/colemak/keymap.c b/keyboards/katana60/keymaps/colemak/keymap.c index 9a1af8d68..63768f937 100644 --- a/keyboards/katana60/keymaps/colemak/keymap.c +++ b/keyboards/katana60/keymaps/colemak/keymap.c | |||
| @@ -67,12 +67,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 67 | 67 | ||
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | |||
| 71 | const uint16_t PROGMEM fn_actions[] = { | ||
| 72 | [0] = ACTION_LAYER_TAP_KEY(CURS, KC_BSPC), | ||
| 73 | [1] = ACTION_LAYER_TAP_KEY(SYMB, KC_SPACE), | ||
| 74 | }; | ||
| 75 | |||
| 76 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 70 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 77 | { | 71 | { |
| 78 | // MACRODOWN only works in this function | 72 | // MACRODOWN only works in this function |
diff --git a/keyboards/katana60/keymaps/default/keymap.c b/keyboards/katana60/keymaps/default/keymap.c index abc018952..d4e77e26d 100644 --- a/keyboards/katana60/keymaps/default/keymap.c +++ b/keyboards/katana60/keymaps/default/keymap.c | |||
| @@ -67,12 +67,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 67 | 67 | ||
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | |||
| 71 | const uint16_t PROGMEM fn_actions[] = { | ||
| 72 | [0] = ACTION_LAYER_TAP_KEY(CURS, KC_BSPC), | ||
| 73 | [1] = ACTION_LAYER_TAP_KEY(SYMB, KC_SPACE), | ||
| 74 | }; | ||
| 75 | |||
| 76 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 70 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 77 | { | 71 | { |
| 78 | // MACRODOWN only works in this function | 72 | // MACRODOWN only works in this function |
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c index e215033a2..18d5d8cad 100644 --- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c | |||
| @@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 89 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX, \ | 89 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, XXXXXXX, XXXXXXX, XXXXXXX, \ |
| 90 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, \ | 90 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, \ |
| 91 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN2, RGB_MOD, RGB_VAD, XXXXXXX, \ | 91 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN2, RGB_MOD, RGB_VAD, XXXXXXX, \ |
| 92 | AU_TOG, KC_F1, KC_FN3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ | 92 | AU_TOG, KC_FN1, KC_FN3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, \ |
| 93 | KC_FN5, KC_FN2, KC_FN4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ | 93 | KC_FN5, KC_FN2, KC_FN4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ |
| 94 | XXXXXXX, XXXXXXX, XXXXXXX, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI \ | 94 | XXXXXXX, XXXXXXX, XXXXXXX, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI \ |
| 95 | ), | 95 | ), |
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c index ec8bedbb0..a916f80f1 100644 --- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c +++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c | |||
| @@ -96,16 +96,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 96 | }; | 96 | }; |
| 97 | 97 | ||
| 98 | const uint16_t PROGMEM fn_actions[] = { | 98 | const uint16_t PROGMEM fn_actions[] = { |
| 99 | ACTION_FUNCTION(LFK_CLEAR), // FN0 - reset layers | 99 | [0] = ACTION_FUNCTION(LFK_CLEAR), // FN0 - reset layers |
| 100 | ACTION_FUNCTION(LFK_ESC_TILDE), // FN1 - esc+shift = ~, else escape | 100 | [3] = ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER), // FN3 - Increase Freq of audio click |
| 101 | ACTION_FUNCTION(LFK_LED_TEST), // FN2 - cycle through LEDs for testing | 101 | [4] = ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER), // FN4 - Decrease Freq of audio click |
| 102 | ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER), // FN3 - Increase Freq of audio click | 102 | [5] = ACTION_FUNCTION(LFK_CLICK_TIME_LONGER), // FN5 - Increase length of audio click |
| 103 | ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER), // FN4 - Decrease Freq of audio click | 103 | [6] = ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN6 - Decrease length of audio click |
| 104 | ACTION_FUNCTION(LFK_CLICK_TIME_LONGER), // FN5 - Increase length of audio click | 104 | [7] = ACTION_FUNCTION(LFK_CLICK_TOGGLE), // FN7 - Toggle audio click |
| 105 | ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN6 - Decrease length of audio click | ||
| 106 | ACTION_FUNCTION(LFK_CLICK_TOGGLE), // FN7 - Toggle audio click | ||
| 107 | ACTION_FUNCTION(LFK_LED_TEST), // FN8 - cycle through LEDs for testing | ||
| 108 | ACTION_FUNCTION(LFK_DEBUG_SETTINGS), // FN9 - prints LED and click settings to HID | ||
| 109 | }; | 105 | }; |
| 110 | 106 | ||
| 111 | 107 | ||
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c index 443064748..dc064ebf2 100644 --- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c | |||
| @@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 85 | [SETTINGS] = LAYOUT( | 85 | [SETTINGS] = LAYOUT( |
| 86 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX, \ | 86 | KC_FN0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_INC, BL_TOGG, RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX, \ |
| 87 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN2, RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX, \ | 87 | MU_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_FN2, RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX, \ |
| 88 | AU_TOG, KC_F1, KC_FN3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ | 88 | AU_TOG, KC_FN1, KC_FN3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ |
| 89 | KC_FN5, KC_FN2, KC_FN4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ | 89 | KC_FN5, KC_FN2, KC_FN4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ |
| 90 | XXXXXXX, XXXXXXX, XXXXXXX, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX \ | 90 | XXXXXXX, XXXXXXX, XXXXXXX, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX \ |
| 91 | ), | 91 | ), |
diff --git a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c index 26430a81b..757217ddb 100644 --- a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c | |||
| @@ -56,15 +56,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | const uint16_t PROGMEM fn_actions[] = { | 58 | const uint16_t PROGMEM fn_actions[] = { |
| 59 | ACTION_FUNCTION(LFK_CLEAR), // FN0 - reset layers | 59 | [1] = ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER), // FN1 - Increase Freq of audio click |
| 60 | ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER), // FN1 - Increase Freq of audio click | 60 | [2] = ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER), // FN2 - Decrease Freq of audio click |
| 61 | ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER), // FN2 - Decrease Freq of audio click | 61 | [3] = ACTION_FUNCTION(LFK_CLICK_TIME_LONGER), // FN3 - Increase length of audio click |
| 62 | ACTION_FUNCTION(LFK_CLICK_TIME_LONGER), // FN3 - Increase length of audio click | 62 | [4] = ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN4 - Decrease length of audio click |
| 63 | ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN4 - Decrease length of audio click | 63 | [5] = ACTION_FUNCTION(LFK_CLICK_TOGGLE), // FN5 - Toggle audio click |
| 64 | ACTION_FUNCTION(LFK_CLICK_TOGGLE), // FN5 - Toggle audio click | ||
| 65 | }; | 64 | }; |
| 66 | 65 | ||
| 67 | |||
| 68 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 66 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 69 | { | 67 | { |
| 70 | // MACRODOWN only works in this function | 68 | // MACRODOWN only works in this function |
diff --git a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c index 9adf722fd..40a7ee03f 100644 --- a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c +++ b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c | |||
| @@ -56,12 +56,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | const uint16_t PROGMEM fn_actions[] = { | 58 | const uint16_t PROGMEM fn_actions[] = { |
| 59 | ACTION_FUNCTION(LFK_CLEAR), // FN0 - reset layers | 59 | [1] = ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER), // FN1 - Increase Freq of audio click |
| 60 | ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER), // FN1 - Increase Freq of audio click | 60 | [2] = ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER), // FN2 - Decrease Freq of audio click |
| 61 | ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER), // FN2 - Decrease Freq of audio click | 61 | [3] = ACTION_FUNCTION(LFK_CLICK_TIME_LONGER), // FN3 - Increase length of audio click |
| 62 | ACTION_FUNCTION(LFK_CLICK_TIME_LONGER), // FN3 - Increase length of audio click | 62 | [4] = ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN4 - Decrease length of audio click |
| 63 | ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN4 - Decrease length of audio click | 63 | [5] = ACTION_FUNCTION(LFK_CLICK_TOGGLE), // FN5 - Toggle audio click |
| 64 | ACTION_FUNCTION(LFK_CLICK_TOGGLE), // FN5 - Toggle audio click | ||
| 65 | }; | 64 | }; |
| 66 | 65 | ||
| 67 | 66 | ||
diff --git a/layouts/community/ergodox/erez_experimental/keymap.c b/layouts/community/ergodox/erez_experimental/keymap.c index 481f984d5..1270188f9 100644 --- a/layouts/community/ergodox/erez_experimental/keymap.c +++ b/layouts/community/ergodox/erez_experimental/keymap.c | |||
| @@ -142,12 +142,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 142 | ), | 142 | ), |
| 143 | }; | 143 | }; |
| 144 | 144 | ||
| 145 | const uint16_t PROGMEM fn_actions[] = { | ||
| 146 | [1] = ACTION_LAYER_TAP_TOGGLE(SYMB), // FN1 - Momentary Layer 1 (Symbols) | ||
| 147 | [2] = ACTION_MACRO_TAP(0), // Eric Tang's Famous Macro! | ||
| 148 | [3] = ACTION_MACRO_TAP(1) // Eric Tang's Famous Macro! | ||
| 149 | }; | ||
| 150 | |||
| 151 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 145 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 152 | { | 146 | { |
| 153 | return MACRO_NONE; | 147 | return MACRO_NONE; |
diff --git a/layouts/community/ergodox/reset_eeprom/keymap.c b/layouts/community/ergodox/reset_eeprom/keymap.c index c960af9cb..9033205b9 100644 --- a/layouts/community/ergodox/reset_eeprom/keymap.c +++ b/layouts/community/ergodox/reset_eeprom/keymap.c | |||
| @@ -60,10 +60,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 60 | ) | 60 | ) |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | const uint16_t PROGMEM fn_actions[] = { | ||
| 64 | [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) | ||
| 65 | }; | ||
| 66 | |||
| 67 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 63 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 68 | { | 64 | { |
| 69 | // MACRODOWN only works in this function | 65 | // MACRODOWN only works in this function |
diff --git a/layouts/community/ergodox/robot_test_layout/keymap.c b/layouts/community/ergodox/robot_test_layout/keymap.c index 5d672deeb..07b294a98 100644 --- a/layouts/community/ergodox/robot_test_layout/keymap.c +++ b/layouts/community/ergodox/robot_test_layout/keymap.c | |||
| @@ -43,12 +43,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 43 | ) | 43 | ) |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | |||
| 47 | |||
| 48 | const uint16_t PROGMEM fn_actions[] = { | ||
| 49 | [1] = ACTION_LAYER_TAP_TOGGLE(1) | ||
| 50 | }; | ||
| 51 | |||
| 52 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 46 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 53 | { | 47 | { |
| 54 | switch(id) { | 48 | switch(id) { |
