diff options
author | Ryan <fauxpark@gmail.com> | 2021-11-01 09:27:54 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-01 09:27:54 +1100 |
commit | 928d9f90ec169f49f50c1566132b06adcaf662d7 (patch) | |
tree | 5c2c622c1ab75aedd1f87851fa1efa306d7fdb4f /keyboards | |
parent | b25218ccc1d8f72c14a0c175a7594822ea0f865e (diff) | |
download | qmk_firmware-928d9f90ec169f49f50c1566132b06adcaf662d7.tar.gz qmk_firmware-928d9f90ec169f49f50c1566132b06adcaf662d7.zip |
Remove complex `fn_actions` macros (#14662)
* Remove complex `fn_actions` macros
* Remove additional `KC_FN*` instances
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/40percentclub/ut47/keymaps/rgb/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/hotdox/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/hotdox/keymaps/via/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kinesis/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kinesis/keymaps/default_pretty/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kinesis/keymaps/dvorak/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kinesis/keymaps/stapelberg/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/kinesis/keymaps/tw1t611/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/planck/keymaps/yale/keymap.c | 4 |
10 files changed, 12 insertions, 12 deletions
diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c b/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c index 77fa5b401..ae8ad3e37 100644 --- a/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c +++ b/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c | |||
@@ -43,8 +43,8 @@ LAYOUT( | |||
43 | ), | 43 | ), |
44 | 44 | ||
45 | LAYOUT( | 45 | LAYOUT( |
46 | KC_FN6, KC_FN7, KC_FN8, KC_FN9, KC_FN10, KC_FN11, KC_FN12, KC_FN13, KC_FN14, KC_FN15, KC_FN16, KC_DELETE, | 46 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DELETE, |
47 | _______, _______, _______, _______, _______, _______, _______, KC_FN17, KC_FN18, KC_FN19, KC_FN20, KC_FN21, | 47 | _______, _______, _______, _______, _______, _______, _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, |
48 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, | 48 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, |
49 | _______, _______, _______, KC_CAPS, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END | 49 | _______, _______, _______, KC_CAPS, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END |
50 | ), | 50 | ), |
diff --git a/keyboards/hotdox/keymaps/default/keymap.c b/keyboards/hotdox/keymaps/default/keymap.c index 3d6f040f3..fe07e6f91 100644 --- a/keyboards/hotdox/keymaps/default/keymap.c +++ b/keyboards/hotdox/keymaps/default/keymap.c | |||
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
49 | TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, | 49 | TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, |
50 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), | 50 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), |
51 | MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, | 51 | MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, |
52 | KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, | 52 | KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_NO, |
53 | KC_LALT, CTL_T(KC_ESC), | 53 | KC_LALT, CTL_T(KC_ESC), |
54 | KC_PGUP, | 54 | KC_PGUP, |
55 | KC_PGDN,KC_TAB,KC_ENT | 55 | KC_PGDN,KC_TAB,KC_ENT |
diff --git a/keyboards/hotdox/keymaps/via/keymap.c b/keyboards/hotdox/keymaps/via/keymap.c index 5cfad55dd..df951542a 100644 --- a/keyboards/hotdox/keymaps/via/keymap.c +++ b/keyboards/hotdox/keymaps/via/keymap.c | |||
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
50 | TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, | 50 | TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, |
51 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), | 51 | KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), |
52 | MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, | 52 | MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, |
53 | KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, | 53 | KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_NO, |
54 | KC_LALT, CTL_T(KC_ESC), | 54 | KC_LALT, CTL_T(KC_ESC), |
55 | KC_PGUP, | 55 | KC_PGUP, |
56 | KC_PGDN,KC_TAB,KC_ENT | 56 | KC_PGDN,KC_TAB,KC_ENT |
diff --git a/keyboards/kinesis/keymaps/default/keymap.c b/keyboards/kinesis/keymaps/default/keymap.c index 2d43aad07..d46a07cac 100644 --- a/keyboards/kinesis/keymaps/default/keymap.c +++ b/keyboards/kinesis/keymaps/default/keymap.c | |||
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
40 | KC_LCTL,KC_LALT, | 40 | KC_LCTL,KC_LALT, |
41 | KC_HOME, | 41 | KC_HOME, |
42 | KC_BSPC,KC_DEL ,KC_END , | 42 | KC_BSPC,KC_DEL ,KC_END , |
43 | KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK ,KC_PAUS, KC_FN0, RESET, | 43 | KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK ,KC_PAUS, KC_NO, RESET, |
44 | KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS, | 44 | KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS, |
45 | KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS, | 45 | KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS, |
46 | KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,KC_QUOT, | 46 | KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,KC_QUOT, |
diff --git a/keyboards/kinesis/keymaps/default_pretty/keymap.c b/keyboards/kinesis/keymaps/default_pretty/keymap.c index 9c01b222a..94102a806 100644 --- a/keyboards/kinesis/keymaps/default_pretty/keymap.c +++ b/keyboards/kinesis/keymaps/default_pretty/keymap.c | |||
@@ -32,7 +32,7 @@ | |||
32 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 32 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
33 | 33 | ||
34 | [QWERTY] = LAYOUT_pretty( | 34 | [QWERTY] = LAYOUT_pretty( |
35 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, RESET, | 35 | KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, RESET, |
36 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, | 36 | KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, |
37 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, | 37 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, |
38 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | 38 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
diff --git a/keyboards/kinesis/keymaps/dvorak/keymap.c b/keyboards/kinesis/keymaps/dvorak/keymap.c index 3c532628e..6f4d63a7d 100644 --- a/keyboards/kinesis/keymaps/dvorak/keymap.c +++ b/keyboards/kinesis/keymaps/dvorak/keymap.c | |||
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
17 | KC_HOME, | 17 | KC_HOME, |
18 | KC_BSPC, KC_DEL, KC_END, | 18 | KC_BSPC, KC_DEL, KC_END, |
19 | // right hand | 19 | // right hand |
20 | KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, RESET, | 20 | KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, RESET, |
21 | KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, | 21 | KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, |
22 | KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, | 22 | KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, |
23 | KC_D, KC_H, KC_T, KC_N, KC_S, KC_BSLS, | 23 | KC_D, KC_H, KC_T, KC_N, KC_S, KC_BSLS, |
diff --git a/keyboards/kinesis/keymaps/stapelberg/keymap.c b/keyboards/kinesis/keymaps/stapelberg/keymap.c index c62ffbbcc..d7a0a5e5c 100644 --- a/keyboards/kinesis/keymaps/stapelberg/keymap.c +++ b/keyboards/kinesis/keymaps/stapelberg/keymap.c | |||
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
56 | KC_LCTL,KC_LALT, | 56 | KC_LCTL,KC_LALT, |
57 | KC_LGUI, | 57 | KC_LGUI, |
58 | KC_BSPC,KC_ESC ,KC_END , | 58 | KC_BSPC,KC_ESC ,KC_END , |
59 | KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK ,KC_PAUS, KC_FN0, RESET, | 59 | KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SLCK ,KC_PAUS, KC_NO, RESET, |
60 | KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS, | 60 | KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS, |
61 | KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS, | 61 | KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS, |
62 | KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,KC_QUOT, | 62 | KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,KC_QUOT, |
diff --git a/keyboards/kinesis/keymaps/tw1t611/keymap.c b/keyboards/kinesis/keymaps/tw1t611/keymap.c index c94f06bbb..e7a6ffd6e 100644 --- a/keyboards/kinesis/keymaps/tw1t611/keymap.c +++ b/keyboards/kinesis/keymaps/tw1t611/keymap.c | |||
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
15 | KC_RCTL,KC_LALT, | 15 | KC_RCTL,KC_LALT, |
16 | KC_HOME, | 16 | KC_HOME, |
17 | KC_SPC ,KC_LSFT,KC_BSPC , | 17 | KC_SPC ,KC_LSFT,KC_BSPC , |
18 | KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KC_FN0 ,RESET, | 18 | KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KC_NO ,RESET, |
19 | KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,DE_SS , | 19 | KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,DE_SS , |
20 | KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,DE_ADIA, | 20 | KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,DE_ADIA, |
21 | KC_H ,KC_J ,KC_K ,KC_L ,DE_SLSH,DE_ODIA, | 21 | KC_H ,KC_J ,KC_K ,KC_L ,DE_SLSH,DE_ODIA, |
diff --git a/keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c b/keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c index c61bec5a0..affc42c7b 100644 --- a/keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c +++ b/keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c | |||
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
20 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 20 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
21 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | 21 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
22 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, | 22 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, |
23 | _______, KC_LCTRL, KC_LALT, KC_LGUI, KC_FN13, KC_SPC, KC_SPC, KC_FN23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), | 23 | _______, KC_LCTRL, KC_LALT, KC_LGUI, KC_NO, KC_SPC, KC_SPC, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), |
24 | 24 | ||
25 | [1] = LAYOUT_ortho_4x12( | 25 | [1] = LAYOUT_ortho_4x12( |
26 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, | 26 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, |
diff --git a/keyboards/planck/keymaps/yale/keymap.c b/keyboards/planck/keymaps/yale/keymap.c index 60bbc758d..0baa24bdb 100644 --- a/keyboards/planck/keymaps/yale/keymap.c +++ b/keyboards/planck/keymaps/yale/keymap.c | |||
@@ -68,9 +68,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
68 | ), | 68 | ), |
69 | 69 | ||
70 | [_NAV] = LAYOUT_planck_grid( | 70 | [_NAV] = LAYOUT_planck_grid( |
71 | KC_MS_ACCEL2, KC_FN1, KC_FN2, KC_FN3, KC_FN4, XXXXXXX, XXXXXXX, KC_WH_D, KC_WH_U, XXXXXXX, XXXXXXX, XXXXXXX, | 71 | KC_MS_ACCEL2, KC_NO, KC_NO, KC_NO, KC_NO, XXXXXXX, XXXXXXX, KC_WH_D, KC_WH_U, XXXXXXX, XXXXXXX, XXXXXXX, |
72 | KC_MS_ACCEL1, KC_MS_BTN4, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, XXXXXXX, XXXXXXX, | 72 | KC_MS_ACCEL1, KC_MS_BTN4, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, XXXXXXX, XXXXXXX, |
73 | KC_MS_ACCEL0, KC_FN9, KC_FN10, KC_FN11, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 73 | KC_MS_ACCEL0, KC_NO, KC_NO, KC_NO, KC_NO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
74 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX | 74 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX |
75 | ), | 75 | ), |
76 | 76 | ||