Commit graph

12503 commits

Author SHA1 Message Date
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