Andre Brait
150572da44
[Keymap] update andrebrait GMMK Pro keymap ( #18608 )
2022-10-07 11:14:29 -07:00
QMK Bot
5b4f4855fd
Merge remote-tracking branch 'origin/develop' into xap
2022-10-07 08:09:55 +00:00
QMK Bot
111dcdf713
Merge remote-tracking branch 'origin/master' into develop
2022-10-07 08:09:15 +00:00
jack
de2c81d5b2
Remove all BACKLIGHT_LEVELS 0
( #18630 )
2022-10-07 09:07:56 +01:00
QMK Bot
f9df4d3d98
Merge remote-tracking branch 'origin/develop' into xap
2022-10-07 05:33:37 +00:00
QMK Bot
7c4a012509
Merge remote-tracking branch 'origin/master' into develop
2022-10-07 05:33:01 +00:00
adophoxia
ca2f9e4c8f
Add encoder map support for Keychron Q1v1 and Q2 ( #18598 )
2022-10-06 22:32:19 -07:00
QMK Bot
a029215936
Merge remote-tracking branch 'origin/develop' into xap
2022-10-07 05:31:28 +00:00
QMK Bot
c9d66bee70
Merge remote-tracking branch 'origin/master' into develop
2022-10-07 05:30:57 +00:00
James Young
1a9058b2d1
Studio Kestra Nascent Refactor ( #18625 )
2022-10-06 22:30:09 -07:00
QMK Bot
ae44df37e8
Merge remote-tracking branch 'origin/develop' into xap
2022-10-07 02:56:13 +00:00
QMK Bot
7b57bfe083
Merge remote-tracking branch 'origin/master' into develop
2022-10-07 02:55:33 +00:00
tarneo
a000ea11f7
[Keyboard] Add supersplit ( #18611 )
...
Co-authored-by: tarneo <tarneo@tarneo.fr>
2022-10-06 19:54:50 -07:00
QMK Bot
cd1cbddd70
Merge remote-tracking branch 'origin/develop' into xap
2022-10-07 02:35:35 +00:00
Ryan
6dbbeea46a
Refactor send_extra
( #18615 )
2022-10-06 19:35:01 -07:00
QMK Bot
642351f494
Merge remote-tracking branch 'origin/develop' into xap
2022-10-06 01:02:21 +00:00
QMK Bot
a9414f4840
Merge remote-tracking branch 'origin/master' into develop
2022-10-06 01:01:47 +00:00
4pplet
b820c6db2d
[Keyboard] Add waffling80 Rev B ( #18603 )
...
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-10-05 18:01:09 -07:00
QMK Bot
ba5623833d
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 23:36:44 +00:00
Dasky
ab4cf9a7c1
Fix compilation of 1upkeyboards on develop ( #18618 )
2022-10-06 00:36:06 +01:00
QMK Bot
7693119c27
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 23:01:12 +00:00
QMK Bot
b3b7d601cd
Merge remote-tracking branch 'origin/master' into develop
2022-10-05 23:00:41 +00:00
peepeetee
316edfd297
Enable mouse keys for momokai tap_trio ( #18614 )
2022-10-06 00:00:08 +01:00
QMK Bot
90bc277e1c
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 22:38:48 +00:00
QMK Bot
397c822e42
Merge remote-tracking branch 'origin/master' into develop
2022-10-05 22:38:06 +00:00
Leon Anavi
2f559c0313
[Keyboard] adafruit/macropad: Fix typo ( #18616 )
2022-10-05 15:37:22 -07:00
QMK Bot
5346fe2b63
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 21:53:27 +00:00
QMK Bot
18a9fdb9dc
Merge remote-tracking branch 'origin/master' into develop
2022-10-05 21:52:53 +00:00
ziptyze
6313258f23
Product changes to 1up lineup ( #18382 )
2022-10-05 22:52:18 +01:00
QMK Bot
d479eaf2d6
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 19:20:58 +00:00
QMK Bot
7f43e3ba19
Merge remote-tracking branch 'origin/master' into develop
2022-10-05 19:20:23 +00:00
precondition
248f98bdad
width:2 → height:2 for spacetime thumb keys ( #18605 )
2022-10-05 20:19:45 +01:00
QMK Bot
79f52d0f59
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 17:48:30 +00:00
fauxpark
4d0177cd2a
Merge remote-tracking branch 'upstream/master' into develop
2022-10-06 04:47:34 +11:00
adophoxia
fe6f707a85
[Keyboard] Add encoder map support for GMMK Pro ( #18600 )
2022-10-05 10:42:21 -07:00
QMK Bot
5eb407c0b7
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 17:31:30 +00:00
QMK Bot
7a84a7458c
Merge remote-tracking branch 'origin/master' into develop
2022-10-05 17:30:53 +00:00
4pplet
44aad7b92b
[Keyboard] Add waffling60 Rev D ANSI Hotswap ( #18579 )
...
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-10-05 10:30:41 -07:00
4pplet
e7d5a6e490
[Keyboard] Add waffling60 Rev D Solder ( #18580 )
...
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-10-05 10:30:03 -07:00
QMK Bot
5f62a18ec6
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 15:05:48 +00:00
QMK Bot
ee0a2b5d49
Merge remote-tracking branch 'origin/master' into develop
2022-10-05 15:05:04 +00:00
precondition
5f671de13a
RESET → QK_BOOT in nyhxis/nfr_70 ( #18607 )
2022-10-05 16:04:17 +01:00
QMK Bot
99b9456c75
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 10:37:20 +00:00
QMK Bot
d150850397
Merge remote-tracking branch 'origin/master' into develop
2022-10-05 10:36:37 +00:00
Nick Brassel
c1d21de1a2
Fixup builds for mechlovin/infinity87. ( #18604 )
2022-10-05 21:35:56 +11:00
QMK Bot
b039852f8e
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 02:35:52 +00:00
QMK Bot
7392c6b255
Merge remote-tracking branch 'origin/master' into develop
2022-10-05 02:35:21 +00:00
Jesper Severinsen
0e81954289
[Keyboard] Add Nyhxis NFR-70 keyboard ( #17562 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-04 19:34:48 -07:00
QMK Bot
bd2e3b80dd
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 01:41:33 +00:00
QMK Bot
dd7673f3a7
Merge remote-tracking branch 'origin/master' into develop
2022-10-05 01:40:52 +00:00
nodatk
3f63bbc7d8
[Keyboard] Twig50 ( #18085 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-10-04 18:40:18 -07:00
QMK Bot
fce1234dca
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 00:38:23 +00:00
jack
bb4740d95b
Remove lingering DRIVER_LED_TOTAL references ( #18594 )
2022-10-05 01:38:19 +01:00
jack
b3211c106c
Fixup linworks/fave84h ( #18593 )
2022-10-05 01:37:50 +01:00
QMK Bot
d413d4c2b7
Merge remote-tracking branch 'origin/develop' into xap
2022-10-05 00:36:54 +00:00
Ryan
4d6fab1cfa
onekey: Enable ADC for STM32F072 Discovery ( #18592 )
2022-10-05 11:36:20 +11:00
QMK Bot
f0f21df0d3
Merge remote-tracking branch 'origin/develop' into xap
2022-10-04 22:25:12 +00:00
Drashna Jaelre
64b1ed4550
Fix Per Key LED Indicator Callbacks ( #18450 )
...
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-10-04 15:24:22 -07:00
QMK Bot
3d6a1462df
Merge remote-tracking branch 'origin/develop' into xap
2022-10-04 21:11:04 +00:00
Stefan Kerkmann
996a9006d3
[Core] PWM Backlight for RP2040 ( #17706 )
2022-10-04 23:10:24 +02:00
QMK Bot
c36cb440a6
Merge remote-tracking branch 'origin/develop' into xap
2022-10-03 07:42:33 +00:00
QMK Bot
0e6f191436
Merge remote-tracking branch 'origin/master' into develop
2022-10-03 07:42:01 +00:00
Johns
1d194ac60f
Adds Anne Pro 2 c18 ISO variant support ( #18154 )
2022-10-03 18:41:24 +11:00
QMK Bot
ef85ddde19
Merge remote-tracking branch 'origin/develop' into xap
2022-10-03 06:36:52 +00:00
QMK Bot
de19cb7b22
Merge remote-tracking branch 'origin/master' into develop
2022-10-03 06:36:18 +00:00
Alabahuy
f5e81681cd
add rart60 ( #18570 )
...
* add rart60
2022-10-03 07:35:43 +01:00
QMK Bot
c540893ddb
Merge remote-tracking branch 'origin/develop' into xap
2022-10-02 20:25:28 +00:00
QMK Bot
bdffe9efe8
Merge remote-tracking branch 'origin/master' into develop
2022-10-02 20:24:56 +00:00
Nick Brassel
9ecd6eb9b9
Add tzarc/ghoul
. ( #18562 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-10-03 07:24:22 +11:00
QMK Bot
d111594843
Merge remote-tracking branch 'origin/develop' into xap
2022-10-01 22:36:47 +00:00
Ryan
c4ff8192c2
Reverse keymap search order ( #18449 )
2022-10-01 23:36:07 +01:00
QMK Bot
e79a82c88a
Merge remote-tracking branch 'origin/develop' into xap
2022-10-01 17:57:49 +00:00
QMK Bot
3c9ac5ce58
Merge remote-tracking branch 'origin/master' into develop
2022-10-01 17:57:17 +00:00
Peter Park
2b3f6d0ec6
[Keyboard] Add Uni v4 keyboard ( #18280 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
2022-10-01 10:56:41 -07:00
QMK Bot
9d21dc43d4
Merge remote-tracking branch 'origin/develop' into xap
2022-10-01 17:45:57 +00:00
QMK Bot
38bc9b57b3
Merge remote-tracking branch 'origin/master' into develop
2022-10-01 17:45:24 +00:00
4pplet
0bae3b09a1
[Keyboard] Add waffling60 Rev D ISO Hotswap ( #18372 )
...
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-10-01 10:44:52 -07:00
QMK Bot
a116da4bc4
Merge remote-tracking branch 'origin/develop' into xap
2022-10-01 16:47:50 +00:00
Joel Challis
e068f7a8d1
RESET -> QK_BOOT user keymaps ( #18560 )
2022-10-01 17:47:12 +01:00
QMK Bot
c955e59c29
Merge remote-tracking branch 'origin/develop' into xap
2022-10-01 16:21:53 +00:00
QMK Bot
818ef07c24
Merge remote-tracking branch 'origin/master' into develop
2022-10-01 16:21:12 +00:00
Joel Challis
2d25b89d11
Remove more RESET keycode references ( #18559 )
2022-10-01 17:20:42 +01:00
QMK Bot
e5123aaa42
Merge remote-tracking branch 'origin/develop' into xap
2022-10-01 14:22:50 +00:00
QMK Bot
2c5ceccc5a
Merge remote-tracking branch 'origin/master' into develop
2022-10-01 14:22:06 +00:00
Nick Brassel
059a7fb9b0
Djinn theme, allow force redraws ( #18558 )
2022-10-01 15:21:22 +01:00
QMK Bot
ac96f59249
Merge remote-tracking branch 'origin/develop' into xap
2022-10-01 02:55:59 +00:00
QMK Bot
f81123469e
Merge remote-tracking branch 'origin/master' into develop
2022-10-01 02:55:17 +00:00
Ryan
9f0d9b4fbe
onekey: fix quine keymap ( #18555 )
2022-10-01 12:54:42 +10:00
QMK Bot
5c22873307
Merge remote-tracking branch 'origin/develop' into xap
2022-09-30 23:34:25 +00:00
QMK Bot
165d2e867d
Merge remote-tracking branch 'origin/master' into develop
2022-09-30 23:33:56 +00:00
Markus Knutsson
2b33d2c098
[Keyboard] Add Little Big Scroll 4 macropad ( #18516 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-30 16:33:09 -07:00
QMK Bot
065090cb5f
Merge remote-tracking branch 'origin/develop' into xap
2022-09-30 23:08:29 +00:00
QMK Bot
82a996ad2d
Merge remote-tracking branch 'origin/master' into develop
2022-09-30 23:07:56 +00:00
nimishgautam
3db33fba28
[Keymap] corne layout with mac/linux text editing shortcuts ( #18374 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-30 16:07:20 -07:00
QMK Bot
57eff99ff7
Merge remote-tracking branch 'origin/develop' into xap
2022-09-30 22:10:10 +00:00
QMK Bot
305fd1c877
Merge remote-tracking branch 'origin/master' into develop
2022-09-30 22:09:37 +00:00
jack
245f00b4d9
Fixup keebio/sinc ( #18551 )
2022-09-30 23:08:40 +01:00
QMK Bot
6967869a16
Merge remote-tracking branch 'origin/develop' into xap
2022-09-30 21:27:24 +00:00
jack
d1903f4dd4
Fixup controllerworks/mini42 ( #18553 )
...
fix up stuff by waffle
2022-09-30 22:26:40 +01:00
QMK Bot
f0104ad181
Merge remote-tracking branch 'origin/develop' into xap
2022-09-30 20:46:41 +00:00