sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,093 Commits 2 Branches 0 Tags
738e8e72ba1ef8da444c5c0406ec962c30d9242c
Commit Graph

17093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot
2485bbe784 Merge remote-tracking branch 'origin/master' into develop 2021-02-27 01:29:58 +00:00
Danny
6a94e25f6d [Keyboard] Add VIA support to SX60 and update default keymap (#11908) 2021-02-26 17:29:23 -08:00
github-actions[bot]
d99e330548 Format code according to conventions (#12024) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-02-26 17:47:22 +11:00
Nick Brassel
abe189377c [BUG] Massdrop develop rgb fix (#12022) 
* Allow for disabling RGB_MATRIX on Massdrop boards.

* Fixup init sequence.

* Make some functions static as they've got very generic names.
 2021-02-26 17:07:05 +11:00
QMK Bot
4dc8a2dd6f Merge remote-tracking branch 'origin/master' into develop 2021-02-25 10:57:31 +00:00
Drashna Jaelre
d4be96e9dd [Keyboard] Fixup issues with Titan65 (#12002) 
* [Keyboard] Titan64 - Fix RGB Matrix config

* Fix up keymaps
 2021-02-25 10:56:59 +00:00
fauxpark
23fd1aee00 Merge remote-tracking branch 'upstream/master' into develop 2021-02-25 16:04:53 +11:00
Ryan
39694d5eb0 V-USB suspend refactor (#11891) 2021-02-25 15:54:25 +11:00
Zach White
23ef327e11 make LAYOUT parsing more robust 2021-02-24 16:47:38 -08:00
Nick Brassel
ba0b965c42 ChibiOS conf upgrade for daji/seis_cinco (#12001) 
daji/seis_cinco - f9ce55c07a61f20308dab7eb5f4f2b7a91686625
 2021-02-25 07:23:29 +11:00
QMK Bot
285d0c3d7d Merge remote-tracking branch 'origin/master' into develop 2021-02-24 18:53:45 +00:00
npspears
46f4422a87 [Keyboard] Atlas alps/mx PCB addition (#11884) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-02-24 10:53:09 -08:00
QMK Bot
bee1b553cd Merge remote-tracking branch 'origin/master' into develop 2021-02-24 18:49:10 +00:00
Rys Sommefeldt
215caad320 [Keyboard] CapsUnlocked CU80 v2 (#11736) 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Rys Sommefeldt <rys@pixeltards.com>
 2021-02-24 10:48:35 -08:00
Drashna Jael're
146b042514 Merge remote-tracking branch 'origin/master' into develop 2021-02-23 13:57:26 -08:00
Drashna Jaelre
0b69e4df81 [Keymap] Drashna Updates - Split+OLED edition (#11968) 2021-02-23 10:57:24 -08:00
QMK Bot
2abfa624c9 Merge remote-tracking branch 'origin/master' into develop 2021-02-23 01:55:01 +00:00
Ikta
11146ecd08 pill60 fix info.json to be used in configurator (#11979) 2021-02-23 01:54:29 +00:00
James Young
76e67a97f4 Bugfix for Jacky Studio keyboards (#11981) 
PR 10528 was intended to move the source for the Bear 65 and S7 Elephant to the new `jacky_studio` vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories.

This commit removes the source from the old directories.
 2021-02-22 17:04:14 -05:00
QMK Bot
6bbec56d09 Merge remote-tracking branch 'origin/master' into develop 2021-02-22 04:47:01 +00:00
SneakboxKB
c868f93755 [Keyboard] Disarray (#11583) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com>
 2021-02-21 20:46:34 -08:00
QMK Bot
eb7edaf4dc Merge remote-tracking branch 'origin/master' into develop 2021-02-22 04:45:41 +00:00
Alex Paulescu
150ab564a3 [Keyboard] Add Manibus keyboard and layout from Blank Tehnologii (#11832) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-02-21 20:45:02 -08:00
QMK Bot
eb0fffbd78 Merge remote-tracking branch 'origin/master' into develop 2021-02-22 03:46:41 +00:00
James
37e14fd02b [Keyboard] Tokyo Keyboard alix40 initial commit (#11918) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: QuadCube <quadcube@QuadCube-Mac-mini.local>
 2021-02-21 19:46:08 -08:00
QMK Bot
a9fbefcd87 Merge remote-tracking branch 'origin/master' into develop 2021-02-22 03:43:27 +00:00
toraifu
36999494d6 [Keyboard] Add Daji Seis Cinco (#11955) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-02-21 19:42:55 -08:00
QMK Bot
00d70925df Merge remote-tracking branch 'origin/master' into develop 2021-02-22 03:42:41 +00:00
QMK Bot
998c4c93a2 Merge remote-tracking branch 'origin/master' into develop 2021-02-22 03:42:10 +00:00
Rys Sommefeldt
d1a92aa52a [Keyboard] Graystudio COD67 VIA support (#11961) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-02-21 19:42:09 -08:00
Joshua Diamond
5660d80bb0 [Keyboard] reduce confusion for kbdfans/kbd75 rounds/revisions (#11972) 2021-02-21 19:41:31 -08:00
Ryan
316dcf4960 Clean up some user keymaps specifying MCU (#11966) 2021-02-22 00:49:13 +00:00
QMK Bot
c1e6febef7 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 16:19:19 +00:00
Maxime Coirault
e1e66c78bf [Keymap] Add via support to Durgod K320 (#11960) 
Co-authored-by: Maxime Coirault <maxime.coirault@zerokeyboard.com>
 2021-02-21 08:18:48 -08:00
QMK Bot
329d5583e0 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 16:18:33 +00:00
Ross Montsinger
b69614b98b [Keyboard] Rebound: change vendor and product ID for VIA (#11965) 2021-02-21 08:17:48 -08:00
QMK Bot
29c19b6f40 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 06:19:36 +00:00
Ikta
311bff3d56 [Keyboard] Pill60: fix default keymap shift key, fix info.json to default keymap (#11919) 2021-02-20 22:19:06 -08:00
QMK Bot
14f0f8ce65 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 06:13:32 +00:00
IFo Hancroft
a3934664dd [Keymap] Adding my v60 Type R keymap (#11911) 2021-02-20 22:12:50 -08:00
QMK Bot
3b4b3c827c Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:52:48 +00:00
IFo Hancroft
46a22c9e70 [Keymap] My Prime_E Keymap (#11899) 2021-02-20 21:52:40 -08:00
QMK Bot
1216e807c0 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:52:26 +00:00
IFo Hancroft
bb9316a2f9 [Keymap] My Idobo Keymap (#11897) 2021-02-20 21:52:20 -08:00
IFo Hancroft
516afb0343 [Keymap] My ErgoDash Keymap (#11895) 2021-02-20 21:51:52 -08:00
QMK Bot
8463553d71 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:28:20 +00:00
Jonathan Law
8760ff523d [Keymap] Bongo Cat + WPM Counter OLED keymap (#11871) 2021-02-20 21:27:48 -08:00
QMK Bot
72965a7106 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:06:12 +00:00
MelGeek
df7d3a1794 [Keyboard] Support MJ64 REV3 - a 60% RGB Hotswap with arrow (#11785) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-02-20 21:05:41 -08:00
QMK Bot
f3cf9c5c07 Merge remote-tracking branch 'origin/master' into develop 2021-02-21 05:00:06 +00:00