summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
|\|
| * [Keyboard] Update MJ63 architecture to support multi version (#11788)MelGeek2021-02-205-31/+228
| | | | | | | | | | 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-2113-10/+445
|\|
| * [Keyboard] Add DimplePlus 7u Layout (#11816)James Skeen2021-02-203-10/+118
| | | | | | Co-authored-by: James Skeen <skeen@macbook.attlocal.net>
| * [Keyboard] Add MIO keyboard (#11852)Naoto Takai2021-02-2010-0/+327
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2110-0/+448
|\|
| * [Keyboard] Added Ketch support (#11656)Ethan Madden2021-02-2010-0/+448
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-211-157/+162
|\|
| * ergodox_ez / dvorak_42_key layout: convert macros to new format (#11139)LucW2021-02-201-157/+162
| | | | | | Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net>
* | added unix60, moved togehter with southpaw75 into fr4 folder (#11195)mkdl2021-02-2014-0/+182
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-209-0/+243
|\|
| * Added ConsoleKeyboard (#11950)gazeddy2021-02-219-0/+243
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-201-2/+2
|\|
| * Fix minor typo (#11962)Jonathan Haddock2021-02-201-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2021-0/+447
|\|
| * [Keyboard] keyboards/anavi: Add ANAVI Macro Pad 2 (#11821)Leon Anavi2021-02-2021-0/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANAVI Macro Pad 2 is an open source mini mechanical keyboard with 2 keys and backlit. Powered by ATtiny 85 microcontroller and with microUSB connector. Designed with KiCad. Provides the following keymaps for ANAVI Macro Pad 2: - Default (with a, b and combo to control the LEDs) - Copy & paste - Tap dance example with a, b and c - Mute - Volume - Zoom - Jitsi Meet Co-authored-by: Drashna Jaelre <drashna@live.com> Signed-off-by: Leon Anavi <leon@anavi.org> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2011-0/+339
|\|
| * [Keyboard] Concertina (#11922)Viktor Eikman2021-02-2011-0/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Concertina * Added a novel handwired keyboard. * Concertina lint * Perfunctory changes to pass CI. * Concertina line width * Changes from code review: GPL headers, modernization, full-width representation of matrix to match info.json.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-203-2/+51
|\|
| * Add via support to Dozen0 (#11932)yynmt2021-02-203-2/+51
| | | | | | | | | | | | | | | | | | | | | | * Change VID and PID * Add via kyemap * Update keymap.c * Update keymap.c Co-authored-by: yynmt <yynmt@yynmt.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-201-2/+2
|\|
| * Update ortho.h (#11945)melonbred2021-02-201-2/+2
| |