Commit Graph
22865 Commits
Author SHA1 Message Date
QMK Bot 181ee37dd1 Merge remote-tracking branch 'origin/develop' into xap 2022-08-09 06:42:26 +00:00
QMK Bot 6e1c2b20e5 Merge remote-tracking branch 'origin/master' into develop 2022-08-09 06:41:55 +00:00
Salicylic-acid3 923cd63f3e [Keyboard] (7skb)Change number of LEDs and Enable Mouse Keys (#17954) 2022-08-08 23:41:10 -07:00
QMK Bot 881d5c9580 Merge remote-tracking branch 'origin/develop' into xap 2022-08-08 18:07:06 +00:00
QMK Bot 1d33baac8f Merge remote-tracking branch 'origin/master' into develop 2022-08-08 18:06:29 +00:00
Joel Challis 0002b1cc20 Also disable line ending conversion for merge workflows (#17953) 2022-08-08 19:05:41 +01:00
QMK Bot a3b06fd87c Format code according to conventions (#17951) 2022-08-08 17:33:25 +01:00
QMK Bot a14cd0fba5 Merge remote-tracking branch 'origin/master' into develop 2022-08-08 16:31:00 +00:00
Joel Challis bccf933bc9 Force no git line ending conversion on format workflow (#16176) 2022-08-08 17:30:26 +01:00
QMK Bot 22cb4e520a Merge remote-tracking branch 'origin/master' into develop 2022-08-08 09:46:27 +00:00
Vertex-kb 9a3c30f2c7 [Keyboard] Add Vertex AngleR2 keyboard (#16764)
* Add files via upload

* Delete Vertex/AngleR2 directory

* Add files via upload

* Delete keyboards/Vertex/AngleR2 directory

* Add files via upload

* Add files via upload

* Add files via upload

* Update keyboards/vertex/angler2/angler2.h

* Update keyboards/vertex/angler2/info.json

* Update keyboards/vertex/angler2/keymaps/default/keymap.c

* Update keyboards/vertex/angler2/keymaps/via/keymap.c

* Update keyboards/vertex/angler2/keymaps/via/keymap.c

* Update keyboards/vertex/angler2/keymaps/via/keymap.c

* Update keyboards/vertex/angler2/keymaps/default/keymap.c

* Update keyboards/vertex/angler2/keymaps/via/keymap.c
2022-08-08 02:45:36 -07:00
QMK Bot c6dab0a3df Merge remote-tracking branch 'origin/develop' into xap 2022-08-08 02:14:00 +00:00
Joel Challis 764c542bef Remove tmk_core 'serial' code (#17866) 2022-08-08 03:13:16 +01:00
QMK Bot f22e5e955a Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 21:11:57 +00:00
QMK Bot 972f9a612c Merge remote-tracking branch 'origin/master' into develop 2022-08-07 21:11:17 +00:00
Arturo Avila d27a6bd629 [Keyboard] Add Shisaku keyboard (#17572) 2022-08-07 14:10:32 -07:00
QMK Bot 0d6e799e4b Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 21:08:25 +00:00
QMK Bot b214768e09 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 21:07:55 +00:00
yeimialberthandDrashna Jaelre ca04babf3f [Keymap] qwerty and dvorak keyboard setup (#16592)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-07 14:07:25 -07:00
QMK Bot c1617a0951 Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 19:41:25 +00:00
QMK Bot 6a1a398627 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 19:40:49 +00:00
csc027 4267f0e0d4 csc027/keymap-updates (#17881)
* Reverted to most usable configuration for RDP usage.

* Added some HSV color definitions without the value portion to allow using the existing value.

* Switched to using HSV and HS color definitions.

* Added media keys to the convenience layer.

* Updated make rules to enable media keys.

* Cleaned up planck make rules.
2022-08-07 20:40:16 +01:00
QMK Bot 4eb1edce0d Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 19:34:13 +00:00
QMK Bot 67461a0a47 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 19:33:39 +00:00
Takeshi ISHII 5ecd745514 fix comment space code in quantum/matrix_common.c (#17942) 0.17.7 2022-08-07 20:32:59 +01:00
QMK Bot d2694da64d Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 13:02:16 +00:00
QMK Bot 6e7678c415 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 13:01:43 +00:00
XScorpion2 034e266998 Rgbkb/keeb fixes (#17932)
* Disable console by default for better bios & reboot behavior

* Remove custom matrix

* Disable console by default for better bios & reboot behavior

* PR feedback
2022-08-07 14:01:10 +01:00
QMK Bot fad4c6cf4c Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 12:58:16 +00:00
QMK Bot 9087e6ee28 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 12:57:41 +00:00
Joel Challis a6ea760c94 rgbkb/zen - Resolve CONVERT_TO_PROTON_C warnings (#17619) 2022-08-07 13:57:12 +01:00
QMK Bot 61443ae853 Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 09:34:47 +00:00
QMK Bot e8ff0d6ced Merge remote-tracking branch 'origin/master' into develop 2022-08-07 09:34:18 +00:00
b9269bf689 [Keyboard] Dumbpad v1x_oled (#17058)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-07 02:33:36 -07:00
QMK Bot ec076fc3a7 Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 09:31:32 +00:00
QMK Bot 4f3bf762f1 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 09:30:52 +00:00
QMK Bot 8f000dfab9 Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 09:30:19 +00:00
DUILCHOIandRyan 964ce931e2 [Keyboard] add fave104 (#17909)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-07 02:30:18 -07:00
QMK Bot 5599f26667 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 09:29:42 +00:00
82a72fe815 [Keyboard] Add P01 (#17921)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-07 02:28:46 -07:00
QMK Bot 8c41dd5cd1 Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 09:22:00 +00:00
QMK Bot 50e6dd41e6 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 09:21:28 +00:00
James Young de613fac0a Lin Works FAve 65H Refactor (#17938) 2022-08-07 02:20:51 -07:00
QMK Bot 9d78049b73 Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 09:18:49 +00:00
Drashna Jaelre ac25109312 Always run pointing device init (#17936) 2022-08-07 02:18:03 -07:00
QMK Bot 2a8df86df6 Merge remote-tracking branch 'origin/develop' into xap 2022-08-07 01:25:08 +00:00
QMK Bot 93914142a3 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 01:24:34 +00:00
Joel Challis c6ad38e79f RESET -> QK_BOOT default keymaps (#17939) 2022-08-07 02:23:58 +01:00
QMK Bot 7ceb89476c Merge remote-tracking branch 'origin/develop' into xap 2022-08-06 21:43:15 +00:00
QMK Bot c5844931e2 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 21:42:44 +00:00