QMK Bot
4c39bad2e6
Merge remote-tracking branch 'origin/master' into develop
2022-06-21 03:12:14 +00:00
Albert Y
c114996034
[Keyboard] Add more bootloader options for id75 ( #17441 )
2022-06-20 20:11:37 -07:00
QMK Bot
21fc1b27c6
Merge remote-tracking branch 'origin/develop' into xap
2022-06-21 02:25:36 +00:00
QMK Bot
a6eeb930ae
Merge remote-tracking branch 'origin/master' into develop
2022-06-21 02:24:10 +00:00
QMK Bot
84deeb7e44
Merge remote-tracking branch 'origin/develop' into xap
2022-06-21 02:24:04 +00:00
Wolf Van Herreweghe
3077123bf0
[Keyboard] Add base FAve65H firmware ( #17147 )
...
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
2022-06-20 19:23:50 -07:00
Wolf Van Herreweghe
1c26c0bc9b
[Keyboard] Update firmware for the FAve 87H ( #16920 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
2022-06-20 19:23:34 -07:00
QMK Bot
3370e2b74d
Merge remote-tracking branch 'origin/master' into develop
2022-06-21 02:23:27 +00:00
Wolf Van Herreweghe
e8e45bca98
[Keyboard] Update FAve 84H RGB firmware ( #16919 )
...
* Add base FAve 84H firmware
* Update keyboards/linworks/fave84h/readme.md
Thank you, apologies for the oversight
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/linworks/fave84h/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/linworks/fave84h/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Move LED config in ifdef
* update read me
* Update Product Name
* Update keyboards/linworks/fave84h/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add Via RGB Matrix Control
* Add base FAve 84H firmware
* Add Via RGB Matrix Control
* fix merge conflict
* reduce max brightness
* remove action macro and action function
Co-authored-by: Joel Challis <git@zvecr.com>
* Remove / update code to work with the build in QMK via hack
* Update Read me
* Add newline at end of rules
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-20 19:22:53 -07:00
QMK Bot
92e7cacb4c
Merge remote-tracking branch 'origin/develop' into xap
2022-06-21 00:57:17 +00:00
Nick Brassel
589e756e98
Fixup SPI mode 3 => 0 on tzarc/djinn. ( #17440 )
2022-06-21 10:56:47 +10:00
QMK Bot
ce9b36cbbf
Merge remote-tracking branch 'origin/develop' into xap
2022-06-21 00:27:20 +00:00
QMK Bot
93ee789387
Merge remote-tracking branch 'origin/master' into develop
2022-06-21 00:26:40 +00:00
bomb
5ab90cc72a
[Keyboard] Add tegic for melgeek! ( #17400 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-20 17:26:08 -07:00
QMK Bot
bdc2387a7d
Merge remote-tracking branch 'origin/develop' into xap
2022-06-20 04:22:04 +00:00
QMK Bot
36d60769f8
Merge remote-tracking branch 'origin/master' into develop
2022-06-20 04:21:32 +00:00
Nick Brassel
aa06893b58
Add Djinn. ( #17382 )
...
* Add Djinn.
* Review comments.
* Further cleanup.
2022-06-20 14:20:56 +10:00
QMK Bot
6b0bdc30de
Merge remote-tracking branch 'origin/develop' into xap
2022-06-19 18:17:37 +00:00
QMK Bot
4e3db51e92
Merge remote-tracking branch 'origin/master' into develop
2022-06-19 18:17:00 +00:00
anubhav dhiman
ad2e853611
[Keyboard] add at6 keyboard ( #17346 )
...
Co-authored-by: zvecr <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-19 11:16:24 -07:00
QMK Bot
7d2f0172c4
Merge remote-tracking branch 'origin/develop' into xap
2022-06-19 18:00:05 +00:00
QMK Bot
d6eff188e9
Merge remote-tracking branch 'origin/master' into develop
2022-06-19 17:59:31 +00:00
Markus Weimar
7982957f75
[Keymap] Update XD75 keymap by markus ( #17417 )
2022-06-19 10:59:00 -07:00
QMK Bot
36d87291dd
Merge remote-tracking branch 'origin/develop' into xap
2022-06-18 21:38:41 +00:00
Drashna Jaelre
0da6562c4d
Make default layer size 16-bit ( #15286 )
...
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-06-19 07:37:51 +10:00
QMK Bot
9296bcd920
Merge remote-tracking branch 'origin/develop' into xap
2022-06-17 03:51:20 +00:00
QMK Bot
e44604c256
Merge remote-tracking branch 'origin/master' into develop
2022-06-17 03:50:47 +00:00
jack
545923b0a0
Fixup handwired/macroboard ( #17405 )
2022-06-17 04:50:14 +01:00
QMK Bot
2891daaf00
Merge remote-tracking branch 'origin/develop' into xap
2022-06-16 22:36:29 +00:00
QMK Bot
00872ea7e7
Merge remote-tracking branch 'origin/master' into develop
2022-06-16 22:36:12 +00:00
Dmitry Nosachev
6d2f9c9c1e
[Keyboard] Atreus: add STM32F103C8T6 based variant ( #16846 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-16 15:36:11 -07:00
QMK Bot
c251d88934
Merge remote-tracking branch 'origin/master' into develop
2022-06-16 22:35:55 +00:00
Michał Szczepaniak
82a7f4adda
[handwired/macroboard] Add separate f401 and f411 configs… ( #16338 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-16 15:35:40 -07:00
Gordon
89921e917a
[Keyboard] Fix 1U space in Keebio/sinc/rev2 layout macros ( #16901 )
2022-06-16 15:35:13 -07:00
QMK Bot
a7688b2549
Merge remote-tracking branch 'origin/develop' into xap
2022-06-16 22:35:10 +00:00
QMK Bot
4610a6bf49
Merge remote-tracking branch 'origin/master' into develop
2022-06-16 22:34:39 +00:00
minibois
6d7026e561
[Keyboard] mini_ten_key_plus edited info.json ( #15574 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-16 15:34:05 -07:00
QMK Bot
d1bad9f098
Merge remote-tracking branch 'origin/develop' into xap
2022-06-16 21:47:15 +00:00
QMK Bot
9e35a1f617
Merge remote-tracking branch 'origin/master' into develop
2022-06-16 21:46:41 +00:00
Yoshihiro Saito
811dbda20a
[Keymap] Update yoshimaru46 keymap ( #17402 )
2022-06-16 14:46:04 -07:00
QMK Bot
a96aff3f27
Merge remote-tracking branch 'origin/develop' into xap
2022-06-16 18:21:55 +00:00
QMK Bot
e312fa44e2
Merge remote-tracking branch 'origin/master' into develop
2022-06-16 18:21:12 +00:00
Lorenzo Leonini
8be0496347
[Keyboard] Add ADM42 Keyboard ( #17366 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-16 11:20:31 -07:00
QMK Bot
aba593d41a
Merge remote-tracking branch 'origin/develop' into xap
2022-06-16 02:09:09 +00:00
QMK Bot
fa9ecc431d
Merge remote-tracking branch 'origin/master' into develop
2022-06-16 02:08:34 +00:00
peepeetee
8e128452db
[Keyboard] Idobao Montex V2(RGB) ( #15865 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Christian Hofstede <4440939+chofstede@users.noreply.github.com>
Co-authored-by: Vino Rodrigues <github@m.vinorodrigues.com>
Co-authored-by: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
2022-06-16 12:08:01 +10:00
QMK Bot
38f32f7afc
Merge remote-tracking branch 'origin/develop' into xap
2022-06-16 02:05:37 +00:00
QMK Bot
cac5f96275
Merge remote-tracking branch 'origin/master' into develop
2022-06-16 02:05:06 +00:00
IBNobody
8e5f8a5ff9
[Keyboard] Add Idobao Montex RGB (V2) ( #16897 )
...
* Add Montex V2 (#10 )
* Update readme.md
* Update rules.mk
* Update config.h
* Update keyboards/idobao/montex/v2/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/idobao/montex/v2/rules.mk
Add Layouts
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Merged code fron work done with @vinorodrigues
* Update keyboards/idobao/montex/v2/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/idobao/montex/v2/v2.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/idobao/montex/v2/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Removing via_nug keymap
* update to montex code (#11 )
* remove VIA_QMK_RGBLIGHT_ENABLE
* more data driven config, simple copyright headers, some code cleanup
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
2022-06-15 19:04:30 -07:00
QMK Bot
8e8f5e8371
Merge remote-tracking branch 'origin/develop' into xap
2022-06-15 20:32:21 +00:00
QMK Bot
6e10a80174
Merge remote-tracking branch 'origin/master' into develop
2022-06-15 20:31:47 +00:00
QMK Bot
6c6950ab7f
Merge remote-tracking branch 'origin/develop' into xap
2022-06-15 20:31:41 +00:00
Felicia Kuan
7224d84167
edit typo in comment ( #17394 )
2022-06-15 21:31:13 +01:00
QMK Bot
c40af06871
Merge remote-tracking branch 'origin/master' into develop
2022-06-15 20:31:09 +00:00
ALTAiN
afbba27f42
BLASTER75 info.json position fixes ( #17395 )
2022-06-15 21:30:35 +01:00
QMK Bot
1a250df735
Merge remote-tracking branch 'origin/develop' into xap
2022-06-15 00:15:17 +00:00
QMK Bot
81d2218cee
Merge remote-tracking branch 'origin/master' into develop
2022-06-15 00:14:34 +00:00
Arturo Avila
de207b97fa
[Keymap+] SnailMap port for the Kintsugi keyboard. ( #17341 )
2022-06-14 17:13:37 -07:00
QMK Bot
284fc9c3ab
Merge remote-tracking branch 'origin/develop' into xap
2022-06-14 23:43:22 +00:00
QMK Bot
85d84938cf
Merge remote-tracking branch 'origin/master' into develop
2022-06-14 23:42:47 +00:00
Forrest Cahoon
b7ce3b1967
[Keymap] New keymap for Keebio FoldKB ( #17364 )
2022-06-14 16:42:41 -07:00
kb-elmo
dc2ce36d63
[Keyboard] Add Chaos65 keyboard ( #17369 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-14 16:42:15 -07:00
QMK Bot
333d215a24
Merge remote-tracking branch 'origin/develop' into xap
2022-06-14 23:33:07 +00:00
QMK Bot
adf4c27db2
Merge remote-tracking branch 'origin/master' into develop
2022-06-14 23:32:38 +00:00
Yutong Zhou
1c45845178
[Keyboard] Flip encoder pads on basketweave ( #17375 )
2022-06-14 16:32:07 -07:00
QMK Bot
71a9aef016
Merge remote-tracking branch 'origin/develop' into xap
2022-06-13 20:13:39 +00:00
Jouke Witteveen
1706da9054
tap-dance: Restructure code and document in more detail ( #16394 )
2022-06-13 22:12:55 +02:00
QMK Bot
9342369c67
Merge remote-tracking branch 'origin/develop' into xap
2022-06-13 18:31:59 +00:00
QMK Bot
b17324498e
Merge remote-tracking branch 'origin/master' into develop
2022-06-13 18:31:17 +00:00
npspears
e49fa43a7f
[Keyboard] add SNOP60 ( #17131 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-13 11:30:35 -07:00
QMK Bot
ae3ea0fe81
Merge remote-tracking branch 'origin/develop' into xap
2022-06-13 05:15:57 +00:00
QMK Bot
0c82aafb8a
Merge remote-tracking branch 'origin/master' into develop
2022-06-13 05:15:12 +00:00
ALTAiN
5149728b23
[Keyboard] Add BLASTER75 keyboard ( #16887 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-12 22:14:33 -07:00
QMK Bot
017829daec
Merge remote-tracking branch 'origin/develop' into xap
2022-06-12 18:31:26 +00:00
QMK Bot
d288121f21
Merge remote-tracking branch 'origin/master' into develop
2022-06-12 18:30:50 +00:00
HorrorTroll
c2045558d9
[Keyboard] Add Lemon40 keyboard ( #17357 )
2022-06-12 11:30:08 -07:00
QMK Bot
51bca87dd4
Merge remote-tracking branch 'origin/develop' into xap
2022-06-12 14:35:37 +00:00
QMK Bot
191c180644
Merge remote-tracking branch 'origin/master' into develop
2022-06-12 14:35:07 +00:00
Albert Y
b5a53a9946
Add encoder map ( #17361 )
2022-06-12 15:34:29 +01:00
QMK Bot
2f566af886
Merge remote-tracking branch 'origin/develop' into xap
2022-06-12 10:48:23 +00:00
QMK Bot
90765aaefd
Merge remote-tracking branch 'origin/master' into develop
2022-06-12 10:47:53 +00:00
Drashna Jaelre
3f841a24f0
[Keyboard] Remove terminal commands from m48 ( #17363 )
2022-06-12 20:47:24 +10:00
QMK Bot
8a529cac45
Merge remote-tracking branch 'origin/develop' into xap
2022-06-11 18:26:03 +00:00
QMK Bot
0d991b8873
Merge remote-tracking branch 'origin/master' into develop
2022-06-11 18:25:28 +00:00
durken1
a50b09cba5
[Keyboard] add pierce ( #17000 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Dan Abrahamsson <dan.abrahamsson@imsystech.com>
2022-06-11 11:24:58 -07:00
QMK Bot
4e9a2ca5f7
Merge remote-tracking branch 'origin/develop' into xap
2022-06-11 18:19:51 +00:00
QMK Bot
1a7a6f313e
Merge remote-tracking branch 'origin/master' into develop
2022-06-11 18:19:21 +00:00
Alin Marin Elena
51cfb1b457
[Keyboard] mlego fix product id and sync oled code ( #16237 )
...
* sync oled code over the keymaps
* put different product ids
* put different product ids for the rest
* put different product ids for the rest
* try to reduce code duplication
* make ifdefs nice and correct
* move the leds code out of keymap
* try to reduce code duplication
* move the rgb code outside the keymaps for reuse
* Update keyboards/mlego/m65/m65.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/mlego/m65/m65.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* move more code outside keymaps for reuse
* add few more xps
* add mic mute
* update to new name of macros for reset
* style for matrix
* clean split
* use tinyuf2 as bootloader
* Update keyboards/mlego/m65/rev4/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* radionalise product id and device version
* add tinyuf2 as default bootloader for stm32f4
* update tinyuf2
* update tinyuf2 and via. f411 remove tinyuf2 since is not really working. make the config more conditional
* sync the keymap with default
* revert via non building with gcc 11
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-11 11:18:45 -07:00
QMK Bot
32d86cee7f
Merge remote-tracking branch 'origin/develop' into xap
2022-06-11 17:53:45 +00:00
QMK Bot
5887bf7158
Merge remote-tracking branch 'origin/master' into develop
2022-06-11 17:53:14 +00:00
jack
dbd4ac5a3f
[Keyboard] Fix checkboards/quark_lp (another) ( #17296 )
2022-06-11 10:52:45 -07:00
QMK Bot
6f8e461cd1
Merge remote-tracking branch 'origin/develop' into xap
2022-06-10 22:25:35 +00:00
QMK Bot
d05a1deb7c
Merge remote-tracking branch 'origin/master' into develop
2022-06-10 22:24:58 +00:00
Ryan
b4b34cd2cd
Wasdat: move some stuff to info.json ( #17327 )
2022-06-11 08:24:29 +10:00
QMK Bot
452c0ba4fb
Merge remote-tracking branch 'origin/develop' into xap
2022-06-10 10:45:56 +00:00
QMK Bot
6b838785b7
Merge remote-tracking branch 'origin/master' into develop
2022-06-10 10:45:24 +00:00
Joel Challis
7baf9b3f35
Promote label with newlines to lint error ( #17347 )
2022-06-10 11:44:23 +01:00
QMK Bot
55b4fa3a5a
Merge remote-tracking branch 'origin/develop' into xap
2022-06-10 07:47:01 +00:00
QMK Bot
97fc4f1b6a
Merge remote-tracking branch 'origin/master' into develop
2022-06-10 07:46:24 +00:00
jack
d8ace624c8
initial ( #17345 )
2022-06-10 08:45:31 +01:00
QMK Bot
61c534947a
Merge remote-tracking branch 'origin/develop' into xap
2022-06-10 03:43:59 +00:00
QMK Bot
738cec9bd5
Merge remote-tracking branch 'origin/master' into develop
2022-06-10 03:43:25 +00:00
Derek
7c097ee6b4
[Keyboard] Add Sodium keyboards ( #17078 )
...
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: nacly <nacly@pop-os.localdomain>
2022-06-09 20:42:53 -07:00
QMK Bot
762496d0b1
Merge remote-tracking branch 'origin/develop' into xap
2022-06-10 03:41:43 +00:00
QMK Bot
ef8a30250b
Merge remote-tracking branch 'origin/master' into develop
2022-06-10 03:41:14 +00:00
Zac Scott
93c3a959a7
[Keymap] Add planck/scottzach1 keymap ( #17083 )
2022-06-09 20:40:43 -07:00
QMK Bot
5afc776cec
Merge remote-tracking branch 'origin/develop' into xap
2022-06-10 03:26:51 +00:00
QMK Bot
ed15a579a7
Merge remote-tracking branch 'origin/master' into develop
2022-06-10 03:26:21 +00:00
zv0n
9da1b86d71
[keyboard] annepro2 Add and use functions to directly control led colors ( #17196 )
2022-06-10 13:25:48 +10:00
QMK Bot
b6446026b5
Merge remote-tracking branch 'origin/develop' into xap
2022-06-10 01:16:59 +00:00
QMK Bot
c84d058c8b
Merge remote-tracking branch 'origin/master' into develop
2022-06-10 01:16:19 +00:00
Gabriel Oliveira
9316023290
[Keyboard] Improve the durgot k3x0 readme.md ( #17214 )
2022-06-09 18:15:44 -07:00
QMK Bot
066d7c10f1
Merge remote-tracking branch 'origin/develop' into xap
2022-06-10 01:13:50 +00:00
QMK Bot
e5e2cd94be
Merge remote-tracking branch 'origin/master' into develop
2022-06-10 01:13:18 +00:00
ILWrites
2f8704143e
[Keyboard] Adding Sunsetter R2 keyboard to Charue family ( #17269 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-09 18:12:31 -07:00
QMK Bot
ed00870773
Merge remote-tracking branch 'origin/develop' into xap
2022-06-09 18:54:39 +00:00
QMK Bot
c5f26b0e9a
Merge remote-tracking branch 'origin/master' into develop
2022-06-09 18:54:04 +00:00
jack
de43b09d25
[Keyboard] Fix kprepublic/bm60hsrgb_ec/rev2 ( #17334 )
2022-06-09 11:53:28 -07:00
QMK Bot
c7b6522c7e
Merge remote-tracking branch 'origin/develop' into xap
2022-06-09 01:39:55 +00:00
Drashna Jaelre
0ab51ee29d
Add support for large Mouse Reports ( #16371 )
...
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-08 18:39:16 -07:00
QMK Bot
511c7647f7
Merge remote-tracking branch 'origin/develop' into xap
2022-06-08 21:52:47 +00:00
QMK Bot
84944df6a6
Merge remote-tracking branch 'origin/master' into develop
2022-06-08 21:52:12 +00:00
Tomasz Janeczko
6567b21688
Move more UART-based keyboards to use timeout correctly. ( #17329 )
...
Co-authored-by: Tomasz Janeczko <tomasz.j@hey.com>
2022-06-08 14:51:41 -07:00
QMK Bot
114fadd58d
Merge remote-tracking branch 'origin/develop' into xap
2022-06-08 19:22:06 +00:00
QMK Bot
728f7308af
Merge remote-tracking branch 'origin/master' into develop
2022-06-08 19:21:10 +00:00
peepeetee
f6a7bf2a83
[Keyboard] Add KPrepublic BM60hsrgb_ec V1 and V2 ( #15104 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-08 12:20:26 -07:00
QMK Bot
47b17a15c6
Merge remote-tracking branch 'origin/develop' into xap
2022-06-08 06:24:54 +00:00
QMK Bot
0e2009c669
Merge remote-tracking branch 'origin/master' into develop
2022-06-08 06:24:16 +00:00
Jason Dunsmore
c9b71f953f
[Keymap] Update keymap for user jasondunsmore ( #17312 )
2022-06-07 23:23:41 -07:00
QMK Bot
0abb8ed990
Merge remote-tracking branch 'origin/develop' into xap
2022-06-08 00:49:10 +00:00
QMK Bot
1e1f387be7
Merge remote-tracking branch 'origin/master' into develop
2022-06-08 00:48:36 +00:00
Nick Brassel
1d75e20cd8
Add WB32 evaluation board onekey targets. ( #17330 )
2022-06-08 10:47:56 +10:00
QMK Bot
60f84a89f3
Merge remote-tracking branch 'origin/develop' into xap
2022-06-07 18:34:24 +00:00
QMK Bot
6df5fce073
Merge remote-tracking branch 'origin/master' into develop
2022-06-07 18:33:49 +00:00
QMK Bot
91cf4a2b41
Merge remote-tracking branch 'origin/develop' into xap
2022-06-07 18:32:41 +00:00
jpe230
5c7972760c
[Keymap] CRKBD: Update jpe230 Keymap ( #17280 )
2022-06-07 11:31:28 -07:00
QMK Bot
5141d6eeb1
Merge remote-tracking branch 'origin/master' into develop
2022-06-07 18:31:22 +00:00
QMK Bot
c0d291067a
Merge remote-tracking branch 'origin/develop' into xap
2022-06-07 18:30:46 +00:00
Andrew Kannan
1c97a0375e
[Keyboard] Add BrutalV2 65 Keyboard ( #17252 )
...
* Add Brutal65 V2 to QMK
* Update info.json and copyright notices
* Update info.json]
* Update readme and delete chconf
* Update matrix and keymaps to match info json
* Update keyboards/cannonkeys/brutalv2_65/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/cannonkeys/brutalv2_65/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/cannonkeys/brutalv2_65/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-07 11:30:35 -07:00
QMK Bot
fe08bbc4a0
Merge remote-tracking branch 'origin/master' into develop
2022-06-07 18:30:09 +00:00
Andrew Kannan
fbe236fa77
[Keyboard] Add Cloudline PCB support ( #17253 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-07 11:29:31 -07:00
QMK Bot
8ba396ad11
Merge remote-tracking branch 'origin/develop' into xap
2022-06-07 18:29:20 +00:00
QMK Bot
da1c562ddf
Merge remote-tracking branch 'origin/master' into develop
2022-06-07 18:28:46 +00:00
Uy Bui
b8bbd0cb9a
[Keyboard] Add Stello65 keyboard ( #17168 )
...
* [Keyboard] add Stello65 keyboard
* Apply suggestions from code review
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
* [Keyboard] update config pinout for stello65_sl_rev1
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-07 11:28:13 -07:00
QMK Bot
cc27d0b2dd
Merge remote-tracking branch 'origin/develop' into xap
2022-06-07 18:23:48 +00:00
QMK Bot
36109a887a
Merge remote-tracking branch 'origin/master' into develop
2022-06-07 18:23:09 +00:00
Tomasz Janeczko
c681b6dbf3
[Keyboard] Handle timeout on UART for Redox Wireless ( #17203 )
...
* Handle timeout on UART for Redox Wireless receiver-to-keyboard communication.
- This fixes the issue of a keyboard deadlocking on the first matrix
scan with Redox Wireless keyboards
* Remove an explicit cast.
Co-authored-by: Tomasz Janeczko <tomasz.j@hey.com>
2022-06-07 11:22:13 -07:00
QMK Bot
1c5c6a7f78
Merge remote-tracking branch 'origin/develop' into xap
2022-06-07 18:16:07 +00:00
QMK Bot
b74509d4ae
Merge remote-tracking branch 'origin/master' into develop
2022-06-07 18:15:24 +00:00
Tommy Alatalo
5d767f8361
[Keyboard] Add alt34 keyboard ( #17223 )
...
* Add files for alt34 keyboard
* Add link to hardware bill of materials for alt34
* Change keyboard image link to imgur
* Remove platform specific defines from rev1.h
* Remove bluetooth and sleep led rules etc
* Add GPL license header to all source code files
* Shorten comment for NKRO_ENABLE
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Simplify option usage comment in rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Set imgur link to largest size option
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Move rules.mk into rev1 folder entirely
* Remove .noci file
* Update keyboards/alt34/rev1/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-07 11:14:44 -07:00
QMK Bot
ff2ca9cd26
Merge remote-tracking branch 'origin/develop' into xap
2022-06-07 18:02:46 +00:00
QMK Bot
9d226b92a8
Merge remote-tracking branch 'origin/master' into develop
2022-06-07 18:01:59 +00:00
trwnh
cf1e66b352
[Keymap] add trwnh keymap for gmmk pro ( #17267 )
2022-06-07 11:01:23 -07:00
QMK Bot
fbeb7a870a
Merge remote-tracking branch 'origin/develop' into xap
2022-06-07 13:33:27 +00:00
QMK Bot
11836128fc
Merge remote-tracking branch 'origin/master' into develop
2022-06-07 13:32:48 +00:00
anubhav dhiman
f0b1c8ced9
add new keyboard atset ( #17195 )
...
Co-authored-by: zvecr <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-07 23:31:56 +10:00
QMK Bot
bf31316957
Merge remote-tracking branch 'origin/develop' into xap
2022-06-06 00:34:25 +00:00
Dasky
85b3b98570
Move SPLIT_HAND_PIN setup to split_pre_init ( #17271 )
...
* Move SPLIT_HAND_PIN setup to split_pre_init
* doppelganger should use old behaviour
* Add comment for future
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-06-06 01:33:32 +01:00
QMK Bot
6b14a17b48
Merge remote-tracking branch 'origin/develop' into xap
2022-06-04 00:46:15 +00:00
QMK Bot
b1a3f806f5
Merge remote-tracking branch 'origin/master' into develop
2022-06-04 00:45:35 +00:00
eason
787165718d
Disable features known to cause BIOS/suspend issues ( #17270 )
2022-06-04 01:44:53 +01:00
QMK Bot
1f9200c3a7
Merge remote-tracking branch 'origin/develop' into xap
2022-06-03 11:13:57 +00:00
QMK Bot
bb324e5b3e
Merge remote-tracking branch 'origin/master' into develop
2022-06-03 11:13:22 +00:00
Drashna Jaelre
706194b336
Add Encoder Map Swap Hands config for boards that support both features ( #17294 )
2022-06-03 12:12:15 +01:00
QMK Bot
84672f0950
Merge remote-tracking branch 'origin/develop' into xap
2022-06-02 18:31:29 +00:00
QMK Bot
267f392237
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 18:30:44 +00:00
Joel Challis
5bcfc273ce
Fix lint errors ( #17293 )
2022-06-02 19:30:07 +01:00
QMK Bot
f1de138ce9
Merge remote-tracking branch 'origin/develop' into xap
2022-06-02 17:21:37 +00:00
QMK Bot
b94baa8bc3
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 17:20:59 +00:00
takishim
71b928fbec
[Keyboard] Organized versions of mikeneko65 ( #16985 )
...
Co-authored-by: takishim <tadashi@kishimo.to>
2022-06-02 10:20:02 -07:00
QMK Bot
a20454c83a
Merge remote-tracking branch 'origin/develop' into xap
2022-06-02 16:52:10 +00:00
QMK Bot
86e93d7654
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 16:51:28 +00:00
Ryan Skidmore
9a587275cf
keyboards: fix malformed info.json files ( #17292 )
2022-06-02 17:50:08 +01:00
QMK Bot
ded347ae04
Merge remote-tracking branch 'origin/develop' into xap
2022-06-02 16:38:50 +00:00
QMK Bot
344b8410f7
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 16:38:09 +00:00
Aidan Gauland
7c3cb99164
[Keymap] Fix maddie layout for ploopy/trackball_nano ( #17213 )
2022-06-02 09:37:28 -07:00
QMK Bot
06f5a54fd5
Merge remote-tracking branch 'origin/develop' into xap
2022-06-02 16:19:34 +00:00
QMK Bot
8bb2c66c88
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 16:18:53 +00:00
Václav Kučera
7ff666340c
[Keyboard] Acheron Shark alpha Encoder support ( #17266 )
2022-06-02 09:17:47 -07:00
QMK Bot
6d53a07674
Merge remote-tracking branch 'origin/develop' into xap
2022-06-02 13:03:55 +00:00
QMK Bot
73bd3dff8c
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 13:03:13 +00:00
wavtype
f330ef12b6
Add wavtype/p01_ultra ( #16513 )
...
* new fork (manta and foundation)
added foundation and manta firmware
* removed manta
* VIA compliant changes
added readme, info.json edits
* Update keyboards/wavtype/foundation/config.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/foundation/readme.md
Co-authored-by: Joel Challis <git@zvecr.com>
* removed via.json and updated readme
* Update keyboards/wavtype/foundation/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/wavtype/foundation/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/wavtype/foundation/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keymap.c
* added p01 ultra
* updated diode direction
proto used opposite diode direction
* removed foundation
* Update keyboards/wavtype/p01_ultra/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/readme.md
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/info.json
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/wavtype/p01_ultra/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/wavtype/p01_ultra/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-02 14:02:36 +01:00
QMK Bot
4d48300ade
Merge remote-tracking branch 'origin/develop' into xap
2022-05-31 21:39:08 +00:00
QMK Bot
f9e97fd3c3
Merge remote-tracking branch 'origin/master' into develop
2022-05-31 21:38:36 +00:00
Carlo Sala
5b16671d7a
move RESET to QK_BOOT ( #17278 )
...
* move RESET to QK_BOOT
* fix tapping_term
2022-05-31 22:37:28 +01:00
QMK Bot
72458dcd76
Merge remote-tracking branch 'origin/develop' into xap
2022-05-31 08:23:30 +00:00
QMK Bot
6fdce80822
Merge remote-tracking branch 'origin/master' into develop
2022-05-31 08:22:54 +00:00
moyi4681
d5ed3ae967
[Keyboard] fix dz64rgb rgb sleep ( #17209 )
2022-05-31 01:22:07 -07:00
QMK Bot
6579526ace
Merge remote-tracking branch 'origin/develop' into xap
2022-05-31 05:38:38 +00:00
Nick Brassel
8545473307
Removes terminal from QMK. ( #17258 )
2022-05-30 22:38:08 -07:00
QMK Bot
d5d72135e4
Merge remote-tracking branch 'origin/develop' into xap
2022-05-31 05:04:02 +00:00
Drashna Jaelre
cda343acbe
[Keymap] Drashna update for post Q2 merge ( #17241 )
2022-05-30 22:02:55 -07:00
QMK Bot
9aadf14b31
Merge remote-tracking branch 'origin/develop' into xap
2022-05-31 02:10:05 +00:00
Joel Challis
0e11b511e4
Convert ergodone to use core mcp23018 driver ( #17005 )
2022-05-31 03:08:56 +01:00
QMK Bot
03ca0cc8c9
Merge remote-tracking branch 'origin/develop' into xap
2022-05-30 22:44:39 +00:00
Joel Challis
2879573688
Fix various lint errors ( #17255 )
...
* Fix various lint errors
* reduce complexity
2022-05-30 23:43:36 +01:00
Nick Brassel
33d779cc16
Merge remote-tracking branch 'upstream/develop' into xap
2022-05-31 08:08:22 +10:00
chalex
3826fca637
[Keyboard] Add str.merro60 pcb ( #17097 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Alexander Lee <aclee3@CGHan-Macbook-2015.local>
Co-authored-by: chalex <chlxbsmt@gmail.com>
2022-05-30 14:45:27 -07:00
Seth Barberee
cc7a3f8dc7
[Keymap] Update sethbarberee code to QK_BOOT and try out DVVORAK ( #17230 )
2022-05-30 11:07:16 -07:00
Joel Challis
a06b5cae41
Fix API errors ( #17239 )
2022-05-30 15:34:20 +01:00