summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-161-0/+2
|\
| * Bug in beautifier script, compound modifiers not correctly parsed (#12595)sendmmsg2021-04-161-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-151-25/+22
|\|
| * Fix audio on WT60-XT (#12526)Wilba2021-04-151-25/+22
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-154-258/+452
|\|
| * Optimize NIBBLE oled_bongocat keymap to reduce flash usage (#12330)Jay Greco2021-04-154-258/+452
| | | | | | | | | | | | | | | | | | | | * Optimize with squeez-o frame compression Adds VIA support! * Clean up for PR + Add copyright header - Remove debug print statements
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-151-5/+7
|\|
| * update readme (#12322)MechMerlin2021-04-151-5/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-149-0/+785
|\|
| * Dactyl manuform 5x6 2 5 keymap (#11353)Jan Christoph Ebersbach2021-04-149-0/+785
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys * fix(keymap): add missing readme * chore: add gpl2 license header * chore: add gpl2 license header * docs[dactyl_manuform_5x6_2_5]: reformat readme Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1410-0/+535
|\|
| * [Keyboard] CyberGear Macro25 (#12518)Marius Kavoliunas2021-04-1410-0/+535
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add cybergear macro25 keyboard * add readme and fix file namings * rename readme.md * separate default and via keymaps * add info.json * unify info.json and key coordinates * remove via json * add missing via layers * Update keyboards/cybergear/macro25/keymaps/via/rules.mk * Update keyboards/cybergear/macro25/macro25.c * Update keyboards/cybergear/macro25/macro25.h * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * remove unnecessary config.h parameters * Update keyboards/cybergear/macro25/config.h * remove MATRIX_ROWS and COLS from config.h * Apply suggestions from code review set to LAYOUT_ortho_2x5 and fix grammar
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1412-0/+372
|\|
| * [Keyboard] Add Caffeinated Studios Serpent65 (#12578)J.Flanagan2021-04-1312-0/+372
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-141-1/+1
|\|
| * Correct layout macro name in Cannonkeys Ortho75 info.json (#12581)James Young2021-04-131-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-132-0/+38
|\|
| * [Keymap] ANAVI Macro Pad 2 add Google Meet keymap (#12449)Leon Anavi2021-04-132-0/+38
| | | | | | | | | | | | | | | | | | This keymap for ANAVI Macro Pad 2 contains a couple of shortcuts for Google Meet: - left key: turn on/off the microphone (mute button) - right key: turn on/off the camera Signed-off-by: Leon Anavi <leon@anavi.org>
* | Terrazzo: Fix wrong LED Matrix function names (#12561)Ryan2021-04-137-10/+10
| |
* | [Keymap] Add kzar keymap for Kinesis Advantage (#12444)Dave Vandyke2021-04-134-0/+438
| |
* | Change `BOOTMAGIC_ENABLE=yes` to use Bootmagic Lite (#12172)James Young2021-04-12210-210/+210
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-121-1/+2
|\|
| * Merc updates (#12289)Kyle McCreery2021-04-121-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-124-44/+98
|\|
| * Update layout option for lazydesigners/THE40 (#12312)jackytrabbit2021-04-124-44/+98
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-111-2/+2
|\|
| * Update readme.md (#12502)Joseph Whom2021-04-111-2/+2
| | | | | | Noticed a letter missing in "compiling".
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-102-2/+1
|\|
| * Reverse K0E and K0G (#12491)Álvaro A. Volpato2021-04-102-2/+1
| | | | | | Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1013-4/+374
|\|
| * [Keyboard] Add afternoonlabs/oceanbreeze (#12299)Eithan Shavit2021-04-0913-4/+374
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Eithan Shavit <eithan@fb.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1015-434/+334
|\|
| * [Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps (#12217)Ryo Maeda2021-04-0915-434/+334
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-093-15/+69
|\|
| * [Keyboard] ergosaurus - add VIA support, enabled RGB (#12126)littleferris2021-04-093-15/+69
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0911-0/+454
|\|
| * [Keyboard] Added senselessclay had60 (#12093)hadi2021-04-0911-0/+454
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-093-1/+42
|\|
| * Add VIA keymap for Kawii9 (#12521)kiwikey2021-04-093-1/+42
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0967-80/+2526
|\|
| * Add TH1800 PCB, Hex6C PCB, Rogue87 PCB, Rouge87 PCB, Infinity87 series (#11977)mechlovin2021-04-0967-80/+2526
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: vuhopkep <boy9x0@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0812-0/+402
|\|
| * Add new handwired keyboard (Ergocheap) (#11857)Adrian2021-04-0812-0/+402
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-071-9/+58
|\|
| * Update info.json to correctly. (#12507)Kosuke Adachi2021-04-071-9/+58
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-071-0/+82
|\|
| * Add info.json for CK60i (#12318)Ryan2021-04-071-0/+82
| |
* | Fix up builds that are now too big for `develop` branch. (#12495)Nick Brassel2021-04-063-0/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-041-1/+1
|\|
| * Disarray ProductID change (#12440)SneakboxKB2021-04-041-1/+1
| | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com> Co-authored-by: Zach White <skullydazed@gmail.com>