~ruther/qmk_firmware: master

fa1b5336 — QMK Bot 2 years ago

Merge remote-tracking branch 'origin/master' into develop

4cc427c1 — James Young 2 years ago

Lucid Velvet Solder Layout Additions and Touch-Up (#21313)

* [refactor] refactor via keymap

- grid-align keycodes
- remove trailing whitespace

* [refactor] refactor default keymap

- grid-align keycodes
- remove trailing whitespace

* [bugfix] fix key sequence error in default keymap

* [enhancement] fix key overlaps in Configurator

* [enhancement] add matrix diagram

* [refactor] rename LAYOUT to LAYOUT_all

* [enhancement] add LAYOUT_tkl_f13_ansi_split_space_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi

* [enhancement] add LAYOUT_tkl_f13_iso_split_space_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso

b6c76cd1 — QMK Bot 2 years ago

Merge remote-tracking branch 'origin/master' into develop

b814ff5b — James Young 2 years ago

Lucid Velvet Hotswap Layout Additions and Touch-Up (#21312)

* [refactor] refactor via keymap

- grid-align keycodes
- remove trailing whitespace

* [refactor] refactor default keymap

- grid-align keycodes
- remove trailing whitespace

* [bugfix] fix key sequence error in default keymap

* [enhancement] fix key overlap in Configurator

* [enhancement] add matrix diagram

* [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi

* [enhancement] add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi_tsangan

* [enhancenment] enable Community Layout support

673b536d — QMK Bot 2 years ago

Merge remote-tracking branch 'origin/master' into develop

71b77df0 — James Young 2 years ago

Keebio Cepstrum Configurator Touch-Up (#21310)

* [enhancement] remove redundant layout data

Remove the redundant layout data from the keyboard-level `info.json`.

* [enhancement] correct JSON syntax in rev1/info.json

* [enhancement] friendly-format rev1/info.json

* [enhancement] correct layout data

3274e0a4 — QMK Bot 2 years ago

Merge remote-tracking branch 'origin/master' into develop

ecca9c54 — lalalademaxiya1 2 years ago

Add Keychron C2 Pro (#20701)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>

08ba8a01 — QMK Bot 2 years ago

Merge remote-tracking branch 'origin/master' into develop

595d393f — jonylee@hfd 2 years ago

[Keyboard] Add Monsgeek M5 (#21182)

Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>

63735431 — QMK Bot 2 years ago

Merge remote-tracking branch 'origin/master' into develop

dad41bd2 — James Young 2 years ago

ProtoTypist PT-60 Refactor (#21322)

2f1cac6e — Albert Y 2 years ago

[Docs] Code markdown amendment (#21323)

c69f82f2 — QMK Bot 2 years ago

Merge remote-tracking branch 'origin/master' into develop

7753249d — James Young 2 years ago

NovelKeys NK+: correct layout data (#21317)

* NovelKeys NK+: correct layout data

Add key sizes to the layout data.

* [refactor] rename LAYOUT to LAYOUT_65_xt_ansi_blocker_tsangan

6ec91a75 — QMK Bot 2 years ago

Merge remote-tracking branch 'origin/master' into develop

42cd55e0 — Jack Humbert 2 years ago

Planck Matrix Fixes (#21196)

* fix non-default keymap compiling, initial matrix state, watchdog options

* fix: allow planck/rev7 to be used with ENCODER_ENABLE = no

* chore: update function name on all cases.

* remove old midi tone option

Co-authored-by: Ryan <fauxpark@gmail.com>

* fixes abhixec's planck keymap

* add audio enable condition to abhixec's planck keymap

* add audio enable condition to all muse includes

* Revert "add audio enable condition to all muse includes"

This reverts commit 9779e908970dbf7cf81b1a3f968ef2e85ae2b76f.

* Revert "add audio enable condition to abhixec's planck keymap"

This reverts commit 24c742a5e8ddd55c45ce9f1917b0cb237d4bf721.

* Revert "fixes abhixec's planck keymap"

This reverts commit 4bb085d1ff00febc92ff6211da4fb776c6379fad.

---------

Co-authored-by: Peter.Falken <luis@bitjester.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

ffdc70bf — Nick Brassel 2 years ago

Consolidate `KEYBOARD_OUTPUT`+`KEYMAP_OUTPUT`=>`INTERMEDIATE_OUTPUT` (#21272)

45dc1ccf — James Young 2 years ago

EC Pro X JIS Layout Touch-Up (#21260)

* [refactor] update `info.json` for readability

- sort the JSON objects representing the keyboard's keys in the order:
  - label, matrix, x, y, w, h
- convert numeric JSON values to integers where appropriate

* [refactor] remove key labels from `info.json`

* [refactor] keymap refactor

- grid-align keycodes

* [bugfix] move Enter key to home row

Moves the JSON object representing the Enter key to the home row.

Fixes an issue that resulted in correct key assignment only if the
keymap being compiled/flashed was based upon the `via` keymap.

ac14fce0 — James Young 2 years ago

Kalakos Bahrnob65 Configurator Layout Touch-Up (#21309)

* [enhancement] add matrix diagram

* [refactor] friendly-format info.json

* [enhancement] remove key overlaps