Merge remote-tracking branch 'origin/master' into develop
Added personal Iris Rev6a layout and Milk 2% layout (#17600)
by JellyTitan
Merge remote-tracking branch 'origin/master' into develop
Add bepo variant to massdrop/thekey keymaps (#18129)
by mrBen
Merge remote-tracking branch 'origin/master' into develop
Bandominedoni encoder fix (#18229)
by 3araht
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Updates to Work Louder keyboards (#18232)
by Drashna
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] add tg67 (#18225)
Ensure all keyboards have a bootloader set (#18234)
Move bootloader.mk to platforms (#18228)
[Core] Rework PS/2 driver selection (#17892)
* [Core] Rework PS/2 driver selection
Enabling and selecting PS/2 driver was using old approach,
so it was reworked to current approach, inspired by Serial
and WS2812 driver selections.
* [Keyboard] Update keyboards using PS/2 to use new PS/2 driver selection
* [Docs] Update PS/2 documentation to use new PS/2 driver selection
* Fix indentation
* [Core] Add PS2 to data driver
* Fix oversight in property name
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Add PS/2 pins to data driven mappings
Co-authored-by: Drashna Jaelre <drashna@live.com>
Merge remote-tracking branch 'origin/master' into develop
`qmk lint`: fix TypeError (#18226)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] CannonKeys Malicious Ergo (#17076)
* Add Malicious Ergo keyboard to QMK
* Update layout
* update info.json
* update info.json again
* Update info.json again
* i h8 info.json
* its default not all
* Update keyboards/cannonkeys/malicious_ergo/config.h
* Add bootloader instructions and license header
* Update keyboards/cannonkeys/malicious_ergo/rules.mk
* Update keyboards/cannonkeys/malicious_ergo/rules.mk
* Update keyboards/cannonkeys/malicious_ergo/readme.md
* Remove rotation from info.json
* Remove labels
* Update keyboards/cannonkeys/malicious_ergo/readme.md
* Update keyboards/cannonkeys/malicious_ergo/malicious_ergo.h
* Revise info.json again
* whitespace fix
* Apply suggestions from code review
Move pid/vid into info json
Fix rounding errors in info json
Thanks to fauxpark and noroadsleft!
Merge remote-tracking branch 'origin/master' into develop