summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\|
| * Remove a few more ifdefs from quantum_keycodes (#12129)Ryan2021-03-061-21/+14
| |
* | Set default OLED Update Interval for Split Keyboards (#12107)Drashna Jaelre2021-03-051-0/+4
| | | | | | | | | | | | Because the matrix scanning is slower for splits, in general, the frequent updating of the OLEDs can slow down the matrix scanning. To help prevent that, set the update interval for the OLEDs to not update as frequently.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-059-0/+595
|\|
| * added 0xCB/1337 keyboard (#12089)Conor Burns2021-03-059-0/+595
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-051-0/+1
|\|
| * add OLED_DRIVER_ENABLE into show_options.mk (#12121)Takeshi ISHII2021-03-051-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0511-0/+2027
|\|
| * [Keyboard] add Boston keyboard (#11273)bluepylons2021-03-0511-0/+2027
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added boston keyboard * Added Boston keyboard * Changed some keycodes, added layers, added encoder layer change, added RGB layer indicator * Cleaned up whitespace * Update config.h Cleaned up whitespace * Cleaned up whitespace * Added keyboard_post_init_kb code for RGBLEDs so that they start on a defined color * Modified layout so that split backspace right is at a more intuitive location for configurator * Cleaned up whitespace, changed some labels * Modified keymap to accommodate revised layout in boston.h * Removed "on port C6" from Line 20 (committed suggestion) * Removed "Encoder Enable" from Line 8 (committed suggestion) * Removed empty #define DESCRIPTION as suggested * Implemented lock LED changes as suggested by drashna * Implemented lock LED changes as suggested by Drashna, changed WS2812 driver byte order * Updated HSV color codes to reflect WS2812 byte order change * Implemented suggestion from noroadsleft * Implemented suggestion from noroadsleft * Updated readm.md per suggestions from noroadsleft * Update keyboards/boston/readme.md per noroadsleft's suggestion * Removed empty layers from default keymap * Stripped empty layers and much code from default keymap ; moved to RGB Light Layers keycap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0515-311/+643
|\|
| * [Keymap] Add 60_ansi_arrow_split_bs_7u_spc layout & keymap (#11329)Sendy YK2021-03-0515-311/+643
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 60_ansi_arrow_split_bs_7u_spc layout & keymap * Update readme.md * Minor updates * Update dz60.h * Update keymap.c * Update readme.md * Update keymap.c * Update readme.md * Update readme.md * Update keymap.c * Update layouts/default/60_ansi_arrow_split_bs_7u_spc/layout.json * Update keymap.c * Update readme.md
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0511-0/+683
|\|
| * [Keyboard] Lagrange handwired keyboard (#11374)Dimitris Papavasiliou2021-03-0511-0/+683
| | | | | | | | | | | | * [Keyboard] Add the Lagrange keyboard * Covert the master side to use the SPI driver.