summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Keep track of last matrix activity (#10730)"Nick Brassel2021-01-153-30/+15
| | | | This reverts commit 79d1db332477963555416d9fff82ecac4399bd52.
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-141-5/+18
|\
| * Updated documentation for new BDN9 board revisions (#11380)Nick Blyumberg2021-01-141-5/+18
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Danny <nooges@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-142-19/+17
|\|
| * [Keyboard] eliminate nested layout warnings in kbd75 (#11540)Joshua Diamond2021-01-132-19/+17
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1412-5/+336
|\|
| * [Keyboard] Added Ortho support to Program Yoink kb (#11534)melonbred2021-01-1312-5/+336
| | | | | | | | | | * Added Ortho support * Updated JSON
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-144-1/+61
|\|
| * [Keyboard] Add VIA support for CA66 (#11522)J.Flanagan2021-01-134-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add VIA support made changes to add VIA support for the CA66 - added VIA keymap.c, readme.md, rules.mk - changes made to main rules.mk to keep firmware size down (mousekey_enable = no; backlight_enable = no) - changed VENDOR_ID in config.h from 0xFEED to 0x504B (PK) * Minor changes to CA66 for VIA support edited keymap info enabled backlight * Update vendorID Change to vendorID to remove conflict with previously chosen vendorID already in use * Update keyboards/playkbtw/ca66/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/playkbtw/ca66/keymaps/via/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/playkbtw/ca66/keymaps/via/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-149-0/+245
|\|
| * [Keyboard] Add ISO Macro keyboard (#11517)duoshock2021-01-139-0/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | * - * - * - * - * - Co-authored-by: online <33636898+online@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1411-0/+561
|\|
| * [Keyboard] Add new afternoonlabs/breeze/rev0 split keyboard (#11510)Eithan Shavit2021-01-1311-0/+561
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding new breeze keyboard under afternoonlabs * Compiling only Rev0, moving readme there * Apply suggestions from code review Addressing review comments, removing legacy description config. Removing copy paste leftovers Co-authored-by: Drashna Jaelre <drashna@live.com> * Addressing review, remove empty rules.mk * typos * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Eithan Shavit <eithan@fb.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1414-0/+1888
|\|
| * [Keyboard] Add Hub20 keyboard (#11497)Josh Johnson2021-01-1314-0/+1888
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add Hub20 support * Keymap formatting cleanup Co-authored-by: Ryan <fauxpark@gmail.com> * Delete bootloader_defs.h as no longer required * Correct make / flashing example Co-authored-by: Ryan <fauxpark@gmail.com> * Update rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1410-0/+542
|\|
| * [Keyboard] Add Rect44 keyboard (#11484)koshinoya2021-01-1310-0/+542
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Rect44 keyboard * Update keyboards/rect44/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Delete config.h files in keymaps * Update keyboards/rect44/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/rect44/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/rect44/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-143-0/+87
|\|
| * [Keymp] add gwillad's keymap for prime_e (#11477)Adam Gwilliam2021-01-133-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | * new keymap * Update keyboards/primekb/prime_e/keymaps/gwillad/keymap.c use a more concise pin setting method Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Adam Gwilliam <agwilliam@yaharasoftware.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1413-0/+644
|\|
| * [Keyboard] Add space space keyboard (#11425)qpockets2021-01-1313-0/+644
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add space_space keyboard * update space_space readme * fix space_space formatting issue * add layout readme, vid & pid * experiment * readme fix * readme fix * readme fix * readme formatting * readme formatting * readme formatting * Update keymap.c change I+O combo to O+P because of accidental activation * Update keymap.c change I+O combo to O+P because of accidental activation * Update readme.md change keymap readme to reflect keymap changes * Apply suggestions from code review remove deprecated "key count" from .json Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review -move combo and modtap defines to the keymap level -formatting issues Co-authored-by: Joel Challis <git@zvecr.com> * move combo defines to keymap level and update config.h * Apply suggestions from code review add lower resolution readme picture and sleep LED note 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 Bot2021-01-149-0/+260
|\|
| * [Keyboard] Adding new keyboard UD_40 ortho version (#11401)David Dejaeghere2021-01-139-0/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding keyboard UD_40 Ortho * Update keyboards/mechstudio/ud_40_ortho/info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * fixing syntax after merging suggestions * Update keyboards/mechstudio/ud_40_ortho/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: David <david@tarpit.be> 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 Bot2021-01-143-0/+154
|\|
| * [Keymap] own Lily58 keymap (#11395)Christian Eiden2021-01-133-0/+154
| | | | | | | | | | | | | | | | | | * [Keymap] own Lily58 keymap Signed-off-by: Christian Eiden <christian@eiden.ch> * adjustments of personal keymap Signed-off-by: Christian Eiden <christian@eiden.ch>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-144-0/+241
|\|
| * [Keymap] urbanvanilla keymap for drop/alt (#11365)James2021-01-134-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added urbanvanilla keymap Urbanvanilla's keymap for massdrop/alt keyboard adds in an idle timer to turn off RGB after set amount of time. poor unsuccessful attempt at replicating a velocikey like functionality. Grave escape is enabled on ESC. * Update readme.md * updating documentation * Create readme.md * restoring default documentation * update with review changes implemented removed unnecessary lines and files. increased wait_us() parameter to 40 as was still getting chatter at 20. removed some code for the terrible rudimentary attempt at velocikey for rgb matrix * Update matrix.c * Revert "Merge pull request #3 from urbanvanilla/dev_branch" This reverts commit deb55d797a4629965c990ab507251489c578573d, reversing changes made to ba8817356f6c0881cf7f3214f7f1ebd31febceb5. * Update keymap.c * added urbanvanilla keymap Urbanvanilla's keymap for massdrop/alt keyboard adds in an idle timer to turn off RGB after set amount of time. poor unsuccessful attempt at replicating a velocikey like functionality. Grave escape is enabled on ESC. * Update readme.md * updating documentation * Create readme.md * restoring default documentation * update with review changes implemented removed unnecessary lines and files. increased wait_us() parameter to 40 as was still getting chatter at 20. removed some code for the terrible rudimentary attempt at velocikey for rgb matrix * Update matrix.c * Revert "Merge pull request #3 from urbanvanilla/dev_branch" This reverts commit deb55d797a4629965c990ab507251489c578573d, reversing changes made to ba8817356f6c0881cf7f3214f7f1ebd31febceb5. * Delete matrix.c * Update keyboards/massdrop/alt/keymaps/urbanvanilla/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keymap.c * Update keymap.c * Update keyboards/massdrop/alt/keymaps/urbanvanilla/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-147-87/+434
|\|
| * [Keyboard] Improvements for the Torn keyboard (#11268)Richard Titmuss2021-01-137-87/+434
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add bongo cat animation * Map all keys on base layer ... to make it easier to test newly built keyboards. The encoders are optional and can be placed in different locations. * Fix Torn in QMK configurator This removes additional variables defined in the keymap.c file, so that the default firmware can be compiled by the configurator. Co-authored-by: Richard Titmuss <richardt@spotify.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1410-0/+308
|\|
| * [Keyboard] Add support for hp69 (#11339)Ananya Kirti2021-01-1310-0/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * init init * Update keyboards/hp69/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hp69/keymaps/via/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hp69/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * re-added audio support re-added audio support * Update keyboards/hp69/readme.md reduced the size of the default image Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hp69/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hp69/info.json 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-1427-282/+580
|\|
| * Uni660 refactor (#11526)Ryan2021-01-1427-282/+580
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-141-1/+1
|\|
| * Fix documentation so UCIS example compiles. (#11541)Erovia2021-01-141-1/+1
| |
* | remove duplicate manufacturerZach White2021-01-1316-18/+2
| |
* | move the info.json rules above userspaceZach White2021-01-131-20/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-136-69/+67
|\|
| * Fix leafcutterlabs/bigknob compiles in configurator (#11531)Joel Challis2021-01-136-69/+67
| | | | | | | | | | * Fix leafcutterlabs/bigknob compiles in configurator * Revert change
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-13161-1/+11
|\|
| * Exclude more keyboards from CI (#11436)Zach White2021-01-13163-1/+11
| | | | | | | | | | * exclude all of handwired * exclude more keyboards from CI
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-131-0/+5
|\|
| * keymap_fr_ch: undef `CH_H` (#11537)Ryan2021-01-131-0/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-133-12/+564
|\|
| * [Keymap] rjhilgefort's Ergodox Infinity (#11345)Rob Hilgefort2021-01-123-12/+564
| | | | | | | | | | | | | | |