summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-236-39/+41
|\
| * Wuque Mammoth20x Layout Macro Refactor (#14568)James Young2021-09-236-39/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-09-2310-272/+331
|\|
| * Meira Refactor (#14566)James Young2021-09-2310-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 developQMK Bot2021-09-231-22/+25
|\|
| * [Docs] update Japanese translation of feature_backlight.md (#14403)umi2021-09-231-22/+25
| | | | | | | | | | * update feature_backlight.md translation * update file based on comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-231-20/+23
|\|
| * [Docs] update Japanese translation of feature_advanced_keycodes.md (#14309)umi2021-09-231-20/+23
| | | | | | | | | | * update feature_advanced_keycodes.md translation * update file based on comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-231-6/+16
|\|
| * [Docs] update Japanese translation of isp_flashing_guide.md (#13700)umi2021-09-231-6/+16
| | | | | | | | | | | | | | | | | | * update isp_flashing_guide.md translation * update isp_flashing_guide.md translation * correct url * trim remaining merge identifier
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-231-2/+15
|\|
| * [Docs] update Japanese translation of feature_leader_key.md (#13669)umi2021-09-231-2/+15
| | | | | | | | | | | | | | * update feature_leader_key.md translation * update file based on comments * update text based on comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-231-4/+7
|\|
| * [Docs] update Japanese translation of one_shot_keys.md (#13656)umi2021-09-231-4/+7
| | | | | | | | | | | | | | | | | | * update one_shot_keys.md translation * update one_shot_keys.md translation * correct paramter for function * add change of #13754
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-238-0/+251
|\|
| * [Keyboard] Bkf (#14534)drhigsby2021-09-228-0/+251
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-09-226-8/+1
|\|
| * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) (#14567)James Young2021-09-227-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 developQMK Bot2021-09-221-2/+2
|\|
| * [Keyboard] Fix default keymap for Draytronics Elise V2 keyboard (#14562)Drashna Jaelre2021-09-231-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-2/+2
|\|
| * [Keyboard] Disable console on Smallkeyboard (#14561)Drashna Jaelre2021-09-231-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2210-9/+1120
|\|
| * [Keyboard] Version 2 of Draytronics Elise Keyboard + ISO Keymap Change (#14253)Blake2021-09-2110-9/+1120
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-229-0/+505
|\|
| * [Keyboard] add kk980 keyboard (#14436)Sets3n2021-09-219-0/+505
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-225-137/+79
|\|
| * [Keyboard] Fix jkb65 compile issues (#14554)Drashna Jaelre2021-09-215-137/+79
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-1/+1
|\|
| * [Keyboard] Fix font file for Ein 60 Keyboard (#14553)Drashna Jaelre2021-09-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-229-0/+502
|\|
| * [Keyboard] Add Dango40 (#14437)Brandon Claveria2021-09-219-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 developQMK Bot2021-09-2212-0/+368
|\|
| * [Keyboard] Add Free Willy Keyboard (#14394)Caleb Lightfoot2021-09-2112-0/+368
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2214-0/+551
|\|
| * [Keyboard] 0-Sixty: Splits kb config into base and underglow (#14384)Vinam Arora2021-09-214-0/+84
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Add support for XT8x (#14440)kopibeng2021-09-2110-0/+467
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-2/+2
|\|
| * [Keyboard] fixed one of the unicode drawings of the layout in dz60.h (#14482)milostatsea2021-09-211-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2211-2/+379
|\|
| * [Keyboard] Add JadooKB JKB65 RGB (#14525)WiZ.GG2021-09-2110-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)Pylon2021-09-211-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-0/+97
|\|
| * [Keyboard] Add commented out OLED/encoder code in default Kyria (#14539)precondition2021-09-211-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 developQMK Bot2021-09-2216-0/+1182
|\|
| * [Keyboard] add ein_60 (#14398)James Smith2021-09-2116-0/+1182
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-221-28/+28
|\|
| * [Keyboard] smallkeyboard fix of rgb matrix config (#14548)Drashna Jaelre2021-09-211-28/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-2215-22/+298
|\|
| * [Keyboard] Addition of VIA keymap and a few fixes for naked48 (#14177)Salicylic-acid32021-09-2115-22/+298
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 08:51:45 +0000