summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-013-2/+61
|\|
| * [Keyboard] Adding Via support to the GON NerD60 (#13395)AfterThought2021-07-013-2/+61
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-017-0/+605
|\|
| * [Keymap] Add haervig userspace and keymaps (#13362)Jakob Hærvig2021-07-017-0/+605
| |
* | Convert Dip Switch callbacks to boolean functions (#13399)Drashna Jaelre2021-07-0140-75/+117
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-012-18/+18
|\|
| * Changed Yeehaw Default Keymap (#13341)Caleb Lightfoot2021-07-012-18/+18
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-011-15/+11
|\|
| * [Docs] update Japanese translation of other_eclipse.md (#12776)umi2021-07-011-15/+11
| | | | | | | | | | | | | | * update other_eclipse.md translation * update based on comment * update based on comment
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-011-7/+17
|\|
| * update Japanese translation of config_options.md (#12695)umi2021-07-011-7/+17
| | | | | | | | | | | | | | | | | | * update config_options.md translation * update config_options.md translation * update based on comment * update based on comment
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-012-2/+396
|\|
| * Translated 'feature_advanced_keycodes.md'. (#12454)s-show2021-07-011-2/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Translated 'feature_advanced_keycodes.md'. * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/feature_advanced_keycodes.md Co-authored-by: shela <shelaf@users.noreply.github.com> * update based on comment. * update based on comment. Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> * update based on comment. Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> * update based on comment. Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: shela <shelaf@users.noreply.github.com> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
| * [Docs] Japanese translation of docs/keycodes_basic.md (#11044)s-show2021-07-011-0/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'keycodes_basic.md' copied. * Translation completed. * update to "breakpoint_2021_05_29". * Update docs/ja/keycodes_basic.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/keycodes_basic.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/keycodes_basic.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/keycodes_basic.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/keycodes_basic.md Co-authored-by: shela <shelaf@users.noreply.github.com> * update based on comment. * update based on comment. Co-authored-by: shela <shelaf@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-018-17/+19
|\|
| * Illusion Rosa: correct layout macro names (#13387)James Young2021-07-018-17/+19
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-017-136/+135
|\|
| * FJLabs Midway60: physically arrange layout macro and fix info.json data (#13386)James Young2021-07-014-94/+93
| |
| * Sanctified Dystopia: physically arrange layout macro (#13385)James Young2021-07-013-42/+42
| | | | | | Arranges the layout macro and keycodes to resemble the assembled keyboard.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-013-6/+7
|\|
| * Updates for keymap: ut472/stefanopace (#13370)Stefano Pace2021-07-013-6/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-012-4/+12
|\|
| * [Keyboard] update debounce time on kint boards (#13351)Michael Stapelberg2021-07-012-4/+12
| | | | | | | | related to https://github.com/kinx-project/kint/issues/39 related to https://github.com/qmk/qmk_firmware/pull/12626
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-013-36/+68
|\|
| * [Keymap] RGB Timeout added to userspace (#13339)stanrc852021-07-013-36/+68
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-012-0/+2
|\|
| * [Keyboard][Bug] Fix LED indicators on Skeletn87 (#13335)kb-elmo2021-07-012-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0110-0/+426
|\|
| * [Keyboard] Pteron36, open source 3x5_3 supporting layout (#13313)Harshit Goel2021-07-0110-0/+426
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-013-0/+206
|\|
| * [Keymap] Create bingocaller keymap for DZ60RGB-ANSI (#13311)Jesper Nellemann Jakobsen2021-07-013-0/+206
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Drashna's split updates (#13350)Drashna Jaelre2021-07-0154-1829/+1899
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0110-0/+400
|\|
| * [Keyboard] Added flygone60 rev3 (#13280)Shandon Anderson2021-07-0110-0/+400
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-015-7/+11
|\|
| * [Keyboard] mb44 - Update info.json and encoder (#13244)melonbred2021-07-015-7/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0157-1027/+1027
|\|
| * Cleanup junk chars, part 4 (#13345)Ryan2021-07-0157-1027/+1027
| |
* | Remove `API_SYSEX_ENABLE`s from rules.mk (#13389)Ryan2021-06-3066-71/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0111-22/+22
|\|
| * [Update] Change Original TAGs of Japanese translations (#13396)Takeshi ISHII2021-07-0111-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated docs/ja/how_a_matrix_works.md original tag. * Updated docs/ja/api_overview.md original tag. * Updated docs/ja/contributing.md original tag * Updated docs/ja/coding_conventions_c.md original tag * Updated docs/ja/reference_configurator_support.md original tag * Updated docs/ja/reference_glossary.md original tag * Updated docs/ja/api_docs.md original tag * Updated docs/ja/feature_stenography.md original tag * Updated docs/ja/documentation_templates.md original tag * Updated docs/ja/faq_keymap.md original tag * Updated docs/ja/understanding_qmk.md original tag
* | Adds support for STM32L412xB, STM32L422xB. (#13383)Nick Brassel2021-06-3011-3/+467
| | | | | | | | | | | | | | * Adds support for STM32L412xB, STM32L422xB. * Add to list of supported MCUs. * Disable SPI1 by default.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-294-54/+117
|\|
| * Ergocheap handwired Layout Macro refactor (#13348)James Young2021-06-294-54/+117
| | | | | | | | | | | | | | * physically arrange layout macro Arranges the layout macro and keycodes to resemble the assembled keyboard. * update info.json data
* | add kinT kinesis keyboard controller (kint41 variant) (#13333)Michael Stapelberg2021-06-308-0/+322
| | | | | | fixes https://github.com/kinx-project/kint/issues/5
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-291-1/+1
|\|
| * Update lazydesigners/the40/the40.h (#13354)jackytrabbit2021-06-301-1/+1
| | | | | | Fix error in the40.h
* | Relocate RGB/HSV color defs to a more fitting place (#13377)Ryan2021-06-294-87/+101
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-293-5/+8
|\|
| * Jabberwocky quick fixes (#13369)nopunin10did2021-06-293-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cleaning up * deleting to undelete * Stub out defaults * Jabberwocky firmware WIP * Stubbing out keymap spacing * Default keymap and layout updates * start stubbing out JSON for configurator * more WIP * Update jabberwocky.h * Add Readme * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Fix layout capitalization * Updates to personal and default keymaps * Add instructions for jumping the bootloader * Update keyboards/nopunin10did/jabberwocky/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Add easier ctrl-alt-del to my keymap * Undo changes from other master * Add back DYNAMIC_KEYMAP_LAYER_COUNT constant * Fix readme markup to use list items * Give my layout VIA compatibility Co-authored-by: Rossman360 <rmontsinger@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>