summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-09-24[Keyboard] Add Adelais PCB. Adelais RGB rev.3, Adelais rev. 4 APM32F103, ↵mechlovin
Adelais AVR rev. 1 (#14252) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-23Wuque Mammoth20x Layout Macro Refactor (#14568)James Young
* mammoth20x: edit size of RightEncode key in Configurator * physically arrange layout macro Arranges the keycodes to resemble the assembled board. * rename LAYOUT_default to LAYOUT Includes "layout_aliases" tree in info.json for backwards compatibility. * rules.mk touch-up * convert tabs to spaces * add line break before ENCODER_ENABLE (not included in QMK's template) * readme.md touch-up * remove zero-width space characters * markdown fix for info paragraph * update link text
2021-09-23Merge remote-tracking branch 'upstream/master' into developJames Young
2021-09-23Meira Refactor (#14566)James Young
* 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
2021-09-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-23[Docs] update Japanese translation of feature_backlight.md (#14403)umi
* update feature_backlight.md translation * update file based on comments
2021-09-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-23[Docs] update Japanese translation of feature_advanced_keycodes.md (#14309)umi
* update feature_advanced_keycodes.md translation * update file based on comments
2021-09-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-23[Docs] update Japanese translation of isp_flashing_guide.md (#13700)umi
* update isp_flashing_guide.md translation * update isp_flashing_guide.md translation * correct url * trim remaining merge identifier
2021-09-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-23[Docs] update Japanese translation of feature_leader_key.md (#13669)umi
* update feature_leader_key.md translation * update file based on comments * update text based on comments
2021-09-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-23[Docs] update Japanese translation of one_shot_keys.md (#13656)umi
* update one_shot_keys.md translation * update one_shot_keys.md translation * correct paramter for function * add change of #13754
2021-09-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-22[Keyboard] Bkf (#14534)drhigsby
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-22Merge remote-tracking branch 'upstream/master' into developJames Young
2021-09-22Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) (#14567)James Young
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) * update keyboards/handwired/slash/rules.mk per fauxpark
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-23[Keyboard] Fix default keymap for Draytronics Elise V2 keyboard (#14562)Drashna Jaelre
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-23[Keyboard] Disable console on Smallkeyboard (#14561)Drashna Jaelre
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] Version 2 of Draytronics Elise Keyboard + ISO Keymap Change (#14253)Blake
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] add kk980 keyboard (#14436)Sets3n
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] Fix jkb65 compile issues (#14554)Drashna Jaelre
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] Fix font file for Ein 60 Keyboard (#14553)Drashna Jaelre
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] Add Dango40 (#14437)Brandon Claveria
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Swiftrax <swiftrax@gmail.com> Co-authored-by: Swiftrax <swiftrax@github.com>
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] Add Free Willy Keyboard (#14394)Caleb Lightfoot
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] 0-Sixty: Splits kb config into base and underglow (#14384)Vinam Arora
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21[Keyboard] Add support for XT8x (#14440)kopibeng
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] fixed one of the unicode drawings of the layout in dz60.h (#14482)milostatsea
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] Add JadooKB JKB65 RGB (#14525)WiZ.GG
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21Changed VENDOR_ID and PRODUCT_ID of Boston keyboard (#14528)Pylon
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] Add commented out OLED/encoder code in default Kyria (#14539)precondition
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] add ein_60 (#14398)James Smith
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-21[Keyboard] smallkeyboard fix of rgb matrix config (#14548)Drashna Jaelre
2021-09-22Merge remote-tracking branch 'origin/master' into developQMK Bot