Skip to content

Commit

Permalink
KC60 Layout Standardization and Cleanup (qmk#22125)
Browse files Browse the repository at this point in the history 
* Refactor `dbroqua` keymap

- use `layer_names` enum
- use QMK-native alias for `KC_TRNS`
- apply four-space indent
- grid-align keycodes
- refactor keymap to use `LAYOUT_all` macro.
  - The keycode for position [4, 9] (right half of Split Backspace)
    moves to the top row.
  - The keycodes for positions [3, 12] and [3, 13] (1.75u/1u Split
    RShift) switch positions.

[refactor]

* Refactor `dbroqua_hhkb` keymap

- use `layer_names` enum
- use QMK-native alias for `KC_TRNS`
- apply four-space indent
- grid-align keycodes
- refactor keymap to use `LAYOUT_all` macro.
  - The keycode for position [4, 9] (right half of Split Backspace)
    moves to the top row.
  - The keycodes for positions [3, 12] and [3, 13] (1.75u/1u Split
    RShift) switch positions.

[refactor]

* Touch-up `default` keymap

- fix keycode grid alignment

[style]

* Refactor `sgoodwin` keymap

- grid-align keycodes
- apply four-space indent
- refactor keymap to use `LAYOUT_all` macro.
  - The keycode for position [4, 9] (right half of Split Backspace)
    moves to the top row.
  - The keycodes for positions [3, 12] and [3, 13] (1.75u/1u Split
    RShift) switch positions.

[refactor]

* Refactor `stanleylai` keymap

- delete `config.h` (use RGB config from keyboard `info.json`)
  - fixes non-compilation
- use `layer_names` enum
- use four-space indent
- update keycode grid alignment
- refactor keymap to use `LAYOUT_all` macro.
  - The keycode for position [4, 9] (right half of Split Backspace)
    moves to the top row.
  - The keycodes for positions [3, 12] and [3, 13] (1.75u/1u Split
    RShift) switch positions.

[bugfix] [refactor]

* Touch-up `via` keymap

- fix keycode grid alignment

[style]

* Refactor `wigguno` keymap

- use four-space indent
- use QMK-native keycode alias for `KC_DELETE`
- refactor keymap to use `LAYOUT_all` macro.
  - The keycode for position [4, 9] (right half of Split Backspace)
    moves to the top row.
  - The keycodes for positions [3, 12] and [3, 13] (1.75u/1u Split
    RShift) switch positions.

[refactor]

* Remove `LAYOUT` macro

Superseded by `LAYOUT_all`.

[chore]

* Add `LAYOUT_60_ansi_split_bs_rshift`

[enhancement]

* Add `LAYOUT_60_tsangan_hhkb`

[enhancement]

* Add `LAYOUT_60_ansi_tsangan`

[enhancement]

* Add `LAYOUT_60_iso_split_bs_rshift`

[enhancement]

* Add `LAYOUT_60_iso`

[enhancement]

* Add `LAYOUT_60_iso_tsangan_split_bs_rshift`

[enhancement]

* Add `LAYOUT_60_iso_tsangan`

[enhancement]

* Add `LAYOUT_60_hhkb`

[enhancement]

* Add `LAYOUT_60_true_hhkb`

[enhancement]

* Add layout/matrix diagram

[docs]

* Add `LAYOUT_60_abnt2`

[enhancement]

* Extend Community Layout support

Add support for community layouts:

  - `60_ansi_split_bs_rshift`
  - `60_ansi_tsangan`
  - `60_tsangan_hhkb`
  - `60_hhkb`
  - `60_abnt2`
  - `60_iso`
  - `60_iso_split_bs_rshift`
  - `60_iso_tsangan`

[enhancement]

* Fix `LAYOUT_60_abnt2` support

[bugfix]
  • Loading branch information
@noroadsleft @christrotter
noroadsleft authored and christrotter committed Nov 28, 2023
1 parent a44dd12 commit 207822d
Show file tree
Hide file tree
Showing 10 changed files with 885 additions and 238 deletions.
649 changes: 637 additions & 12 deletions keyboards/kc60/info.json
View file

Large diffs are not rendered by default.

139 changes: 65 additions & 74 deletions keyboards/kc60/keymaps/dbroqua/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -1,82 +1,73 @@

#include QMK_KEYBOARD_H

#define _QWERTY 0
#define _FNCAPS 1
#define _FNRIGHTSHIFT 2

// Fillers to make layering more clear
#define ______ KC_TRNS

/*
* | | |
* | | |
* | | |
* | | |
* | |
*/
enum layer_names {
_QWERTY,
_FNCAPS,
_FNRIGHTSHIFT
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
* ,-----------------------------------------------------------------------------------------.
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` |
* |-----------------------------------------------------------------------------------------+
* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp |
* |-----------------------------------------------------------------------------------------+
* | Caps/FN1| A | S | D | F | G | H | J | K | L | ; | ' | Enter |
* |-----------------------------------------------------------------------------------------+
* | Shift | Z | X | C | V | B | N | M | , | . | / | Up | FN2 |
* |-----------------------------------------------------------------------------------------+
* | Ctrl | Gui | Alt | Space | AltGr | Left | Down | Right |
* `-----------------------------------------------------------------------------------------'
*/
[0] = LAYOUT( /* Basic QWERTY */
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_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,
LT(_FNCAPS, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT,
KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(_FNRIGHTSHIFT), KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_GRV, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT
),
/* Qwerty
* ,-----------------------------------------------------------------------------------------.
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` |
* |-----------------------------------------------------------------------------------------+
* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp |
* |-----------------------------------------------------------------------------------------+
* | Caps/FN1| A | S | D | F | G | H | J | K | L | ; | ' | Enter |
* |-----------------------------------------------------------------------------------------+
* | Shift | Z | X | C | V | B | N | M | , | . | / | Up | FN2 |
* |-----------------------------------------------------------------------------------------+
* | Ctrl | Gui | Alt | Space | AltGr | Left | Down | Right |
* `-----------------------------------------------------------------------------------------'
*/
[0] = LAYOUT_all( /* Basic QWERTY */
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,
LT(_FNCAPS, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT,
KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FNRIGHTSHIFT),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT
),

/* Layer 1
* ,-----------------------------------------------------------------------------------------.
* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | Psc | | | | | |
* |-----------------------------------------------------------------------------------------+
* | | Led | Led+| Led-| | Mute| Vol+| Vol-| | | | Play | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | Prev | Stop | Next |
* `-----------------------------------------------------------------------------------------'
*/
[_FNCAPS] = LAYOUT( /* Layer 1 */
______, 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_PSCR,______, ______, ______, ______, ______, ______,
______, ______, BL_TOGG, BL_UP, BL_DOWN,______,KC_MUTE,KC_VOLU,KC_VOLD,______, ______, ______, ______,KC_MPLY,
______, ______, ______, ______, KC_DEL, ______, KC_MPRV, KC_MSTP, KC_MNXT
),
/* Layer 1
* ,-----------------------------------------------------------------------------------------.
* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | Psc | | | | | |
* |-----------------------------------------------------------------------------------------+
* | | Led | Led+| Led-| | Mute| Vol+| Vol-| | | | Play | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | Prev | Stop | Next |
* `-----------------------------------------------------------------------------------------'
*/
[_FNCAPS] = LAYOUT_all( /* Layer 1 */
_______, 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_PSCR, _______, _______, _______, _______, _______, _______,
_______, _______, BL_TOGG, BL_UP, BL_DOWN, _______, KC_MUTE, KC_VOLU, KC_VOLD, _______, _______, _______, KC_MPLY, _______,
_______, _______, _______, _______, _______, KC_MPRV, KC_MSTP, KC_MNXT
),

/* Layer 2
* ,-----------------------------------------------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | | | | | PgUp | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | Home | PgDown| End |
* `-----------------------------------------------------------------------------------------'
*/
[_FNRIGHTSHIFT] = LAYOUT( /* Layer 2 */
______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_PGUP,
______, ______, ______, ______, ______, ______, KC_HOME,KC_PGDN,KC_END
),
/* Layer 2
* ,-----------------------------------------------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | | | | | | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | | | | | PgUp | |
* |-----------------------------------------------------------------------------------------+
* | | | | | | Home | PgDown| End |
* `-----------------------------------------------------------------------------------------'
*/
[_FNRIGHTSHIFT] = LAYOUT_all( /* Layer 2 */
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
_______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
),
};
89 changes: 44 additions & 45 deletions keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,51 @@

#include QMK_KEYBOARD_H

#define _QWERTY 0
#define _FN 1

// Fillers to make layering more clear
#define ______ KC_TRNS
enum layer_names {
_QWERTY,
_FN
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
* ,-----------------------------------------------------------------------------------------.
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` |
* |-----------------------------------------------------------------------------------------+
* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp |
* |-----------------------------------------------------------------------------------------+
* | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
* |-----------------------------------------------------------------------------------------+
* | Shift | Z | X | C | V | B | N | M | , | . | / | RShift | FN |
* |-----------------------------------------------------------------------------------------+
* | LGUI | LAlt | Space | RAlt | RGUI |
* `-----------------------------------------------------------------'
*/
[0] = LAYOUT( /* Basic QWERTY */
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_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_NO, KC_ENT,
KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(_FN), KC_RSFT,
______, KC_LGUI, KC_LALT, KC_SPC, KC_GRV, KC_RALT, KC_RGUI, ______, ______
),
/* Qwerty
* ,-----------------------------------------------------------------------------------------.
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` |
* |-----------------------------------------------------------------------------------------+
* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp |
* |-----------------------------------------------------------------------------------------+
* | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
* |-----------------------------------------------------------------------------------------+
* | Shift | Z | X | C | V | B | N | M | , | . | / | RShift | FN |
* |-----------------------------------------------------------------------------------------+
* | LGUI | LAlt | Space | RAlt | RGUI |
* `-----------------------------------------------------------------'
*/
[0] = LAYOUT_all( /* Basic QWERTY */
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_NO, KC_ENT,
KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN),
_______, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, _______, _______
),

/* Layer 1
* ,-----------------------------------------------------------------------------------------.
* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del |
* |-----------------------------------------------------------------------------------------+
* | CAPS | Led | Led-| Led+| | | | | Psc | Slck| Paus| Up | | |
* |-----------------------------------------------------------------------------------------+
* | | Vol-| Vol+| Mute| | | * | / | Home| PgUp| Left|Right| |
* |-----------------------------------------------------------------------------------------+
* | | Prev| Play| Next| | | + | - | End |PgDn| Down| | |
* |-----------------------------------------------------------------------------------------+
* | | | | Stop | |
* `-----------------------------------------------------------------'
*/
[_FN] = LAYOUT( /* Layer 1 */
______, 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_CAPS, BL_TOGG, BL_UP, BL_DOWN,______, ______, ______, ______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, ______, ______,
______, KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______, ______,
______, ______, KC_MPRV, KC_MPLY, KC_MNXT,______,______,KC_PPLS,KC_PMNS,KC_END, KC_PGDN, KC_DOWN, ______,______,
______, ______, ______, ______, KC_DEL, KC_MSTP, ______, ______, ______
)
/* Layer 1
* ,-----------------------------------------------------------------------------------------.
* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del |
* |-----------------------------------------------------------------------------------------+
* | CAPS | Led | Led-| Led+| | | | | Psc | Slck| Paus| Up | | |
* |-----------------------------------------------------------------------------------------+
* | | Vol-| Vol+| Mute| | | * | / | Home| PgUp| Left|Right| |
* |-----------------------------------------------------------------------------------------+
* | | Prev| Play| Next| | | + | - | End |PgDn| Down| | |
* |-----------------------------------------------------------------------------------------+
* | | | | Stop | |
* `-----------------------------------------------------------------'
*/
[_FN] = LAYOUT_all( /* Layer 1 */
_______, 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, BL_TOGG, BL_UP, BL_DOWN, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______,
_______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______,
_______, _______, _______, _______, KC_MSTP, _______, _______, _______
)
};
2 changes: 1 addition & 1 deletion keyboards/kc60/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL
),
[1] = LAYOUT_all(
QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX,
QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS,
XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX,
_______, XXXXXXX, XXXXXXX, BL_DOWN, BL_TOGG, BL_UP, BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
Expand Down
Loading

0 comments on commit 207822d

Please sign in to comment.