summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\|
| * Mode80 support (#10945)Álvaro A. Volpato2020-12-3025-0/+2173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add default mode eighty firmware * Add via keymap * Mode80 firmware upgrades - Removed SPI and PWM drivers from MCU configuration, HAL configuration and Chibi configuration as neither peripherals are being used - Included second backspace key (row 5, col 14) which should solve the non-appearance of the backspace key on the hotswap PCB * Add default mode eighty firmware * Add via keymap * Update keyboards/mode/eighty/config.h Remove comment lines from config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mode/eighty/config.h Remove comments from config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update eighty.c Add GPLv2 header * Update eighty.h Add GPLv2 license header * Update readme.md Update README * Update keyboards/mode/eighty/config.h Remove keyboard description Co-authored-by: Drashna Jaelre <drashna@live.com> * Delete config.h Delete config.h in keynap folder * Update keyboards/mode/eighty/rules.mk Remove feature disabling in rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Move rules.mk to VIA folder * Update keyboards/mode/eighty/keymaps/via/rules.mk Use LTO_ENABLE as short for LINK_TIME_OPTIMIZATION_ENABLE Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mode/eighty/readme.md Puts a single image embedded in the readme, and links to the full gallery Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/mode/eighty/readme.md Use * for markdown list Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggestions from code review Correct comment characters Co-authored-by: Ryan <fauxpark@gmail.com> * Adjusted copyright name, USB descriptor and removed info.json * Separate Mode80 S and H firwares into subfolders * Added info.json files for QMK Configurator * Lowercase folder and filenames * Remove config definition macros in M80H * Remove config definition macros in M80S and root * Change definitions to lowercase parameters * Moce chconf and mcuconf chibiOS files to root folder * Move halconf to root folder, keymaps to subfolders * Update readme for building/flashing guide Co-authored-by: Ryan <fauxpark@gmail.com> * Add layers to VIA keymaps, remove CONSOLE_ENABLE * Push master changes to lib/ * Retrieve lufa and googletest submodules to previous heads at master * Disabled LTO in VIA keymaps * Fix layout declaration to lowercase in m80s default keymap * Added readme's for each M80S and M80H Co-authored-by: Jaicob <jaicob@icloud.com> Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-301-4/+4
|\|
| * [REDOX] Fix default keymap formatting (#11288)LongerHV2020-12-301-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-309-89/+414
|\|
| * [Keyboard] Add via support for le chiffren (#10597)TJ2020-12-299-89/+414
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add Via support and improve default keymap * Update OLED widgets with Sickbabies updates. Add license headers * Add led matrix config * Add g_led_config * Fix rules for matrix * rules.mk updates * Fix key lock state widgets rebase on master * Rules fixes * remove LED_MAP
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-3012-0/+406
|\|
| * [Keyboard] Add the Octopad (#9946)NightlyBoards2020-12-2912-0/+406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create Alter folder * Revert "Create Alter folder" This reverts commit 361103b821dbb22957b66cdedb0d11f996def71c. * Add octopad folder * Added a new keyboard, the Octopad * Edited files based on requested changes * Moved encoder code in keyboard level * Updated the readme * Corrected the rows and columns of encoders on config.h * Changed the Vendor ID to D812 since the first one was already taken * Added support for ast1109MLTRQ speakers * Increased number of layers to 8 on VIA keymap * Edited fil