summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-162-0/+4
|\
| * Top level heading for common config (LED Matrix) (#13153)Brian Low2021-06-151-0/+2
| |
| * Top level heading for common config (RGB Matrix) (#13120)Brian Low2021-06-151-0/+2
| | | | | | | | | | | | | | * Top level heading for common config Prior to this, the some of the common config looks like a detail of the APA102 driver * Change heading to Common Config (RGB Matrix)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-163-0/+171
|\|
| * [Keymap] Keebio Iris rev4 - keymap with dual encoder support (#13063)R2021-06-153-0/+171
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | core: make RESET key work with Teensy 4.x (#13076)Michael Stapelberg2021-06-151-1/+1
| | | | | | related to https://github.com/kinx-project/kint/issues/5
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-163-1/+7
|\|
| * Change Lufa-MS size (#13183)kb-elmo2021-06-153-1/+7
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-163-10/+23
|\|
| * Make atmel-dfu and chibios-dfu flashing behave more like caterina flashing. ↵Purdea Andrei2021-06-163-10/+23
| | | | | | | | | | | | | | | | (#12552) This commit makes atmel-dfu and chibios-dfu bootloaders retry to detect the bootloader every 0,5 seconds (now configurable via the BOOTLOADER_RETRY_TIME makefile variable), and a period is printed after every try. This is a much more pleasant behaviour than the 5s retry timeout.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-1614-0/+559
|\|
| * [Keyboard] suv (#12957)AlisGraveNil2021-06-157-0/+288
| |
| * [Keyboard] hatchback (#12958)AlisGraveNil2021-06-157-0/+271
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-163-3/+49
|\|
| * [Keyboard] Add via support for the Leopold FC980C (#12860)John Graham2021-06-153-3/+49
| |
* | Limit saturation for RGB_MATRIX_JELLYBEAN_RAINDROPS (#12669)Albert Y2021-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | * Set saturation limit to jellybean_raindrops_anim.h * Use faster bit-shift maths and qadd8 * Remove extra parenthesis * Single bitmask operation is sufficient. Co-authored-by: filterpaper <filterpaper@localhost>
* | Add asym_eager_defer_pk debounce type (#12689)Simon Arlott2021-06-165-3/+554
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-162-0/+42
|\|
| * [Keymap] ANAVI Macro Pad 2 add Skype keymap (#12664)Leon Anavi2021-06-152-0/+42
| | | | | | | | | | | | | | | | | | This keymap for ANAVI Macro Pad 2 contains a couple of Skype shortcuts for MS Windows and GNU/Linux distributions: - Ctrl+M: Mute/unmute microphone - Ctrl+Shift+K: Start/stop camera Signed-off-by: Leon Anavi <leon@anavi.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-164-0/+148
|\|
| * [Keymap] add new keymap for pteron (#12474)Fidel Coria2021-06-154-0/+148
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-161-1/+1
|\|
| * [Docs] Update one_shot_keys.md (#12291)Thomas Museus Dabay2021-06-151-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-163-9/+99
|\|
| * [Keyboard] Add 'LAYOUT_65_ansi_split_bs_2_right_mods' support to KBDfans ↵Andy Freeland2021-06-153-9/+99
| | | | | | | | KBD67 rev2 (#12053)
* | [Keyboard] Moved tokyo60/ into tokyokeyboard/tokyo60/. (#12023)James2021-06-1512-4/+4
| | | | | | | | | | | | | | * Moved tokyo60/ into tokyokeyboard/tokyo60/. * Updated make instruction, fixed broken image link * Fixed still broken image link.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-1510-0/+258
|\|
| * add tender/macrowo_pad (#12786)Brandon Claveria2021-06-1610-0/+258
| | | | | | | | | | | | | | * add tender/macrowo_pad * add another layer for via keymap Co-authored-by: Swiftrax <swiftrax@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-151-3/+1
|\|
| * [Keymap] Update readme for ploopy nano keymap (#12733)Dustin Bosveld2021-06-141-3/+1
| | | | | | | | The readme from the Ploopy Mini was accidentally put as the Ploopy Nano readme. The Ploopy Nano does not ship with VIA by default.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-147-41/+50
|\|
| * Ensure that safe_commands always run (#13199)Zach White2021-06-147-41/+50
| | | | | | | | | | * ensure that safe_commands always run * import the config subcommand in bin/qmk
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-141-5/+23
|\|
| * [Docs] Update Japanese newbs_learn_more_resources.md (#12839)shela2021-06-141-5/+23
| | | | | | | | | | * Update Japanese newbs_learn_more_resources.md document. * Slightly modded
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-141-0/+1
|\|
| * [Docs] Update feature_split_keyboard.md (#13205)Markus Knutsson2021-06-131-0/+1
| |
* | Fix LED mapping for GMMK Pro (#13189)Gigahawk2021-06-141-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-141-1/+2
|\|
| * vscode: specify yapf as the formatting provider (#13206)Zach White2021-06-131-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-121-3/+7
|\|
| * [Docs] update Japanese translation of feature_pointing_device.md (#12753)umi2021-06-131-3/+7
| | | | | | | | | | * update feature_pointing_device.md translation * update based on comment
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-121-10/+16
|\|
| * [Docs] Update Japanese newbs_flashing.md (#12837)shela2021-06-131-10/+16
| | | | | | | | | | | | | | * Update Japanese newbs_flashing.md document. * Slightly modded * Apply suggestions from code review
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-121-15/+7
|\|
| * Update Japanese newbs.md document. (#12835)shela2021-06-131-15/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-122-0/+124
|\|
| * [Docs] Japanese translation of docs/data_driven_config.md (#12066)Takeshi ISHII2021-06-132-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add docs/ja/data_driven_config.md * Update docs/ja/data_driven_config.md Co-authored-by: s-show <s1shimz@gmail.com> * Update docs/ja/data_driven_config.md Co-authored-by: s-show <s1shimz@gmail.com> * Update docs/ja/data_driven_config.md Co-authored-by: s-show <s1shimz@gmail.com> * Update docs/ja/data_driven_config.md Co-authored-by: s-show <s1shimz@gmail.com> * Update docs/ja/data_driven_config.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/data_driven_config.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/data_driven_config.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/data_driven_config.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/data_driven_config.md * Update docs/ja/data_driven_config.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/data_driven_config.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/data_driven_config.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/data_driven_config.md Co-authored-by: shela <shelaf@users.noreply.github.com> Co-authored-by: s-show <s1shimz@gmail.com> Co-authored-by: shela <shelaf@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-1126-24/+1008
|\|
| * Add Matrix 8XV1.2 OG rev1 PCB (#11614)kb-elmo2021-06-1126-24/+1008
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add v1 12og pcb * update * matrix changes for testing * Update matrix.c * finalized files * rename board versions * update readmes * typo in readme * fix board filenames * Update keyboards/matrix/m12og/rev1/rev1.c Co-authored-by: Drashna Jaelre <drashna@live.com> * change function * update halconf and chconf * merge master * Update readme.md * Update readme.md * Update readme.md Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-1038-0/+1940
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 08:54:25 +0000