Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'upstream/master' into develop | James Young | 2021-09-23 | 10 | -272/+331 | |
|\| | ||||||
| * | Meira Refactor (#14566) | James Young | 2021-09-23 | 10 | -282/+330 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * clean up keyboard header files * use #pragma once include guard * convert tabs to spaces * remove redundant #include statements * update revision references to main header (`../meira.h` -> `meira.h`) * refactor default keymap * use LAYOUT as layout macro reference * use enum statement for layer indexes; make layers contiguous * use four-space indent * update keycode grid alignment * update layout macro aliases * move layout macro aliases to info.json * alias KEYMAP to LAYOUT_ortho_4x12 so the user keymaps don't have to be edited * touch up meira.h There's no Planck MIT layout reference here. * add copyright headers * workaround patch for grahampheath keymap The `matrix_init_kb()` function in `meira.c` calls `backlight_set()`, but the grahampheath keymap disables Backlight to make space for Audio, causing the firmware to fail to compile. This commit wraps the `backlight_set()` call in an ifdef statement, so the call is excluded if Backlight is disabled. * clean up rules.mk inline comments * re-order rules.mk settings * clean up readme.md * correct link to keyboard image * change metadata section to unordered list * spelling corrections * update make instructions and Docs links | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-23 | 8 | -0/+251 | |
|\| | ||||||
| * | [Keyboard] Bkf (#14534) | drhigsby | 2021-09-22 | 8 | -0/+251 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | James Young | 2021-09-22 | 6 | -8/+1 | |
|\| | ||||||
| * | Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) (#14567) | James Young | 2021-09-22 | 7 | -9/+1 | |
| | | | | | | | | | | * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) * update keyboards/handwired/slash/rules.mk per fauxpark | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 1 | -2/+2 | |
|\| | ||||||
| * | [Keyboard] Fix default keymap for Draytronics Elise V2 keyboard (#14562) | Drashna Jaelre | 2021-09-23 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 1 | -2/+2 | |
|\| | ||||||
| * | [Keyboard] Disable console on Smallkeyboard (#14561) | Drashna Jaelre | 2021-09-23 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 10 | -9/+1120 | |
|\| | ||||||
| * | [Keyboard] Version 2 of Draytronics Elise Keyboard + ISO Keymap Change (#14253) | Blake | 2021-09-21 | 10 | -9/+1120 | |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 9 | -0/+505 | |
|\| | ||||||
| * | [Keyboard] add kk980 keyboard (#14436) | Sets3n | 2021-09-21 | 9 | -0/+505 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 5 | -137/+79 | |
|\| | ||||||
| * | [Keyboard] Fix jkb65 compile issues (#14554) | Drashna Jaelre | 2021-09-21 | 5 | -137/+79 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 1 | -1/+1 | |
|\| | ||||||
| * | [Keyboard] Fix font file for Ein 60 Keyboard (#14553) | Drashna Jaelre | 2021-09-21 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 9 | -0/+502 | |
|\| | ||||||
| * | [Keyboard] Add Dango40 (#14437) | Brandon Claveria | 2021-09-21 | 9 | -0/+502 | |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Swiftrax <swiftrax@gmail.com> Co-authored-by: Swiftrax <swiftrax@github.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 12 | -0/+368 | |
|\| | ||||||
| * | [Keyboard] Add Free Willy Keyboard (#14394) | Caleb Lightfoot | 2021-09-21 | 12 | -0/+368 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 14 | -0/+551 | |
|\| | ||||||
| * | [Keyboard] 0-Sixty: Splits kb config into base and underglow (#14384) | Vinam Arora | 2021-09-21 | 4 | -0/+84 | |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
| * | [Keyboard] Add support for XT8x (#14440) | kopibeng | 2021-09-21 | 10 | -0/+467 | |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 1 | -2/+2 | |
|\| | ||||||
| * | [Keyboard] fixed one of the unicode drawings of the layout in dz60.h (#14482) | milostatsea | 2021-09-21 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 11 | -2/+379 | |
|\| | ||||||
| * | [Keyboard] Add JadooKB JKB65 RGB (#14525) | WiZ.GG | 2021-09-21 | 10 | -0/+377 | |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
| * | Changed VENDOR_ID and PRODUCT_ID of Boston keyboard (#14528) | Pylon | 2021-09-21 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 1 | -0/+97 | |
|\| | ||||||
| * | [Keyboard] Add commented out OLED/encoder code in default Kyria (#14539) | precondition | 2021-09-21 | 1 | -0/+97 | |
| | | | | | | | | Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 16 | -0/+1182 | |
|\| | ||||||
| * | [Keyboard] add ein_60 (#14398) | James Smith | 2021-09-21 | 16 | -0/+1182 | |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 1 | -28/+28 | |
|\| | ||||||
| * | [Keyboard] smallkeyboard fix of rgb matrix config (#14548) | Drashna Jaelre | 2021-09-21 | 1 | -28/+28 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-22 | 15 | -22/+298 | |
|\| | ||||||
| * | [Keyboard] Addition of VIA keymap and a few fixes for naked48 (#14177) | Salicylic-acid3 | 2021-09-21 | 15 | -22/+298 | |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | [Keyboard] Set USB max power consumption of kint* controllers to 100mA (#14546) | Michael Stapelberg | 2021-09-21 | 3 | -0/+12 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-21 | 9 | -0/+297 | |
|\| | ||||||
| * | [Keyboard] smallkeyboard support (#12817) | zhouqiong19840119 | 2021-09-21 | 9 | -0/+297 | |
| | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-21 | 11 | -0/+621 | |
|\| | ||||||
| * | [Keyboard] Macro-1 keyboard by Laneware Peripherals (#14472) | Laneware | 2021-09-21 | 11 | -0/+621 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-21 | 3 | -3/+64 | |
|\| | ||||||
| * | [Keyboard] add via keymap support for bt66tech/bt66tech60 (#13818) | bt66tech | 2021-09-21 | 3 | -3/+64 | |
| | | | | | | Co-authored-by: root <crkndevops@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-21 | 16 | -0/+841 | |
|\| | ||||||
| * | [Keyboard] add wanten keyboard to QMK (#14410) | qpockets | 2021-09-21 | 16 | -0/+841 | |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-21 | 10 | -0/+457 | |
|\| | ||||||
| * | [Keyboard] Add support for MNK88 (#14435) | kopibeng | 2021-09-21 | 10 | -0/+457 | |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-21 | 28 | -0/+1745 | |
|\| |