~ruther/qmk_firmware 

Merge remote-tracking branch 'origin/master' into develop
fec23230 — James Young 1 year, 5 months ago 
Orthograph: correct layout data (#23213)

* correct layout data

Correct the key sizes and positions in the layout data.

[chore]

* remove layout offset

Remove the dead space from the layout data.

[chore]
Merge remote-tracking branch 'origin/master' into develop
a8991722 — James Young 1 year, 5 months ago 
Xiudi XD96 Layout Bugfixes and Touch-Up (#23242)

* Correct AliExpress Hardware Availability link in readme

Previous URL linked to a Cospad listing.

[chore]
[docs]

* Convert `info.json` to four-space indent

[style]

* Correct `LAYOUT_all` matrix data

The right half of split Backspace is actually located at [5, 9], not
[5, 3].

[bugfix]

* Correct `LAYOUT_96_iso` matrix data

Corrects the matrix positions of the ISO Hash/Tilde and ISO Enter keys
to [3, 12] and [3, 13], respectively.

[bugfix]

* Add layout/matrix diagram

[docs]

* Refactor keymaps

- remove "inline block" comments
- grid-align keycodes
- use four-space indent

[style]
Change default RGB effect for momokai keypads to solid white (#23217)


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

[Keyboard] Add sf2040 (#23211)

Co-authored-by: jack <0x6a73@protonmail.com>

Merge remote-tracking branch 'origin/master' into develop
113d3d60 — David Hoelscher 1 year, 5 months ago 
[Keyboard] Add CMK11 (#23239)

* adding cmk11

* correcting default keymap

* removing rules.mk

* removing unnecessary comment
Fixup annepro2 (#23206)

Co-authored-by: Joel Challis <git@zvecr.com>
Merge remote-tracking branch 'origin/master' into develop
8946aace — Nick Brassel 1 year, 5 months ago 
Add instructions for debugging ARM with VSCode+BMP. (#11217)


Merge remote-tracking branch 'origin/master' into develop
0a03fc51 — takashicompany 1 year, 5 months ago 
[Keyboard] Add Ejectix (#23204)

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

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

[Keyboard] Add 60XT (#23210)

Co-authored-by: jack <0x6a73@protonmail.com>
c48f372c — Joel Challis 1 year, 5 months ago 
Migrate annepro2 away from custom matrix (#23221)

* Migrate annepro2 away from custom matrix

* LTO
83e6ddbb — Drashna Jaelre 1 year, 5 months ago 
[Audio] Add support for audio shutdown pin (#22731)

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

Merge remote-tracking branch 'origin/master' into develop
a2c23e94 — Joel Challis 1 year, 5 months ago 
Initial 'qmk test-c' functionality (#23038)
Next