summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0512-0/+403
|\|
| * [Keyboard] Monstargear XO87 Solderable support (#11716)datafx2021-03-0512-0/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Support for XO87 solderable version * cleanup * Remove abandoned code * replaced KEYMAP with LAYOUT and moved LAYOUT macro to solderable.h. deleted unneeded files. * Update keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c * update info.json with missing keys * Apply suggestions from code review * Apply suggestions from code review correct layout macro
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-054-1/+65
|\|
| * [Keyboard] NK65 rev 1.4 (#11991)yiancar2021-03-044-1/+65
| | | | | | | | | | | | | | | | | | | | NK65 Pinout change for rev 1.4. * Update Pinout for new PCB rev * Create readme.md * Update keyboards/nk65/v1_4/rules.mk
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0557-669/+2110
|\|
| * dumbpad refactor - adding support for various PCB revisions (#9259)imchipwood2021-03-0457-669/+2110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Placeholder commit - Refactored to support different PCB revisions Individual revision folders still need: - info.json - readme.md all v0x folders support up to two LEDs for layer indication all v1x folders support up to two LEDs for layer indication plus one extra LED for numlock indication v0x - supports single-encoder v0.x PCB revisions v0x_right - supports reversible, single-encoder v0.x PCB revisions v0x_dualencoder - supports dual-encoder v0.x PCB revisions v1x - supports single-encoder v1.x PCB revisiions v1x_right - supports reversible, single-encoder v1.x PCB revisions * Added info.json and readme.md files for all dumbpad revisions * More refactoring, adding shared config.h and rules.mk Removed config.h from default keymap folders - defining TAPPING_TOGGLE in config.h * Minor formatting fix * MATRIX_COL_PINS for v1x_right was not reversed - changed to match v0x_right * adding support for v1x dual encoder PCB * adding alt-f2 tapdance routine for personal keymaps * adding dumbpad build using teensy 2.0 instead of Pro Micro * matched v1x dumbpad encoder and led pins to latest PCB revisions * updated readme, removed v1x_teensy until someone requests it * changed device name to match tmk udev rules, removed unnecessary ifdef * removed user keymaps and folders * missed hotdox keymap - removing * fixing info.json keyboard_names for all versions * Changed biton32 to get_highest_layer in keyboards/dumbpad/v0x/v0x.c * keyboards/dumbpad/v0x/v0x.c - remove matrix_scan_kb, process_record_kb * /dumbpad/v0x/keymaps/default/keymap.c - remove empty functions * /dumbpad/v0x/keymaps/default/keymap.c - changed biton32 to get_highest_layer * keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c - remove empty functions * keyboards/dumbpad/v0x_right/readme.md - smaller board layout image * keyboards/dumbpad/v1x_dualencoder/readme.md - smaller board image * keyboards/dumbpad/v1x/readme.md - smaller board image * keyboards/dumbpad/v1x_right/readme.md - smaller board image * Update keyboards/dumbpad/rules.mk * Apply suggestions from code review Batch applying suggestions from review * fixed removal of led_set_kb * Implementing requested changes from old pull request 9259 * removing unused rules * removed rules.mk from dumbpad base folder * adding templates for each layout * testing default keymap json * Testing applying default keymap for dumbpad * Layout correction: v1.x are 17 position pcb's * Update keyboards/dumbpad/v0x/rules.mk * Update keyboards/dumbpad/v0x/rules.mk * Update keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c * Update keyboards/dumbpad/v0x_dualencoder/rules.mk * Update keyboards/dumbpad/v0x_dualencoder/rules.mk * Update keyboards/dumbpad/v1x_dualencoder/rules.mk * Update keyboards/dumbpad/v1x_dualencoder/templates/keymap.c * Update keyboards/dumbpad/v1x_right/rules.mk * Update keyboards/dumbpad/v1x_right/rules.mk * Update keyboards/dumbpad/rules.mk * Update keyboards/dumbpad/v0x_dualencoder/templates/keymap.c * Update keyboards/dumbpad/v0x_right/rules.mk * Update keyboards/dumbpad/v1x/rules.mk * Update keyboards/dumbpad/v1x/rules.mk * Update keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c * Update keyboards/dumbpad/v1x_dualencoder/rules.mk * Update keyboards/dumbpad/v0x_right/rules.mk * Removing binary files
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-041-1/+1
|\|
| * update correct layout name (#12096)Quentin2021-03-041-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-042-4/+4
|\|
| * Fixed the ortho60 and ortho48 matrix layout after testing (#12106)Nick Blyumberg2021-03-042-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-0426-0/+9357
|\|