summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-26[Keyboard] Evk v1.3 add a key (#11880)YangPiCui
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-27Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-26[Keyboard] Add VIA support to SX60 and update default keymap (#11908)Danny
2021-02-26Format code according to conventions (#12024)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-02-26[BUG] Massdrop develop rgb fix (#12022)Nick Brassel
* Allow for disabling RGB_MATRIX on Massdrop boards. * Fixup init sequence. * Make some functions static as they've got very generic names.
2021-02-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-25[Keyboard] Fixup issues with Titan65 (#12002)Drashna Jaelre
* [Keyboard] Titan64 - Fix RGB Matrix config * Fix up keymaps
2021-02-25Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-02-25V-USB suspend refactor (#11891)Ryan
2021-02-24make LAYOUT parsing more robustZach White
2021-02-25ChibiOS conf upgrade for daji/seis_cinco (#12001)Nick Brassel
daji/seis_cinco - f9ce55c07a61f20308dab7eb5f4f2b7a91686625
2021-02-24Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-24[Keyboard] Atlas alps/mx PCB addition (#11884)npspears
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-24Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-24[Keyboard] CapsUnlocked CU80 v2 (#11736)Rys Sommefeldt
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-23Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2021-02-23[Keymap] Drashna Updates - Split+OLED edition (#11968)Drashna Jaelre
2021-02-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-23pill60 fix info.json to be used in configurator (#11979)Ikta
2021-02-22Bugfix for Jacky Studio keyboards (#11981)James Young
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-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Disarray (#11583)SneakboxKB
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-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Add Manibus keyboard and layout from Blank Tehnologii (#11832)Alex Paulescu
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Tokyo Keyboard alix40 initial commit (#11918)James
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-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Add Daji Seis Cinco (#11955)toraifu
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Graystudio COD67 VIA support (#11961)Rys Sommefeldt
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-21[Keyboard] reduce confusion for kbdfans/kbd75 rounds/revisions (#11972)Joshua Diamond
2021-02-22Clean up some user keymaps specifying MCU (#11966)Ryan
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keymap] Add via support to Durgod K320 (#11960)Maxime Coirault
Co-authored-by: Maxime Coirault <maxime.coirault@zerokeyboard.com>
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-21[Keyboard] Rebound: change vendor and product ID for VIA (#11965)Ross Montsinger
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keyboard] Pill60: fix default keymap shift key, fix info.json to default ↵Ikta
keymap (#11919)
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keymap] Adding my v60 Type R keymap (#11911)IFo Hancroft
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keymap] My Prime_E Keymap (#11899)IFo Hancroft
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keymap] My Idobo Keymap (#11897)IFo Hancroft
2021-02-20[Keymap] My ErgoDash Keymap (#11895)IFo Hancroft
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-20[Keymap] Bongo Cat + WPM Counter OLED keymap (#11871)Jonathan Law
2021-02-21Merge remote-tracking branch 'origin/master' into developQMK Bot