Rename function layers to Fn and Fn2

bcat · Jan 8, 2024 · 2b36de8 · 2b36de8
1 parent 6698a2e
commit 2b36de8
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 43 deletions.
diff --git a/keyboards/9key/keymaps/bcat/keymap.c b/keyboards/9key/keymaps/bcat/keymap.c
@@ -28,9 +28,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [LAYER_DEFAULT] = LAYOUT(
         KC_MPLY,  KC_VOLU,  KY_RHAND,
         KY_LOCK,  KC_VOLD,  KY_MICU,
-        LY_FN1,   KC_MUTE,  KY_MICM
+        LY_FN,    KC_MUTE,  KY_MICM
     ),
-    [LAYER_FUNCTION_1] = LAYOUT(
+    [LAYER_FN] = LAYOUT(
         EE_CLR,   _______,  QK_BOOT,
         _______,  _______,  _______,
         _______,  _______,  _______

diff --git a/keyboards/keebio/bdn9/keymaps/bcat/keymap.c b/keyboards/keebio/bdn9/keymaps/bcat/keymap.c
@@ -21,11 +21,11 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [LAYER_DEFAULT] = LAYOUT(
-        KC_MUTE,  LY_FN1,   BL_BRTG,
+        KC_MUTE,  LY_FN,    BL_BRTG,
         KC_F4,    KC_F5,    KC_F6,
         KC_F1,    KC_F2,    KC_F3
     ),
-    [LAYER_FUNCTION_1] = LAYOUT(
+    [LAYER_FN] = LAYOUT(
         EE_CLR,   _______,  QK_BOOT,
         KC_F10,   KC_F11,   KC_F12,
         KC_F7,    KC_F8,    KC_F9

diff --git a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
@@ -26,10 +26,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSPC,            KC_PGUP,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_PGDN,
         KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,    KC_END,
-        KC_LCTL,  KC_LGUI,  KC_LALT,  LY_FN1,   KC_SPC,                       KC_SPC,   XXXXXXX,  KC_RALT,  LY_FN1,   KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT
+        KC_LCTL,  KC_LGUI,  KC_LALT,  LY_FN,    KC_SPC,                       KC_SPC,   XXXXXXX,  KC_RALT,  LY_FN,    KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT
     ),
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */
-    [LAYER_FUNCTION_1] = LAYOUT_65(
+    [LAYER_FN] = LAYOUT_65(
         _______,  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_INS,   KC_DEL,   RGB_HUI,
         KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EE_CLR,   QK_BOOT,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,            RGB_SAI,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_TOG,            RGB_SAD,

diff --git a/keyboards/keebio/quefrency/keymaps/bcat/readme.md b/keyboards/keebio/quefrency/keymaps/bcat/readme.md
@@ -10,8 +10,8 @@ ESDF cluster), and RGB controls in the function layer (on the arrow/nav keys).
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/60a262432bb340b37d364a4424f3037b))
 
-## Function layer
+## Fn layer
 
-![Function layer layout](https://i.imgur.com/7oCdN86.png)
+![Fn layer layout](https://i.imgur.com/7oCdN86.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d))
diff --git a/layouts/60_ansi_split_bs_rshift/bcat/keymap.c b/layouts/60_ansi_split_bs_rshift/bcat/keymap.c
@@ -25,21 +25,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_GRV,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSPC,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,
-        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      LY_FN1,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      LY_FN,
         KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                           KC_RALT,  LY_FN2,   KC_APP,   KC_RCTL
     ),
 
-    /* Function 1 layer: http://www.keyboard-layout-editor.com/#/gists/c7a55e75285d474b6301140eaf53f915 */
-    [LAYER_FUNCTION_1] = LAYOUT_60_ansi_split_bs_rshift(
+    /* Fn layer: http://www.keyboard-layout-editor.com/#/gists/c7a55e75285d474b6301140eaf53f915 */
+    [LAYER_FN] = LAYOUT_60_ansi_split_bs_rshift(
         _______,  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_INS,   KC_DEL,
         KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,            _______,
         _______,  KC_APP,   _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,  _______,  _______
     ),
 
-    /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */
-    [LAYER_FUNCTION_2] = LAYOUT_60_ansi_split_bs_rshift(
+    /* Fn2 layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */
+    [LAYER_FN2] = LAYOUT_60_ansi_split_bs_rshift(
         _______,  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_INS,   KC_DEL,
         _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EE_CLR,   QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_UP,    _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,

diff --git a/layouts/60_ansi_split_bs_rshift/bcat/readme.md b/layouts/60_ansi_split_bs_rshift/bcat/readme.md
@@ -11,14 +11,14 @@ layout](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/60_tsa
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/327b41b5a933b3d44bf60ca9822e85dc))
 
-## Function 1 layer
+## Fn layer
 
-![Function 1 layer layout](https://i.imgur.com/iRNy6Zy.png)
+![Fn layer layout](https://i.imgur.com/iRNy6Zy.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/c7a55e75285d474b6301140eaf53f915))
 
-## Function 2 layer
+## Fn2 layer
 
-![Function 2 layer layout](https://i.imgur.com/DW03vvJ.png)
+![Fn2 layer layout](https://i.imgur.com/DW03vvJ.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c))
diff --git a/layouts/60_tsangan_hhkb/bcat/keymap.c b/layouts/60_tsangan_hhkb/bcat/keymap.c
@@ -25,19 +25,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_GRV,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSPC,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,
-        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      LY_FN1,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      LY_FN,
         KC_LCTL,  LY_FN2,   KC_LALT,                                KC_SPC,                                           KC_RALT,  KC_RGUI,            KC_RCTL
     ),
-    /* Function 1 layer: http://www.keyboard-layout-editor.com/#/gists/f6311fd7e315de781143b80eb040a551 */
-    [LAYER_FUNCTION_1] = LAYOUT_60_tsangan_hhkb(
+    /* Fn layer: http://www.keyboard-layout-editor.com/#/gists/f6311fd7e315de781143b80eb040a551 */
+    [LAYER_FN] = LAYOUT_60_tsangan_hhkb(
         _______,  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_INS,   KC_DEL,
         KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,            _______,
         _______,  KC_APP,   _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,            _______
     ),
-    /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4 */
-    [LAYER_FUNCTION_2] = LAYOUT_60_tsangan_hhkb(
+    /* Fn2 layer: http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4 */
+    [LAYER_FN2] = LAYOUT_60_tsangan_hhkb(
         _______,  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_INS,   KC_DEL,
         _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EE_CLR,   QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_UP,    _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,

diff --git a/layouts/60_tsangan_hhkb/bcat/readme.md b/layouts/60_tsangan_hhkb/bcat/readme.md
@@ -9,17 +9,17 @@ a few changes:
 * The Alt and Super keys are swapped to put Alt directly adjacent to the
   spacebar (HHKB DIP switch 5).
 
-* The left Super key is replaced with another Function key (HHKB DIP switch 2).
-  Unlike on the real HHKB, this key triggers a different Function 2 layer. (This
-  also helps prevent accidental Super key presses while gaming.)
+* The left Super key is replaced with another Fn key (HHKB DIP switch 2). Unlike
+  on the real HHKB, this key triggers a different Fn2 layer. (This also helps
+  prevent accidental Super key presses while gaming.)
 
-* The Function 2 layer contains reset keys, RGB underglow and backlight controls
-  (in place of the arrow and navigation keys), and media controls (centered
-  around the ESDF cluster).
+* The Fn2 layer contains reset keys, RGB underglow and backlight controls (in
+  place of the arrow and navigation keys), and media controls (centered around
+  the ESDF cluster).
 
-* The Function 2 layer also has the F1-F12 keys mapped just like the Function 1
-  layer. This is a concession to gaming because it enables these keys to be
-  easily typed with the left hand, without taking the right hand off the mouse.
+* The Fn2 layer also has the F1-F12 keys mapped just like the Fn layer. This is
+  a concession to gaming because it enables these keys to be easily typed with
+  the left hand, without taking the right hand off the mouse.
 
 * The leftmost and rightmost bottom row keys are mapped to Ctrl rather than
   anything more useful because most of my Tsangan PCBs actually have HHKB plates
@@ -31,14 +31,14 @@ a few changes:
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/86b33d75aa6f56d8781ab3d8475f4e77))
 
-## Function 1 layer
+## Fn layer
 
-![Function l 1ayer layout](https://i.imgur.com/jn4HtA5.png)
+![Fn 1ayer layout](https://i.imgur.com/jn4HtA5.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/f6311fd7e315de781143b80eb040a551))
 
-## Function 2 layer
+## Fn2 layer
 
-![Function 2 layer layout](https://i.imgur.com/4Jdw9eL.png)
+![Fn2 layer layout](https://i.imgur.com/4Jdw9eL.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4))
diff --git a/layouts/65_ansi_blocker_split_bs/bcat/keymap.c b/layouts/65_ansi_blocker_split_bs/bcat/keymap.c
@@ -26,11 +26,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSPC,            KC_PGUP,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_PGDN,
         KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,    KC_END,
-        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  LY_FN1,                       KC_LEFT,  KC_DOWN,  KC_RGHT
+        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  LY_FN,                        KC_LEFT,  KC_DOWN,  KC_RGHT
     ),
 
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */
-    [LAYER_FUNCTION_1] = LAYOUT_65_ansi_blocker_split_bs(
+    [LAYER_FN] = LAYOUT_65_ansi_blocker_split_bs(
         _______,  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_INS,   KC_DEL,   _______,
         KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EE_CLR,   QK_BOOT,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,  _______,  _______,            _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,

diff --git a/layouts/65_ansi_blocker_split_bs/bcat/readme.md b/layouts/65_ansi_blocker_split_bs/bcat/readme.md
@@ -10,8 +10,8 @@ keys, an HHKB-style (split) backspace, and media controls in the function layer
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/dd675b40cc4df2c7bb78847ac29f5988))
 
-## Function layer
+## Fn layer
 
-![Function layer layout](https://i.imgur.com/s4hS9ZK.png)
+![Fn layer layout](https://i.imgur.com/s4hS9ZK.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44))
diff --git a/users/bcat/bcat.h b/users/bcat/bcat.h
@@ -32,8 +32,8 @@ enum user_layer {
     LAYER_ADJUST,
 #else
     /* Function layers for traditional boards: */
-    LAYER_FUNCTION_1,
-    LAYER_FUNCTION_2,
+    LAYER_FN,
+    LAYER_FN2,
 #endif
 };
 
@@ -53,6 +53,6 @@ enum user_keycode {
 #    define LY_LWR MO(LAYER_LOWER)
 #    define LY_RSE MO(LAYER_RAISE)
 #else
-#    define LY_FN1 MO(LAYER_FUNCTION_1)
-#    define LY_FN2 MO(LAYER_FUNCTION_2)
+#    define LY_FN MO(LAYER_FN)
+#    define LY_FN2 MO(LAYER_FN2)
 #endif