summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-029-0/+381
|\
| * [Keyboard] Added LDK65 based off BKS65 (#11335)Felix Jen2021-01-029-0/+381
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-021-1/+1
|\|
| * Update quark pin config (#11398)npspears2021-01-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0219-0/+1039
|\|
| * [Keyboard] Added Phantom Solder PCB and KBD8X HS PCB Variants (#11282)Felix Jen2021-01-0119-0/+1039
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added config for phantom solder all layout via only * fixed matrix def * Added KBD8X * changed info name * lowercase instances of LAYOUT_ALL and edited rules.mk * edited kbd8x results * fixed kbd8x rules * removed trailing comma in kbd8x info * Update keyboards/lucid/kbd8x_hs/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/kbd8x_hs/kbd8x_hs.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/kbd8x_hs/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/kbd8x_hs/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/phantom_solder/info.json Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/phantom_solder/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/phantom_solder/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Fixed info.json key mismatch Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-2/+7
|\|
| * [Keyboard] Pos78 update (#11274)smssmssms2021-01-011-2/+7
| | | | | | | | | | | | | | | | | | * Added LED hardware pin numbers CAPS and NUM lock LEDs * Added "LED_PIN_ON_STATE 1" * Make MATRIX_ROW/COL pins match reality
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0111-0/+399
|\|
| * [Keyboard] Add GKB-M16 Macro Pad (#11262)gkeyboard2021-01-0111-0/+399
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add GKB-M16 Macro Pad Add GKB-M16 (gkb_m16) Macro Pad under gkeyboard * Update keyboards/gkeyboard/gkb_m16/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/gkeyboard/gkb_m16/keymaps/via/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/gkeyboard/gkb_m16/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/gkeyboard/gkb_m16/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0112-0/+622
|\|
| * [Keyboard] New Keyboard - Mercutio (#11214)Kyle McCreery2021-01-0112-0/+622
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit on new clean branch. Testing out functionality of oled and encoder for default features. * Cleaned up the initial push and removed the fancy keymap until the extra features and functionality can be tested and made more user friendly. * Cleaned up the readme some more, compiled and tested both default and via keymaps, and did another round of checks to prepare for starting the PR. * Cleaning up the keymap to meet expected formatting in a couple places and also adding in the TAP_CODE_DELAY after newly encoutnered encoder issues and inconsistencies. * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechwild/mercutio/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Fixing json syntax. * Update keyboards/mechwild/mercutio/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-013-1/+120
|\|
| * [Keyboard] Rebound, adding files for VIA compat (#11193)Ross Montsinger2021-01-013-1/+120
| | | | | | | | | | | | | | | | | | | | | | * changes for via * add manu to product name * remove manu from product value * remove description * i m licensed
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-019-458/+513
|\|
| * O4L 5x12 refactor (#11392)Ryan2021-01-019-458/+513
| | | | | | | | | | * O4L 5x12 refactor * Remove config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-28/+28
|\|
| * Fix rart4x4 info.json (#11390)Ryan2021-01-011-28/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-018-256/+268
|\|
| * Manta60 refactor (#11378)Ryan2021-01-028-256/+268
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-12/+12
|\|
| * Fix layout ortho_4x12 macro for montsinger/rebound/rev4 (#11382)Joel Challis2021-01-011-12/+12
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-01-0130-708/+1060
|\|
| * Quark refactor (#11377)Ryan2021-01-0130-700/+1052
| |
| * Manually run formatting CI process (#11375)Joel Challis2021-01-011-33/+33
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-3121-0/+899
|\|
| * Quark PCB for Planck/Preonic (#11206)npspears2020-12-3121-0/+899
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Quark PCB for Planck/Preonic Quark provides alternate bottom row layouts for both the OLKB Planck and Preonic * Rename rules.mk.txt to rules.mk * added Tapping Toggle removed tapping toggle from keymap level * Update info.json took out } as requested * update config.h added GPL2+ license and #pragma once * update info.json again cleaned up syntax * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * update config.h added GPL2+ License * Update info.json - and again fixed it - oops Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-312-2/+2
|\|
| * Fixed typo in readme.md (#11333)Chas2020-12-312-2/+2
| | | | | | | | | | | | | | * Fixed typo in readme.md censor -> sensor * Censor -> Sensor in the Ploopy Trackball Readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-313-1/+2
|\|
| * Change PRODUCT_ID descriptors for M80S and M80H (#11371)Álvaro A. Volpato2020-12-313-1/+2
| | | | | | | | | | | | | | | | | | | | | | * Change PRODUCT_ID descriptors for M80S and M80H * Update config.h * Update config.h * Update config.h * Remove PRODUCT_ID from root config.h
* | Configure keyboard matrix from info.json (#10817)Zach White2020-12-3062-3763/+3697
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make parameters from info.json available to the build system * move all clueboard settings to info.json * code formatting * make flake8 happy * make flake8 happy * make qmk lint happy * Add support for specifying led indicators in json * move led indicators to the clueboard info.json * Apply suggestions from code review Co-authored-by: Erovia <Erovia@users.noreply.github.com> * add missing docstring Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-301-1/+2
|\|
| * Correct encoder pins on BDN9v2 (#11357)Nick Blyumberg2020-12-301-1/+2
| | | | | | | | | | | | | | | | | | * Update config.h Wrong pin used for the left encoder, should be A4 * Update config.h Added a media keys fix as well
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-301-0/+44
|\|
| * [Keymap] Yd60mq add 64 key layout (#11207)Enoch2020-12-301-0/+44
| | | | | | | | | | | | | | | | | | * 64 key layout * add license * add license add name
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-301-0/+17
|\|
| * [Keyboard] Add support to Kyria for the 2x2u layout (#11227)swampmonster2020-12-291-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | * Adding support for the 2 x 2u layout. This adds a macro to support the 2 x 2u layout which facilitates a cleaner looking layout configuration for the people using it. * Update keyboards/kyria/kyria.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: swampmonster <> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-307-0/+316
|\|
| * [Keyboard] Polarity works CRBN support (#11107)ReFil2020-12-297-0/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial CRBN compatibility Updated readme.md too * formatting tweaks to meet requirements * Update crbn.c * Create readme.md * Required fixes and licence header * Fixes * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/crbn/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update crbn.c * Update keyboards/crbn/crbn.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Licence headers * Create info.json * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Configurator support * Update keymap.c * Update keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-304-0/+287
|\|
| * [Keymap] spidey3 keymap for DMQDesign Spin (#11194)Joshua Diamond2020-12-294-0/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * My first cut at firmware for te DMQDesign Spin * Turn off underglow when computer sleeps * dmqdesigns spin - a little more refined keymap now * a few more refinements for spin * missing key up event for CH_CPNL and CH_ASST * better naming for keymap * cformat * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Old #include habits die hard... :) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-309-0/+250
|\|
| * Add Axolstudio Helpo (#11117)kb-elmo2020-12-309-0/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add axolstudio helpo * reverse matrix * fix path in readme * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/axolstudio/helpo/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-3012-0/+703
|\|
| * The mark: 65 (#11060)cole smith2020-12-3012-0/+703
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added main keyboard files * working default and iso maps * add via config * made default ansi map * fixed info.json and made readme * renamed folders * reincluding the folders I renamed * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * I made a change before PR to clean up VIA map that broke it now its fixed * Apply suggestions from code review Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/boardsource/the_mark/the_mark.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.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 Bot2020-12-3013-0/+364
|\|
| * 40percentclub sixpack support (#11007)Suschman2020-12-3013-0/+364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * QMK support for 40percentclub SixPack * Update readme.md * QMK support for 40percentclub SixPack * fix info.json * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * update PRODUCT name and change BL levels to 6 * Add Fkeys keymap * correct readme * add via keymap * correct readme * change indentation * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * requested change and more cleanup * Update keyboards/40percentclub/sixpack/sixpack.h Co-authored-by: Erovia <Erovia@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Suschman <suschman@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-3025-0/+2173
|