Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KC60 Layout Standardization and Cleanup #22125

Merged
merged 21 commits into from
Sep 24, 2023
Merged

Conversation

noroadsleft
Copy link
Member

Description

This should more or less complete the layout support for the KC60.

  • Touch-up default and via keymaps
  • Refactor user keymaps
    All the keymaps in question were using the LAYOUT macro, which did not conform to QMK's standards.
  • Remove LAYOUT macro
  • Add nine new layouts
  • Add layout/matrix diagram

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

- 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]
- 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]
- fix keycode grid alignment

[style]
- 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]
- 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]
- fix keycode grid alignment

[style]
- 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]
Superseded by `LAYOUT_all`.

[chore]
[enhancement]
[enhancement]
@noroadsleft noroadsleft added enhancement keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Sep 24, 2023
@noroadsleft noroadsleft requested a review from a team September 24, 2023 08:43
@dunk2k
Copy link
Contributor

dunk2k commented Sep 24, 2023

@noroadsleft
psssst, you forgot to add community_layouts in info.json 🙊

P.S. have done that a few times myself in my recent rampage(s) on community layouts 😉

[enhancement]
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]
@noroadsleft noroadsleft merged commit a692623 into qmk:develop Sep 24, 2023
1 of 3 checks passed
@noroadsleft noroadsleft deleted the dev/kc60 branch September 24, 2023 22:29
mechlovin pushed a commit to mechlovin/qmk_firmware that referenced this pull request Oct 25, 2023
* 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]
christrotter pushed a commit to christrotter/qmk_firmware that referenced this pull request Nov 28, 2023
* 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]
zgagnon pushed a commit to zgagnon/qmk_firmware_waterfowl that referenced this pull request Dec 15, 2023
* 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]
future-figs pushed a commit to future-figs/qmk_firmware that referenced this pull request Dec 27, 2023
* 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]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants