diff options
Diffstat (limited to 'layouts/community')
-rw-r--r-- | layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c | 11 | ||||
-rw-r--r-- | layouts/community/60_ansi_split_bs_rshift/bcat/readme.md | 2 | ||||
-rw-r--r-- | layouts/community/60_tsangan_hhkb/bcat/keymap.c | 11 | ||||
-rw-r--r-- | layouts/community/60_tsangan_hhkb/bcat/readme.md | 2 | ||||
-rw-r--r-- | layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c | 13 | ||||
-rw-r--r-- | layouts/community/65_ansi_blocker_split_bs/bcat/readme.md | 2 | ||||
-rw-r--r-- | layouts/community/split_3x6_3/bcat/config.h | 9 | ||||
-rw-r--r-- | layouts/community/split_3x6_3/bcat/keymap.c | 33 | ||||
-rw-r--r-- | layouts/community/split_3x6_3/bcat/readme.md | 2 | ||||
-rw-r--r-- | layouts/community/split_3x6_3/bcat/rules.mk | 4 |
10 files changed, 38 insertions, 51 deletions
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c index 6bfafc332..b40148e99 100644 --- a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c | |||
@@ -16,14 +16,7 @@ | |||
16 | 16 | ||
17 | #include QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
18 | 18 | ||
19 | enum layer { | 19 | #include "bcat.h" |
20 | LAYER_DEFAULT, | ||
21 | LAYER_FUNCTION_1, | ||
22 | LAYER_FUNCTION_2, | ||
23 | }; | ||
24 | |||
25 | #define LY_FN1 MO(LAYER_FUNCTION_1) | ||
26 | #define LY_FN2 MO(LAYER_FUNCTION_2) | ||
27 | 20 | ||
28 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 21 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
29 | // clang-format off | 22 | // clang-format off |
@@ -48,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
48 | /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */ | 41 | /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */ |
49 | [LAYER_FUNCTION_2] = LAYOUT_60_ansi_split_bs_rshift( | 42 | [LAYER_FUNCTION_2] = LAYOUT_60_ansi_split_bs_rshift( |
50 | _______, 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, | 43 | _______, 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, |
51 | _______, NK_TOGG, KC_MPLY, KC_VOLU, KC_MSTP, BL_BRTG, EEP_RST, RESET, _______, _______, _______, RGB_VAI, _______, _______, | 44 | _______, _______, KC_MPLY, KC_VOLU, KC_MSTP, BL_BRTG, EEP_RST, RESET, _______, _______, _______, RGB_VAI, _______, _______, |
52 | _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, BL_INC, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG, | 45 | _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, BL_INC, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG, |
53 | _______, _______, _______, KC_MUTE, _______, BL_DEC, _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, | 46 | _______, _______, _______, KC_MUTE, _______, BL_DEC, _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, |
54 | _______, _______, _______, _______, _______, _______, _______, _______ | 47 | _______, _______, _______, _______, _______, _______, _______, _______ |
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md b/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md index 2d578aa3d..f6bcda919 100644 --- a/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md +++ b/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md | |||
@@ -19,6 +19,6 @@ layout](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/60_tsa | |||
19 | 19 | ||
20 | ## Function 2 layer | 20 | ## Function 2 layer |
21 | 21 | ||
22 |  | 22 |  |
23 | 23 | ||
24 | ([KLE](http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c)) | 24 | ([KLE](http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c)) |
diff --git a/layouts/community/60_tsangan_hhkb/bcat/keymap.c b/layouts/community/60_tsangan_hhkb/bcat/keymap.c index 05e6462d9..9ec75f3c4 100644 --- a/layouts/community/60_tsangan_hhkb/bcat/keymap.c +++ b/layouts/community/60_tsangan_hhkb/bcat/keymap.c | |||
@@ -16,14 +16,7 @@ | |||
16 | 16 | ||
17 | #include QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
18 | 18 | ||
19 | enum layer { | 19 | #include "bcat.h" |
20 | LAYER_DEFAULT, | ||
21 | LAYER_FUNCTION_1, | ||
22 | LAYER_FUNCTION_2, | ||
23 | }; | ||
24 | |||
25 | #define LY_FN1 MO(LAYER_FUNCTION_1) | ||
26 | #define LY_FN2 MO(LAYER_FUNCTION_2) | ||
27 | 20 | ||
28 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 21 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
29 | // clang-format off | 22 | // clang-format off |
@@ -46,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
46 | /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4 */ | 39 | /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4 */ |
47 | [LAYER_FUNCTION_2] = LAYOUT_60_tsangan_hhkb( | 40 | [LAYER_FUNCTION_2] = LAYOUT_60_tsangan_hhkb( |
48 | _______, 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, | 41 | _______, 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, |
49 | _______, NK_TOGG, KC_MPLY, KC_VOLU, KC_MSTP, BL_BRTG, EEP_RST, RESET, _______, _______, _______, RGB_VAI, _______, _______, | 42 | _______, _______, KC_MPLY, KC_VOLU, KC_MSTP, BL_BRTG, EEP_RST, RESET, _______, _______, _______, RGB_VAI, _______, _______, |
50 | _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, BL_INC, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG, | 43 | _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, BL_INC, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG, |
51 | _______, _______, _______, KC_MUTE, _______, BL_DEC, _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, | 44 | _______, _______, _______, KC_MUTE, _______, BL_DEC, _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, |
52 | _______, _______, _______, _______, _______, _______, _______ | 45 | _______, _______, _______, _______, _______, _______, _______ |
diff --git a/layouts/community/60_tsangan_hhkb/bcat/readme.md b/layouts/community/60_tsangan_hhkb/bcat/readme.md index b7a3cde5d..c8d0d72dd 100644 --- a/layouts/community/60_tsangan_hhkb/bcat/readme.md +++ b/layouts/community/60_tsangan_hhkb/bcat/readme.md | |||
@@ -39,6 +39,6 @@ and/or blockers, so there aren't switches installed in those positions. | |||
39 | 39 | ||
40 | ## Function 2 layer | 40 | ## Function 2 layer |
41 | 41 | ||
42 |  | 42 |  |
43 | 43 | ||
44 | ([KLE](http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4)) | 44 | ([KLE](http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4)) |
diff --git a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c index c91a1b0ea..c099d36e2 100644 --- a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c +++ b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c | |||
@@ -16,12 +16,7 @@ | |||
16 | 16 | ||
17 | #include QMK_KEYBOARD_H | 17 | #include QMK_KEYBOARD_H |
18 | 18 | ||
19 | enum layer { | 19 | #include "bcat.h" |
20 | LAYER_DEFAULT, | ||
21 | LAYER_FUNCTION, | ||
22 | }; | ||
23 | |||
24 | #define LY_FN MO(LAYER_FUNCTION) | ||
25 | 20 | ||
26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 21 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
27 | // clang-format off | 22 | // clang-format off |
@@ -31,13 +26,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
31 | 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, | 26 | 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, |
32 | 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, | 27 | 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, |
33 | 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, | 28 | 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, |
34 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, LY_FN, KC_LEFT, KC_DOWN, KC_RGHT | 29 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, LY_FN1, KC_LEFT, KC_DOWN, KC_RGHT |
35 | ), | 30 | ), |
36 | 31 | ||
37 | /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */ | 32 | /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */ |
38 | [LAYER_FUNCTION] = LAYOUT_65_ansi_blocker_split_bs( | 33 | [LAYER_FUNCTION_1] = LAYOUT_65_ansi_blocker_split_bs( |
39 | _______, 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, _______, | 34 | _______, 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, _______, |
40 | KC_CAPS, NK_TOGG, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, | 35 | KC_CAPS, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, |
41 | _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 36 | _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
42 | _______, KC_APP, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 37 | _______, KC_APP, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
43 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______ |
diff --git a/layouts/community/65_ansi_blocker_split_bs/bcat/readme.md b/layouts/community/65_ansi_blocker_split_bs/bcat/readme.md index 0726cbece..5777c7c38 100644 --- a/layouts/community/65_ansi_blocker_split_bs/bcat/readme.md +++ b/layouts/community/65_ansi_blocker_split_bs/bcat/readme.md | |||
@@ -12,6 +12,6 @@ keys, an HHKB-style (split) backspace, and media controls in the function layer | |||
12 | 12 | ||
13 | ## Function layer | 13 | ## Function layer |
14 | 14 | ||
15 |  | 15 |  |
16 | 16 | ||
17 | ([KLE](http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44)) | 17 | ([KLE](http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44)) |
diff --git a/layouts/community/split_3x6_3/bcat/config.h b/layouts/community/split_3x6_3/bcat/config.h index b8743429c..556fb90d5 100644 --- a/layouts/community/split_3x6_3/bcat/config.h +++ b/layouts/community/split_3x6_3/bcat/config.h | |||
@@ -16,12 +16,13 @@ | |||
16 | 16 | ||
17 | #pragma once | 17 | #pragma once |
18 | 18 | ||
19 | #define BCAT_ORTHO_LAYERS | ||
20 | |||
19 | #if defined(KEYBOARD_crkbd_rev1) | 21 | #if defined(KEYBOARD_crkbd_rev1) |
20 | # define EE_HANDS | 22 | # define EE_HANDS |
21 | 23 | ||
22 | # if defined(RGB_MATRIX_ENABLE) | 24 | # if defined(OLED_ENABLE) |
23 | /* Limit max RGB LED current to avoid tripping controller fuse. */ | 25 | # undef OLED_FONT_H |
24 | # undef RGB_MATRIX_MAXIMUM_BRIGHTNESS | 26 | # define OLED_FONT_H "lib/glcdfont.c" |
25 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 | ||
26 | # endif | 27 | # endif |
27 | #endif | 28 | #endif |
diff --git a/layouts/community/split_3x6_3/bcat/keymap.c b/layouts/community/split_3x6_3/bcat/keymap.c index 4f68c8f84..cfac93d1e 100644 --- a/layouts/community/split_3x6_3/bcat/keymap.c +++ b/layouts/community/split_3x6_3/bcat/keymap.c | |||
@@ -18,20 +18,9 @@ | |||
18 | 18 | ||
19 | #include "bcat.h" | 19 | #include "bcat.h" |
20 | 20 | ||
21 | enum layer { | 21 | #if defined(OLED_ENABLE) |
22 | LAYER_DEFAULT, | 22 | # include "bcat_oled.h" |
23 | LAYER_LOWER, | 23 | #endif |
24 | LAYER_RAISE, | ||
25 | LAYER_ADJUST, | ||
26 | }; | ||
27 | |||
28 | #define LY_LWR MO(LAYER_LOWER) | ||
29 | #define LY_RSE MO(LAYER_RAISE) | ||
30 | |||
31 | #define KY_CSPC LCTL(KC_SPC) | ||
32 | #define KY_ZMIN LCTL(KC_EQL) | ||
33 | #define KY_ZMOUT LCTL(KC_MINS) | ||
34 | #define KY_ZMRST LCTL(KC_0) | ||
35 | 24 | ||
36 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
37 | // clang-format off | 26 | // clang-format off |
@@ -58,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
58 | ), | 47 | ), |
59 | /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee */ | 48 | /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee */ |
60 | [LAYER_ADJUST] = LAYOUT_split_3x6_3( | 49 | [LAYER_ADJUST] = LAYOUT_split_3x6_3( |
61 | _______, NK_TOGG, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, _______, _______, _______, _______, | 50 | _______, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, _______, _______, _______, _______, |
62 | _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, RGB_RMOD, RGB_VAD, RGB_VAI, RGB_MOD, RGB_SPI, _______, | 51 | _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, RGB_RMOD, RGB_VAD, RGB_VAI, RGB_MOD, RGB_SPI, _______, |
63 | _______, _______, _______, KC_MUTE, _______, _______, RGB_HUI, RGB_SAD, RGB_SAI, RGB_HUD, RGB_SPD, _______, | 52 | _______, _______, _______, KC_MUTE, _______, _______, RGB_HUI, RGB_SAD, RGB_SAI, RGB_HUD, RGB_SPD, _______, |
64 | _______, _______, _______, RGB_TOG, _______, _______ | 53 | _______, _______, _______, RGB_TOG, _______, _______ |
@@ -66,4 +55,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
66 | // clang-format on | 55 | // clang-format on |
67 | }; | 56 | }; |
68 | 57 | ||
69 | layer_state_t layer_state_set_keymap(layer_state_t state) { return update_tri_layer_state(state, LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); } | 58 | #if defined(OLED_ENABLE) |
59 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { return is_keyboard_master() ? OLED_ROTATION_270 : OLED_ROTATION_180; } | ||
60 | |||
61 | void oled_task_keymap(const oled_keyboard_state_t *keyboard_state) { | ||
62 | render_oled_layers(); | ||
63 | oled_advance_page(/*clearPageRemainder=*/false); | ||
64 | render_oled_indicators(keyboard_state->leds); | ||
65 | oled_advance_page(/*clearPageRemainder=*/false); | ||
66 | oled_advance_page(/*clearPageRemainder=*/false); | ||
67 | render_oled_wpm(keyboard_state->wpm); | ||
68 | render_oled_pet(/*col=*/0, /*line=*/12, keyboard_state); | ||
69 | } | ||
70 | #endif | ||
diff --git a/layouts/community/split_3x6_3/bcat/readme.md b/layouts/community/split_3x6_3/bcat/readme.md index c4bf891c4..b7b5d3de7 100644 --- a/layouts/community/split_3x6_3/bcat/readme.md +++ b/layouts/community/split_3x6_3/bcat/readme.md | |||
@@ -117,7 +117,7 @@ better location. | |||
117 | 117 | ||
118 | ## Adjust layer | 118 | ## Adjust layer |
119 | 119 | ||
120 |  | 120 |  |
121 | 121 | ||
122 | ([KLE](http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee)) | 122 | ([KLE](http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee)) |
123 | 123 | ||
diff --git a/layouts/community/split_3x6_3/bcat/rules.mk b/layouts/community/split_3x6_3/bcat/rules.mk index 5ee614b19..29e52b92d 100644 --- a/layouts/community/split_3x6_3/bcat/rules.mk +++ b/layouts/community/split_3x6_3/bcat/rules.mk | |||
@@ -1,5 +1,9 @@ | |||
1 | BCAT_OLED_PET = luna | ||
2 | |||
1 | ifeq ($(strip $(KEYBOARD)), crkbd/rev1) | 3 | ifeq ($(strip $(KEYBOARD)), crkbd/rev1) |
2 | BOOTLOADER = atmel-dfu # Elite-C | 4 | BOOTLOADER = atmel-dfu # Elite-C |
3 | 5 | ||
6 | OLED_ENABLE = yes # dual 128x32 OLED screens | ||
7 | OLED_DRIVER = SSD1306 | ||
4 | RGB_MATRIX_ENABLE = yes # per-key RGB and underglow | 8 | RGB_MATRIX_ENABLE = yes # per-key RGB and underglow |
5 | endif | 9 | endif |