~ruther/qmk_firmware 

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

[keyboard] add sweeq, a ferris/sweep variant with diodes (#21597)


Merge remote-tracking branch 'origin/master' into develop
adef366e — Andrew Kannan 1 year, 11 months ago 
CannonKeys Meetup Pad 2023 (#21806)

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

Merge remote-tracking branch 'origin/master' into develop
c2a81d8f — Joel Challis 1 year, 11 months ago 
Revert "fix 60_hhkb ASCII diagram (#21813)" (#21869)

This reverts commit af2d6ea128f684691432e2a209cfa11a63f77422.
Merge remote-tracking branch 'origin/master' into develop
ce51fdfe — Lasse Luttermann 1 year, 11 months ago 
doio/kb16: Added timeout option for OLED boot logo. (#21823)


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

Update keymap.c to add encoder (#21469)

* Update keymap.c to add encoder

* Fix build

---------

Co-authored-by: zvecr <git@zvecr.com>
Merge remote-tracking branch 'origin/master' into develop
281541fe — Joel Challis 1 year, 11 months ago 
Fix invalid encoder_map declaration (#21868)


Merge remote-tracking branch 'origin/master' into develop
6d734442 — Duncan Sutherland 1 year, 11 months ago 
fix 60_jis keymap.c (#21820)


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

chore(ferris/test): visually format keymap (#21851)

... and set all keys to printable characters (as described in the
keymap's readme)
Merge remote-tracking branch 'origin/master' into develop
af2d6ea1 — Duncan Sutherland 1 year, 11 months ago 
fix 60_hhkb ASCII diagram (#21813)


Merge remote-tracking branch 'origin/master' into develop
11a81013 — Joel Challis 1 year, 11 months ago 
Fix compilation of dynamic_keymap.c without VIA (#21858)
Next