summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Fix up build failures for melgeek boards after Feb27 develop merge. (#12043)Nick Brassel2021-02-283-0/+3
|
* Fix build for linworks/whale75. (#12042)Nick Brassel2021-02-271-0/+1
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-275-34/+37
|\
| * [Keyboard] Evk v1.3 add a key (#11880)YangPiCui2021-02-265-34/+37
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-276-41/+115
|\|
| * [Keyboard] Add VIA support to SX60 and update default keymap (#11908)Danny2021-02-266-41/+115
| |
* | [BUG] Massdrop develop rgb fix (#12022)Nick Brassel2021-02-261-1/+1
| | | | | | | | | | | | | | * Allow for disabling RGB_MATRIX on Massdrop boards. * Fixup init sequence. * Make some functions static as they've got very generic names.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-253-13/+12
|\|
| * [Keyboard] Fixup issues with Titan65 (#12002)Drashna Jaelre2021-02-253-13/+12
| | | | | | | | | | * [Keyboard] Titan64 - Fix RGB Matrix config * Fix up keymaps
* | ChibiOS conf upgrade for daji/seis_cinco (#12001)Nick Brassel2021-02-254-1388/+43
| | | | | | daji/seis_cinco - f9ce55c07a61f20308dab7eb5f4f2b7a91686625
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2411-0/+394
|\|
| * [Keyboard] Atlas alps/mx PCB addition (#11884)npspears2021-02-2411-0/+394
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2420-0/+713
|\|
| * [Keyboard] CapsUnlocked CU80 v2 (#11736)Rys Sommefeldt2021-02-2420-0/+713
| | | | | | | | | | Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Rys Sommefeldt <rys@pixeltards.com>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-02-2320-69/+312
|\|
| * [Keymap] Drashna Updates - Split+OLED edition (#11968)Drashna Jaelre2021-02-2320-70/+313
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-231-1/+1
|\|
| * pill60 fix info.json to be used in configurator (#11979)Ikta2021-02-231-1/+1
| |
* | Bugfix for Jacky Studio keyboards (#11981)James Young2021-02-2235-4304/+0
| | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2218-0/+629
|\|
| * [Keyboard] Disarray (#11583)SneakboxKB2021-02-2118-0/+629
| | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2212-0/+591
|\|
| * [Keyboard] Add Manibus keyboard and layout from Blank Tehnologii (#11832)Alex Paulescu2021-02-2112-0/+591
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-229-0/+527
|\|
| * [Keyboard] Tokyo Keyboard alix40 initial commit (#11918)James2021-02-219-0/+527
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: QuadCube <quadcube@QuadCube-Mac-mini.local>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2213-0/+1844
|\|
| * [Keyboard] Add Daji Seis Cinco (#11955)toraifu2021-02-2113-0/+1844
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-223-3/+53
|\|
| * [Keyboard] Graystudio COD67 VIA support (#11961)Rys Sommefeldt2021-02-213-3/+53
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-223-3/+8
|\|
| * [Keyboard] reduce confusion for kbdfans/kbd75 rounds/revisions (#11972)Joshua Diamond2021-02-213-3/+8
| |
* | Clean up some user keymaps specifying MCU (#11966)Ryan2021-02-2219-1398/+31
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-215-0/+134
|\|
| * [Keymap] Add via support to Durgod K320 (#11960)Maxime Coirault2021-02-215-0/+134
| | | | | | Co-authored-by: Maxime Coirault <maxime.coirault@zerokeyboard.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-211-2/+2
|\|
| * [Keyboard] Rebound: change vendor and product ID for VIA (#11965)Ross Montsinger2021-02-211-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-212-55/+55
|\|
| * [Keyboard] Pill60: fix default keymap shift key, fix info.json to default ↵Ikta2021-02-202-55/+55
| | | | | | | | keymap (#11919)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-214-0/+149
|\|
| * [Keymap] Adding my v60 Type R keymap (#11911)IFo Hancroft2021-02-204-0/+149
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-214-0/+129
|\|
| * [Keymap] My Prime_E Keymap (#11899)IFo Hancroft2021-02-204-0/+129
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-218-0/+294
|\|
| * [Keymap] My Idobo Keymap (#11897)IFo Hancroft2021-02-204-0/+151
| |
| * [Keymap] My ErgoDash Keymap (#11895)IFo Hancroft2021-02-204-0/+143
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-213-0/+373
|\|
| * [Keymap] Bongo Cat + WPM Counter OLED keymap (#11871)Jonathan Law2021-02-203-0/+373
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-213-0/+196
|\|
| * [Keyboard] Support MJ64 REV3 - a 60% RGB Hotswap with arrow (#11785)MelGeek2021-02-203-0/+196
| | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-215-31/+228
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 17:56:10 +0000