summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-051-0/+22
|\
| * Add clarification for licensing. (#14704)Nick Brassel2021-10-051-0/+22
| | | | | | | | | | * Add clarification for licensing. * Errr, v2.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-041-0/+74
|\|
| * Document examples on intercepting Mod-Tap (#14502)Albert Y2021-10-041-0/+74
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: filterpaper <filterpaper@localhost>
* | Add LM() keys to the list of keys disabled by NO_HAPTIC_MOD (#14181)Purdea Andrei2021-10-031-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-012-7/+12
|\|
| * [Docs] update Japanese translation of mod_tap.md (#13981)umi2021-10-012-7/+12
| | | | | | | | | | * update mod_tap.md translation * add id on config_options.md and update text based on comments
* | Change `MK66F18` -> `MK66FX1M0` (#14659)Ryan2021-09-301-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-301-2/+8
|\|
| * Fix documentation for NO_HAPTIC_MOD and NO_HAPTIC_FN features. (#14180)Purdea Andrei2021-10-011-2/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-291-0/+2
|\|
| * [Core] Fix "6kro enable" and clarify naming (#14563)Drashna Jaelre2021-09-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | * Fix USB_6KRO_ENABLE compilation errors * Add info to docs * Rename define to be more accurate * Remove unused rule * Refixe docs
* | Initial pass of F405 support (#14584)Joel Challis2021-09-252-0/+2
| | | | | | | | | | | | | | | | | | * Initial pass of F405 support * remove some conf files * docs * clang
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-09-243-5/+16
|\|
| * [Docs] Broken FAQ hyperlink (#14578)clickclackwho2021-09-241-1/+1
| |
| * [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
* | 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-213-6/+6
|\|
| * [Docs] update suspend_*_user examples (#14542)Dasky2021-09-213-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-212-2/+2
|\|
| * [Docs] Modify encoder_update_user example to return false (#14541)Dasky2021-09-212-2/+2
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-203-11/+4
|\|
| * Doc Fixes & Custom Matrix Fix (#14526)XScorpion22021-09-201-2/+2
| |
| * [Docs] fix wrong directory for RGB Matrix animations (#14494)David Xia2021-09-192-9/+2
| |
* | New CLI subcommand to create clang-compatible compilation database ↵Bao2021-09-161-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (`compile_commands.json`) (#14370) * pulled source from dev branch * missed a file from origin * formatting * revised argument names. relaxed matching rules to work for avr too * add docstrings * added docs. tightened up regex * remove unused imports * cleaning up command file. use existing qmk dir constant * rename parser library file * move lib functions into command file. there are only 2 and they aren't large * currently debugging... * more robustly find config * updated docs * remove unused imports * reuse make executable from the main make command * pulled source from dev branch * missed a file from origin * formatting * revised argument names. relaxed matching rules to work for avr too * add docstrings * added docs. tightened up regex * remove unused imports * cleaning up command file. use existing qmk dir constant * rename parser library file * move lib functions into command file. there are only 2 and they aren't large * currently debugging... * more robustly find config * updated docs * remove unused imports * reuse make executable from the main make command * remove MAKEFLAGS from environment for better control over process management * Update .gitignore Co-authored-by: Michael Forster <forster@google.com> * add a usage line to docs * doc change as suggested Co-authored-by: Nick Brassel <nick@tzarc.org> * rename command * remove debug print statements * generate-compilation-database: fix arg handling * generate-comilation-db: improve error handling * use cli.run() instead of Popen() Co-authored-by: Xton <cdewan@apple.com> Co-authored-by: Christon DeWan <cmdpix@mac.com> Co-authored-by: Michael Forster <forster@google.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-152-8/+13
|\|
| * [Docs] add sync options heading, update led indicators (#14441)Dasky2021-09-152-8/+13
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Add Support for USB programmable buttons (#12950)Thomas Weißschuh2021-09-153-0/+115
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-151-1/+1
|\|
| * [Docs] fixed incorrect amount of steps for oled usage (#13519)vsrivastava2021-09-141-1/+1
| | | | | | | | | | changed line 21 from saying "three steps" to "two steps" as there are only two steps Co-authored-by: feynmantf <46390109+feynmantf@users.noreply.github.com>
* | [Docs] Clean up some code block languages (#14434)Ryan2021-09-1425-61/+61
| |
* | Move Bluetooth config to common_features.mk (#14404)Ryan2021-09-121-9/+10
| | | | | | | | | | | | | | | | | | * Move Bluetooth config to common_features.mk * Update common_features.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Align ChibiOS I2C defs with other drivers (#14399)Joel Challis2021-09-122-17/+11
| | | | | | | | | | | | | | | | | | * Align ChibiOS I2C defs with other drivers * Update keyboards/xelus/valor_frl_tkl/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-121-2/+2
|\|
| * update compatible_microcontrollers.md translation (#14401)umi2021-09-121-2/+2
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-122-16/+4
|\|
| * Remove width, height and key_count from info.json (#14274)Ryan2021-09-122-16/+4
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-105-36/+36
|\|
| * Change USBasp and bootloadHID bootloaders to lowercase (#14354)Ryan2021-09-105-36/+36
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-102-60/+60
|\|
| * Align rgb/led matrix docs with current behaviour (#14367)Joel Challis2021-09-102-60/+60
| |