~ruther/qmk_firmware 

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

Jaykeeb Sebelas: Standardize Layout Names (#21999)

* Rename `LAYOUT_65_ansi_blocker` to `LAYOUT_ansi_blocker`

[refactor]

* Rename `LAYOUT_65_ansi_blocker_split_bs` to `LAYOUT_ansi_blocker_split_bs`

[refactor]

* Rename `LAYOUT_65_ansi_blocker_tsangan` to `LAYOUT_ansi_blocker_tsangan`

[refactor]

* Rename `LAYOUT_65_ansi_blocker_tsangan_split_bs` to `LAYOUT_ansi_blocker_tsangan_split_bs`

[refactor]
Merge remote-tracking branch 'upstream/master' into develop

Fixes a merge conflict originating from #21998
(33d7fa1180d232dcdb024c68a8f4629dced32afb).
1b637287 — Joel Challis 1 year, 11 months ago 
Default wear leveling logical size to half backing (#22006)


Inland MK47 Community Layout Support (#21998)

* Rename `LAYOUT` to `LAYOUT_planck_mit`

[refactor]

* Enable Community Layout support

[enhancement]

* Touch-up keymaps

- grid-align keycodes

[style]
is31fl3731: driver naming cleanups (#21918)


is31fl3733: driver naming cleanups (#21905)


is31fl3736: driver naming cleanups (#21903)


is31fl3737: driver naming cleanups (#21904)


is31fl3741: driver naming cleanups (#21929)


ckled2001: driver naming cleanups (#21890)
eb2db05e — Joel Challis 1 year, 11 months ago 
Migrate spi EEPROM_DRIVER to info.json (#21991)


aw20216: driver naming cleanups (#21891)
b9f2121d — Thomas Weißschuh 1 year, 11 months ago 
chibios: mark boot2 bootlader data readonly (#21986)


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

Handwired ScottoKeebs Configurator Updates (#21990)

* ScottoKeebs ScottoAlp: Correct layout data

[enhancement]

* ScottoKeebs ScottoCMD: Correct layout data

[enhancement]

* ScottoKeebs ScottoErgo: Correct layout data

Add hand separation and vertical stagger to the layout data.

[enhancement]

* ScottoKeebs ScottoFrog: Correct layout data

[enhancement]

* ScottoKeebs ScottoGame: Correct layout data

[enhancement]

* ScottoKeebs ScottoInvader: Correct layout data

[enhancement]

* ScottoKeebs ScottoNum: Correct layout data

[enhancement]

* ScottoKeebs ScottoSplit: Correct layout data

[enhancement]

* ScottoKeebs ScottoStarter: Correct layout data

[enhancement]
de381ad3 — Joel Challis 1 year, 11 months ago 
Generate keymap.json config options more forcefully (#21960)


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

Gray Studio Think65 v3 Layout Additions (#21930)

* Add layout/matrix diagram

[docs]

* Format `info.json` as strict JSON

[style]

* Add `LAYOUT_all`

[enhancement]

* Refactor keymaps to use `LAYOUT_all`

Refactor the `default` and `via` keymaps to use the `LAYOUT_all` macro.

- change second Left Shift key to `KC_NUBS`
- insert `KC_NUHS` keycode
- update keycode grid alignment
- remove trailing whitespace

[refactor]

* Rename `LAYOUT_65_blocker` to `LAYOUT_ansi_blocker`

[refactor]

* Rename `LAYOUT_65_iso_blocker` to `LAYOUT_iso_blocker`

[refactor]

* Correct `LAYOUT_iso_blocker` matrix data

The Quote key was mapped as [1, 14] instead of [2, 12].

[bugfix]

* Add `LAYOUT_ansi_blocker_split_bs`

[enhancement]

* Add `LAYOUT_ansi_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_ansi_blocker_tsangan`

[enhancement]

* Add `LAYOUT_iso_blocker_split_bs`

[enhancement]

* Add `LAYOUT_iso_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_iso_blocker_tsangan`

[enhancement]
Merge remote-tracking branch 'origin/master' into develop
Next