Commit Graph

22357 Commits

Author SHA1 Message Date
QMK Bot
e4b8322f36 Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 04:54:16 +00:00
QMK Bot
018fad6b95 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:53:38 +00:00
Zach Rice
019bfc4159
[Keymap] Add RAOEUS keymap for the XD75 (#17456)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-12 21:52:52 -07:00
QMK Bot
4c01ea5c1b Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 04:48:22 +00:00
jack
8a1ca7f6b8
[Keyboard] boardsource/holiday/spooky data driven (#17632) 2022-07-12 21:47:32 -07:00
QMK Bot
88b705d190 Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 04:43:04 +00:00
Nick Brassel
dfff040433
Allow MCU-specific overrides for SPI flags. (#17650) 2022-07-13 14:42:24 +10:00
QMK Bot
207adb21b9 Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 04:38:24 +00:00
QMK Bot
f9724dfa67 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:37:54 +00:00
James Young
e68de95214
KBDfans KBD67 rev2 Layout Patch (#17649) 2022-07-12 21:37:23 -07:00
QMK Bot
5b64578714 Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 04:32:34 +00:00
QMK Bot
27dd4dc91e Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:31:57 +00:00
Cipulot
5bc81d3a63
[Keyboard] Add Kallos keyboard (#17461)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-12 21:31:17 -07:00
QMK Bot
7fa23bcc6c Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 04:18:12 +00:00
Daniel Kao
5db705d054
Cirque trackpad features: circular scroll, inertial cursor (#17482) 2022-07-12 21:17:40 -07:00
QMK Bot
e86a29410a Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 04:11:48 +00:00
QMK Bot
904ec0ce78 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:11:08 +00:00
QMK Bot
f02f97c354 Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 04:10:46 +00:00
Yizhen Liu
7a090bb3df
[Keyboard] Kprepublic bm80v2 iso revised (#17571)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-07-12 21:10:31 -07:00
QMK Bot
9d6a94cfb5 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:10:07 +00:00
AnthonyNguyen168
257fc042df
[Keyboard] Update layout for MechBrewery series (#17570) 2022-07-12 21:09:37 -07:00
QMK Bot
ad2c35db9c Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 03:58:54 +00:00
James Young
36c2575658
Grammar fixes for docs/feature_converters.md (#17652) 2022-07-13 04:58:16 +01:00
QMK Bot
a16e08742f Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 03:51:52 +00:00
QMK Bot
6bb2ed68a8 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 03:51:07 +00:00
Drashna Jaelre
26954bbc28
[Docs] Add Encoder requirements to PR Checklist doc (#17634)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-07-12 20:50:26 -07:00
QMK Bot
df552bb825 Merge remote-tracking branch 'origin/develop' into xap 2022-07-13 00:20:49 +00:00
zvecr
82f0263e41 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 01:19:58 +01:00
Joel Challis
2a3dd95229
Add basic secure docs (#17577) 2022-07-13 00:06:19 +01:00
QMK Bot
2c821ad54d Merge remote-tracking branch 'origin/develop' into xap 2022-07-12 19:55:51 +00:00
jack
ffb34fc082
Include stdint.h in avr/i2c_master.h (#17639) 2022-07-12 21:55:19 +02:00
QMK Bot
ca7f1b405b Merge remote-tracking branch 'origin/develop' into xap 2022-07-12 19:55:16 +00:00
Stefan Kerkmann
45ffe42f1a
[Fix] Make ChibiOS _wait.h independent of quantum.h (#17645) 2022-07-12 21:54:33 +02:00
QMK Bot
821d8de813 Merge remote-tracking branch 'origin/develop' into xap 2022-07-12 07:31:29 +00:00
GloriousThrall
bbd6ea977c
GMMK 2 WBG7 MCU compatibility (#16436)
* GMMK V2 QMK Compatibility

* fix problems

* Update keyboards/gmmk/gmmk2/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Fix a minor problem

* Optimize the code

* Update config.h

* Update

* Update config.h

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

* Update keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

* Update keyboards/gmmk/gmmk2/p65/ansi/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/iso/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p65/iso/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

* Update config.h

* Update config.h

* Modify device pid

* Add gmmk2_p96 keyboard.

* Add gmmk2_p96 keyboard.

* Update led matrix.

* Update led matrix.

* Delete eeprom_flash.c

* Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update from qmk develop branch

* Increased compatibility with wear_leveling.

* Update config.h

Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-07-12 17:30:54 +10:00
QMK Bot
6d8cc423be Merge remote-tracking branch 'origin/develop' into xap 2022-07-11 21:47:06 +00:00
QMK Bot
a768ec265d Merge remote-tracking branch 'origin/master' into develop 2022-07-11 21:46:29 +00:00
Joel Challis
2714c70bd7
Fix layout macro for nightly_boards/paraluman (#17633) 2022-07-11 22:45:56 +01:00
QMK Bot
9a78fc36da Merge remote-tracking branch 'origin/develop' into xap 2022-07-11 21:16:20 +00:00
QMK Bot
b78a7e42b1 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 21:15:45 +00:00
Danny
9a41a303cc
[Keyboard] Add Quefrency Rev. 5 (#17503) 2022-07-11 14:14:55 -07:00
QMK Bot
ce07ff3bdd Merge remote-tracking branch 'origin/develop' into xap 2022-07-11 20:59:57 +00:00
QMK Bot
85cdde1541 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 20:59:02 +00:00
Felix Jen
7c3b6c4bc4
[Keyboard] Add Swordfish keyboard (#17567) 2022-07-11 13:57:20 -07:00
QMK Bot
eaf6428e38 Merge remote-tracking branch 'origin/develop' into xap 2022-07-11 20:00:06 +00:00
FREEWING.JP
61df87ae2c
Added Delay time dynamic keymap's macro feature (#16810)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-11 12:59:16 -07:00
QMK Bot
2cb0480755 Merge remote-tracking branch 'origin/develop' into xap 2022-07-11 19:48:31 +00:00
QMK Bot
52e9ed75e8 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 19:47:42 +00:00
Alex Băluț
2bb0550707
[Keyboard] add kinesis/kintlc (#17301) 2022-07-11 12:46:51 -07:00
QMK Bot
78dcef7604 Merge remote-tracking branch 'origin/develop' into xap 2022-07-11 18:55:30 +00:00