summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Patch for develop branch merge conflictsJames Young2021-09-242-10/+10
| | | | | | | | Fixes bugs introduced by 675c5a5e12f5c5efe59a0d0b30b17a41a398c74e.
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-09-24119-488/+3692
|\|
| * [Keyboard] refactor signum30 (#14527)Stan Gurenkov2021-09-2422-62/+345
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Stan Gurenkov <stan.gurenkov@docusign.com>
| * Alf X2 Refactor (#14572)James Young2021-09-248-174/+228
| |
| * Swift65 Solder Refactor (#14579)James Young2021-09-247-21/+287
| |
| * [Keyboard] add 2 keys in jkb65 keymap (#14576)WiZ.GG2021-09-243-5/+5
| |
| * [Keyboard] Create the battleship gamepad keyboard. (#14551)Andrew Braini2021-09-2410-0/+475
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add Potato65 Solderable PCB (#14047)Aeonstrife2021-09-2411-0/+350
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] PLX info.json update (#14536)Nick Abe2021-09-245-14/+78
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add Rotor Keyboard (#14407)Nick Abe2021-09-2413-0/+337
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rotor keyboard * readme image * info.json update * Update readme.md * Update keyboards/rotor/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/rotor/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Docs] Broken FAQ hyperlink (#14578)clickclackwho2021-09-241-1/+1
| |
| * [Keyboard] Added A. Dux keyboard configurations (#14320)Albert Engelbrecht2021-09-2413-0/+768
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add phrygian design ph100 (#13738)phrygiandesign2021-09-249-0/+387
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add sam/sg81m layout (#13432)ryanbughuang2021-09-232-2/+107
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
| * [Keyboard] Disable console on Sofle for size concerns (#14577)Albert Y2021-09-231-1/+1
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
| * [Docs] update Japanese translation of pr_checklist.md (#13693)umi2021-09-242-4/+15
| | | | | | | | | | | | | | | | | | | | | | * update pr_checklist.md translation * update file based on comments * add id on feature_led_indicators.md and update text based on comments * update file based on comments * update file based on comment
| * kk980 - Fix Configurator rendering (#14556)Sets3n2021-09-231-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add kk980 * fix * fix config.h * Modified readme.md * fix * Modified format. * Modified image. * Modified rules.mk * Modified rules.mk + # * fix info.json: keys dislocation
| * [Keyboard] Update default keymaps for OLKB boards (#14565)Drashna Jaelre2021-09-234-15/+42
| |
| * AMJ96 Refactor (#14571)James Young2021-09-238-127/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * clean up amj96.h - use #pragma once include guard - remove extra comments - update matrix position alignment (easier readability) * info.json: apply human-friendly formatting * rename LAYOUT to LAYOUT_all * clean up rules.mk Align to QMK's AVR template. * clean up default keymap - use four-space indent - add RESET keycode (Fn+R) - remove unnecessary functions * clean up config.h - use #pragma once include guard - move lighting settings to the middle of the file (QMK template conformance) - remove Magic and MIDI configuration blocks * update readme.md file - update keyboard info list - add flashing instructions - update Docs links - remove trailing spaces * remove "empty" config.h and readme.md from default keymap
* | [Keyboard] Add Adelais PCB. Adelais RGB rev.3, Adelais rev. 4 APM32F103, ↵mechlovin2021-09-2444-66/+1190
| | | | | | | | | | | | Adelais AVR rev. 1 (#14252) 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-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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:07:37 +0000