Idan Kamara
9614c3adfa
[keyboard] add sweeq, a ferris/sweep variant with diodes ( #21597 )
2023-08-29 21:41:44 -07:00
QMK Bot
776a29a279
Merge remote-tracking branch 'origin/develop' into xap
2023-08-30 01:10:11 +00:00
QMK Bot
5aaf5a8c25
Merge remote-tracking branch 'origin/master' into develop
2023-08-30 01:09:32 +00:00
Andrew Kannan
adef366e0c
CannonKeys Meetup Pad 2023 ( #21806 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-08-29 18:08:51 -07:00
QMK Bot
421f4c5d5e
Merge remote-tracking branch 'origin/develop' into xap
2023-08-30 00:48:28 +00:00
QMK Bot
b078d0bfc5
Merge remote-tracking branch 'origin/master' into develop
2023-08-30 00:47:53 +00:00
Joel Challis
c2a81d8fd4
Revert "fix 60_hhkb ASCII diagram ( #21813 )" ( #21869 )
...
This reverts commit af2d6ea128
.
2023-08-30 01:47:15 +01:00
QMK Bot
0f05114818
Merge remote-tracking branch 'origin/develop' into xap
2023-08-30 00:35:31 +00:00
QMK Bot
7e8a64ca53
Merge remote-tracking branch 'origin/master' into develop
2023-08-30 00:34:44 +00:00
Lasse Luttermann
ce51fdfe51
doio/kb16: Added timeout option for OLED boot logo. ( #21823 )
2023-08-30 01:34:10 +01:00
QMK Bot
71a975f651
Merge remote-tracking branch 'origin/develop' into xap
2023-08-30 00:25:29 +00:00
QMK Bot
d78c0007ba
Merge remote-tracking branch 'origin/master' into develop
2023-08-30 00:24:50 +00:00
Laneware
fbb61c3b1d
Update keymap.c to add encoder ( #21469 )
...
* Update keymap.c to add encoder
* Fix build
---------
Co-authored-by: zvecr <git@zvecr.com>
2023-08-30 01:24:13 +01:00
QMK Bot
cee6d727c9
Merge remote-tracking branch 'origin/develop' into xap
2023-08-30 00:09:45 +00:00
QMK Bot
e798c02d82
Merge remote-tracking branch 'origin/master' into develop
2023-08-30 00:08:10 +00:00
QMK Bot
b57817820e
Merge remote-tracking branch 'origin/develop' into xap
2023-08-30 00:07:55 +00:00
Joel Challis
281541fe1b
Fix invalid encoder_map declaration ( #21868 )
2023-08-30 01:07:38 +01:00
QMK Bot
14295563e1
Merge remote-tracking branch 'origin/master' into develop
2023-08-30 00:07:19 +00:00
Duncan Sutherland
6d7344428a
fix 60_jis keymap.c ( #21820 )
2023-08-30 01:06:46 +01:00
QMK Bot
90a3d6a2ad
Merge remote-tracking branch 'origin/develop' into xap
2023-08-29 23:45:04 +00:00
QMK Bot
5dd1a68cb6
Merge remote-tracking branch 'origin/master' into develop
2023-08-29 23:44:31 +00:00
QMK Bot
32fe803a30
Merge remote-tracking branch 'origin/develop' into xap
2023-08-29 23:44:15 +00:00
Adam Price
4769f6d419
chore(ferris/test): visually format keymap ( #21851 )
...
... and set all keys to printable characters (as described in the
keymap's readme)
2023-08-30 00:43:47 +01:00
QMK Bot
66fcc7f5f5
Merge remote-tracking branch 'origin/master' into develop
2023-08-29 23:43:42 +00:00
Duncan Sutherland
af2d6ea128
fix 60_hhkb ASCII diagram ( #21813 )
2023-08-30 00:43:08 +01:00
QMK Bot
fc018aacb1
Merge remote-tracking branch 'origin/develop' into xap
2023-08-29 13:29:22 +00:00
QMK Bot
42e369dc9e
Merge remote-tracking branch 'origin/master' into develop
2023-08-29 13:28:44 +00:00
Joel Challis
11a8101301
Fix compilation of dynamic_keymap.c without VIA ( #21858 )
2023-08-29 14:28:09 +01:00
QMK Bot
23a8c1aede
Merge remote-tracking branch 'origin/develop' into xap
2023-08-29 11:30:31 +00:00
Nick Brassel
9055dbbe65
Branch point for 20230827 breaking change.
2023-08-29 21:29:26 +10:00
QMK Bot
4257d7446f
Merge remote-tracking branch 'origin/develop' into xap
2023-08-29 11:26:56 +00:00
Nick Brassel
31a91add16
Merge branch 'develop'
2023-08-29 21:24:43 +10:00
QMK Bot
bc68d65fc2
Merge remote-tracking branch 'origin/develop' into xap
2023-08-29 11:19:53 +00:00
Nick Brassel
edaf8a87ef
Remove develop notice.
2023-08-29 21:19:06 +10:00
QMK Bot
39ea56380c
Merge remote-tracking branch 'origin/develop' into xap
2023-08-29 11:15:59 +00:00
Nick Brassel
4818e14c77
Breaking changes changelog, 2023q3 version ( #21848 )
...
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: honorless <86894501+lesshonor@users.noreply.github.com>
2023-08-29 21:15:21 +10:00
zvecr
980699f3cf
Fix xap docs gen + clarify some broadcast messages
2023-08-29 02:37:23 +01:00
zvecr
87fd4b42f5
Tidy up broadcast in python client
2023-08-29 02:36:21 +01:00
QMK Bot
e9206d2b16
Merge remote-tracking branch 'origin/develop' into xap
2023-08-27 06:51:54 +00:00
Ryan
66b744b63b
Clean up Unicode API usage in user keymaps ( #21849 )
2023-08-27 16:51:19 +10:00
QMK Bot
3ee7403e26
Merge remote-tracking branch 'origin/develop' into xap
2023-08-27 03:30:51 +00:00
Ryan
70e34e491c
Unicode, Unicodemap and UCIS refactor ( #21659 )
2023-08-27 13:30:19 +10:00
QMK Bot
c2324ff646
Merge remote-tracking branch 'origin/develop' into xap
2023-08-27 03:00:54 +00:00
Joel Challis
95681b8ff4
Add *_MATRIX_LED_COUNT generation ( #21110 )
2023-08-27 04:00:14 +01:00
QMK Bot
e06d31ff4a
Merge remote-tracking branch 'origin/develop' into xap
2023-08-27 02:52:55 +00:00
Drashna Jaelre
25331be316
Revert changes to ChibiOS Suspend Code ( #21830 )
...
* Partially revert #19780
* Finish
* Get teensy 3.5/3.6 board files too
* fix lint issue
* Revert "[Bug] Restore usb suspend wakeup delay (#21676 )"
This reverts commit e8e989fd7a
.
* Apply suggestions from code review
Co-authored-by: Joel Challis <git@zvecr.com>
---------
Co-authored-by: Joel Challis <git@zvecr.com>
2023-08-27 03:52:12 +01:00
QMK Bot
e47578c69e
Merge remote-tracking branch 'origin/develop' into xap
2023-08-26 20:04:02 +00:00
Ryan
736451558e
Rework info.json reference ( #21324 )
...
* Rework info.json reference
* Apply suggestions from code review
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update backlight.pins description
* Add rgblight.driver and lowercase other driver names
* Remove `split.main` and `split.matrix_grid` for now as they are not working yet
---------
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-08-26 21:03:29 +01:00
QMK Bot
27c024f604
Merge remote-tracking branch 'origin/develop' into xap
2023-08-26 18:44:56 +00:00
QMK Bot
50151be430
Merge remote-tracking branch 'origin/master' into develop
2023-08-26 18:44:20 +00:00