summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-16Merge remote-tracking branch 'origin/master' into developZach White
2021-01-16Improve the compile and flash subcommands (#11334)Zach White
* add support for --clean to compile and flash * compile standalone JSON keymaps without polluting the tree * Add support for passing environment vars to make * make flake8 happy * document changes to qmk compile and flash * add -e support to json export compiling * Fix python 3.6 * honor $MAKE * add support for parallel builds
2021-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-15New Keyboard: walletburner/cajal (#10458)ridingqwerty
* adding alpha variants * adding cajal layouts * adding V2 PCB support adding additional layouts for new PCB version, and correecting incorrect image in info file * Cleanup master -- remove alpha9 * Cleanup master -- remove g4m3ralpha * Cleanup master -- remove cajal & sl40 * Master cleanup -- re-add sl40 * Master cleanup -- correct SL40 image * New Keyboard: walletburner/cajal * Added license attribution to *.{c,h} files * Update keyboards/walletburner/cajal/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/walletburner/cajal/keymaps/ortho/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Rename 'ortho' keymap to 'default_ortho' * Update keyboards/walletburner/cajal/cajal.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update readme.md Adding bootloader instructions. Co-authored-by: worldspawn00 <mcmancuso@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-16Add BGR byte order for WS2812 drivers (#11562)kb-elmo
* add byte order bgr for ws2812 * update docs for driver change * Update ws2812_driver.md * Update docs/ws2812_driver.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-15Modify my keymap (#11407)Reibl János Dániel
2021-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-15Adds VIA support for the KPRepublic's BM60 Poker (#11267)Peter Peterson
* WIP working on new keymap * tweaking keymap * updated keymap * cleaned up a little bit * New preonic keymap * my preonic keymap * added mac layout * preonic map update * cleaning up old repo * cleaning up to match upstream * more cleanup * removing old keymaps * cleaned up commit history for bm60poker via support * cleaned up via keymap * fixed copywrite Co-authored-by: Peter Peterson <ppeterson@noao.edu>
2021-01-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-15Afternoon Labs Breeze Rev0: Configurator key sequence fix (#11550)James Young
* human-friendly formatting * correct key order
2021-01-15Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-01-14Cutie Club Borsdorf: Configurator key sequence fix (#11549)James Young
* human-friendly formatting * correct key order (ISO Enter)
2021-01-14[Keyboard] Add cool836A 1_2 (#11467)Ohashi
* 1st trial on 1_2 * remove keymaps/default/km_default.c * fix cool836A.h * fix keymap.c into 3x12 * rename to cool836a (not 'A') * remove cool836A (not a) * remove backslashes at keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * update keymap.c (add licence) * Update keyboards/cool836a/keymaps/default/readme.md removed "<br>" in line 2 Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cool836a/keymaps/default/readme.md remove "<br>" in line 4 Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cool836a/keymaps/default/readme.md remove "<br>" in line 8 Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cool836a/cool836a.h remove cool836a.h line 30:36 Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-15Adafruit BLE cleanups (#11556)Ryan
2021-01-15arm_atsam: temporarily lower raw HID endpoint/report size (#11554)Ryan
2021-01-15Revert "Keep track of last matrix activity (#10730)"Nick Brassel
This reverts commit 79d1db332477963555416d9fff82ecac4399bd52.
2021-01-14[Keymap] Adds ymdk/ymd09 andys8 layout (#11320)Andy
Custom layout for macropad. It shows the usage of macros with unicode, and other layouts (ISO-DE) with unicode, emojis, and git commands.
2021-01-14allow customizing decrease delay of rgb heatmap (#11322)André Silva
* allow customizing decrease delay of rgb heatmap * rename rgb typing heatmap decrease delay variable * address review comments * nix-shell: add clang-tools required for formatting the C code * heatmap: use real timer to track decrement rate * heatmap: fix ifndef var name typo * heatmap: add docs * Update docs/feature_rgb_matrix.md Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-14[Keymap] Add domnantas lily58 keymap (#10910)Domantas
* Initialize domnantas layout * Update oled status display * Layout and oled changes * Updates to keymap * Add F keys and page moves * Add media keys, rearrange home and end * Add instructions * Swap backspace and enter * Remove unnecesary Enter keymap * - Change display timeout - Update minus sign to work on both English and Lithuanian layouts * Add copyright header * Replace static strings with PSTR * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-15Remove `DESCRIPTION`, B-D (#11513)Ryan
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-14Updated documentation for new BDN9 board revisions (#11380)Nick Blyumberg
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Danny <nooges@users.noreply.github.com>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] eliminate nested layout warnings in kbd75 (#11540)Joshua Diamond
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Added Ortho support to Program Yoink kb (#11534)melonbred
* Added Ortho support * Updated JSON
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Add VIA support for CA66 (#11522)J.Flanagan
* 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>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Add ISO Macro keyboard (#11517)duoshock
* - * - * - * - * - Co-authored-by: online <33636898+online@users.noreply.github.com>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Add new afternoonlabs/breeze/rev0 split keyboard (#11510)Eithan Shavit
* 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>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Add Hub20 keyboard (#11497)Josh Johnson
* 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>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Add Rect44 keyboard (#11484)koshinoya
* 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>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keymp] add gwillad's keymap for prime_e (#11477)Adam Gwilliam
* 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>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Add space space keyboard (#11425)qpockets
* 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>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Adding new keyboard UD_40 ortho version (#11401)David Dejaeghere
* 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>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keymap] own Lily58 keymap (#11395)Christian Eiden
* [Keymap] own Lily58 keymap Signed-off-by: Christian Eiden <christian@eiden.ch> * adjustments of personal keymap Signed-off-by: Christian Eiden <christian@eiden.ch>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keymap] urbanvanilla keymap for drop/alt (#11365)James
* 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>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Improvements for the Torn keyboard (#11268)Richard Titmuss
* 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>