summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-122-0/+10
|\
| * Document LED physical location index for Planck and Preonic (#12147)Albert Y2021-03-132-0/+10
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-121-0/+2
|\|
| * Enable default features on VIA keymap for Lily58 (#12185)Albert Y2021-03-121-0/+2
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-126-103/+66
|\|
| * Remove hex_to_keycode and move tap_random_base64 to send_string.c (#12079)Ryan2021-03-126-103/+66
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-123-1365/+57
|\|
| * ChibiOS conf upgrade for boston (#12170)Nick Brassel2021-03-123-1365/+57
| | | | | | boston - 8bded9dabff58de6febd927d4ad976bb743696a3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-114-237/+93
|\|
| * [Keymap] arkag Userspace updated (#12183)Alexander Kagno2021-03-114-237/+93
| | | | | | Co-authored-by: Alex <alex@turncommerce.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-10153-1623/+249
|\|
| * Refactor to use led config - Part 6 (#12115)Joel Challis2021-03-10153-1623/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * revert changes
* | Move gpio wait logic to wait.h (#12067)Joel Challis2021-03-108-141/+235
| |
* | Remove `FUNC()` (#12161)Ryan2021-03-111-4/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-1015-49/+493
|\|
| * Add VIA support to doodboard/duckboard_r2 (#12028)somepin2021-03-0915-49/+493
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update R1 keymap and config * Add duckboard R2 * Add VIA support for duckboard R2 * Set bootmagic lite row and column * Update config.h * Update keyboards/doodboard/duckboard/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update config.h Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-091-1/+1
|\|
| * Fix typo in `get_git_version()` (#12182)Ryan2021-03-101-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-091-0/+127
|\|
| * Add BFO-9000 info.json (#12179)Danny2021-03-091-0/+127
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-091-13/+4
|\|
| * improve detection of community layout supportZach White2021-03-091-13/+4
| |
* | LED Matrix: decouple from Backlight (#12054)Ryan2021-03-087-27/+45
| |
* | Begin the process of deprecating bin/qmk in favor of the global cli (#12109)Zach White2021-03-076-8/+21
| | | | | | | | | | * Begin the process of deprecating bin/qmk in favor of the global cli * Correctly set the qmk bin
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-074-0/+209
|\|
| * [Keymap] add crkbd/keymaps/armand1m (#12098)Armando Magalhães2021-03-074-0/+209
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0720-0/+817
|\|
| * [Keyboard] Capsunlocked CU80 - added variant's for RGB matrix support (#12019)maz0r2021-03-0720-0/+817
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | trivial change to trigger api updateZach White2021-03-071-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-071-1/+2
|\|
| * minor change to trigger api updateZach White2021-03-071-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-071-0/+3
|\|
| * Require `BOOTLOADER = qmk-dfu` for `:bootloader` target (#12136)Ryan2021-03-071-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-072-2/+2
|\|
| * fix CI job: api-data->api_dataZach White2021-03-062-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-073-3/+3
|\|
| * Remove stale references to "handwired/ferris"Pierre Chevalier2021-03-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The code was moved to the "ferris" directory. Fixes the following commands: ``` qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/default/keymap.json qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/pierrec83/keymap.json ``` Addresses this issue: https://github.com/pierrechevalier83/ferris/issues/5
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-072-26/+16
|\|
| * upload api data to spacesZach White2021-03-062-26/+16
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-061-2/+2
|\|
| * Enforce minimum versions for jsonschema and MILC (#12141)Zach White2021-03-061-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-068-0/+429
|\|
| * [Keyboard] bm68rgb (#12128)peepeetee2021-03-068-0/+429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add support for Bbm68rgb * pull request changes filled * pull request changes filled(this time for real) * added new line to files that did not have new lines at end of file * updated modifier keys for rgb effects * Update keyboards/bm68rgb/readme.md * Apply suggestions from code review * Apply suggestions from code review * add nkro suppport * Update keyboards/bm68rgb/rules.mk * modified keymap to better correspond to physical layout * updated comment style
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0610-0/+356
|\|
| * [Keyboard] add Soup10 support (#11921)icesoup2021-03-0610-0/+356
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0617-0/+1121
|\|
| * Adding Zodiark Split keyboard (#11837)Aleblazer2021-03-0617-0/+1121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding Files for Zodiark * zodiark.h and keymap.c layout corrections * Apply suggestions from code review Applied all suggestions from zvecr. Co-authored-by: Joel Challis <git@zvecr.com> * Applied all suggestions from fauxpark Co-authored-by: Ryan <fauxpark@gmail.com> * Defined matrix driver * Update keymap with GPL2 * Added GPL2+ to All keymap.c, cleaned up config.h, and removed the rgbmatrixwip keymap * Apply suggestions from code review Removed the two lines from the config.h and changed to the smaller resolution picture on the Readme. Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> * Added VIA keymap * Corrected VIA Keymap oled.c 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-03-061-9/+5
|\|
| * Remove ifdefs for UC and X/XP too (#12131)Ryan2021-03-061-9/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-061-21/+14
|\|