~ruther/qmk_firmware

Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add rot13labs rotc0n macropad (#23028)

* asdds rot13labs rotc0n macropad

* Update keyboards/rot13labs/rotc0n/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

* Delete keyboards/rot13labs/rotc0n/config.h

removing config.h

* Update keyboards/rot13labs/rotc0n/readme.md

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

---------

Co-authored-by: c0ldbru <c0ldbrusec@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
1e7c2a89 — spacehangover 1 year, 6 months ago
Added SoyuzXL Macropad (#23075)

* added mercury macropad WWA

* Revert "added mercury macropad WWA"

This reverts commit 81b48185d37ad704781c07bf6d9df2203a897de7.

* added Mercury macropad WWA

* added Soyuz Macropad

* Added Soyuz XL Macropad
4a64d47f — Joel Challis 1 year, 6 months ago
Migrate WEAR_LEVELING_* to info.json (#23077)

Merge remote-tracking branch 'origin/master' into develop
1ddff6e3 — spacehangover 1 year, 6 months ago
Added Soyuz Macropad WWA (#23072)

* added mercury macropad WWA

* Revert "added mercury macropad WWA"

This reverts commit 81b48185d37ad704781c07bf6d9df2203a897de7.

* added Mercury macropad WWA

* added Soyuz Macropad
Update vid, pid, and add via keymap (#23063)

ff884d89 — Joel Challis 1 year, 6 months ago
Remove invalid keyboard level features (#23074)

7be40fd1 — Joel Challis 1 year, 6 months ago
Migrate RGB Matrix config to info.json (#23000)

974e98ce — Joel Challis 1 year, 6 months ago
Migrate RGB Matrix config to info.json (#22998)

is31fl3741: split PWM and scaling buffers (#23049)

Merge remote-tracking branch 'origin/master' into develop
c4414af9 — spacehangover 1 year, 6 months ago
[Keyboard] Add Mercury Macropad (#23071)

* added mercury macropad WWA

* Revert "added mercury macropad WWA"

This reverts commit 81b48185d37ad704781c07bf6d9df2203a897de7.

* added Mercury macropad WWA
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add Artifact LvL 1 HS (#22964)

* initial commit lvl1

* Add APM32 option

* update stuff:)

* White

* Update to yaml

* Update keyboards/artifact/lvl/rev_hs01/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update info.json

* Update info.json

Ups...

* Update mcuconf.h

* Update halconf.h

* Update info.json

* Update keyboards/artifact/lvl/rev_hs01/config.h

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

---------

Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
0cad5e9d — フィルターペーパー 1 year, 6 months ago
Refactor: move p3d keyboards (#22763)

Group standalone p3dstore keyboards into p3d folder
98a68b68 — Joel Challis 1 year, 6 months ago
Fix git-submodule running in wrong location (#23059)

Merge remote-tracking branch 'origin/master' into develop
El Cantor HS. Update info.json (#23020)

Fix for wrong key's placement.
Next