summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into developfauxpark2021-07-0341-556/+2283
|\
| * Add "Ctrl+C to cancel" to "waiting for bootloader" messages (#13424)Ryan2021-07-032-3/+3
| |
| * [Keymap] Think6.5v2 keymap with working caps-lock indicator (#12709)Qiaowei Tang (Joel)2021-07-022-0/+241
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keymap] Update personal keymaps, add Corne keymap, and update non-kc LAYOUT ↵David Rambo2021-07-0212-129/+593
| | | | | | | | | | | | for Iris (#12273) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add FnRow v1 keyboard by dinofizz (#11817)Dino Fizzotti2021-07-0213-0/+400
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Dino Fizzotti <dinofizz@pop-os.localdomain>
| * added 0xCB Static (#13047)Conor Burns2021-07-0210-0/+955
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * correct info.json data (#13409)James Young2021-07-021-424/+89
| |
| * add maintainer value to info.json (#13411)James Young2021-07-021-1/+1
| | | | | | Configurator isn't using the data in this file, and I think this may be why...
* | [Keyboard] Relocalize and Update p1800fl (#12425)team01102021-07-0212-56/+103
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: marhalloweenvt <marhalloweenvt@gmail.com> Co-authored-by: Drashna Jael're <drashna@live.com>
* | [Keyboard] manyboard macro (#11896)William Ehman2021-07-029-0/+314
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Switch split_common to CRC subsystem (#13418)Stefan Kerkmann2021-07-021-16/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-026-24/+19
|\|
| * Fix up recent checkerboards additions (#13414)Joel Challis2021-07-026-24/+19
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-021-1/+1
|\|
| * [Bug] fix Dystopia.h comma (#13413)Xelus222021-07-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-024-40/+47
|\|
| * Cleanup gitignore (#13390)Ryan2021-07-024-40/+47
| |
* | Add rgblight to RGB Matrix VPATH (#13371)Ryan2021-07-021-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0224-0/+851
|\|
| * add support for Axon40 and G_IDB60 (#13075)npspears2021-07-0224-0/+851
| | | | | | | | | | | | | | | | | | * add support for Axon40 * add support for G_IDB60 * added bootloader reset instructions * added bootloader reset instructions
* | [Core] Unite half-duplex and full-duplex serial drivers (#13081)Stefan Kerkmann2021-07-027-385/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Unite half-duplex and full-duplex serial driver. * Add full duplex operation mode to the interrupt based driver * Delete DMA UART based full duplex driver * The new driver targets #11930 * Fix freezes with failing transactions in half-duplex * Increase default serial TX/RX buffer size to 128 bytes * Correctly use bool instead of size_t Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-011-355/+822
|\|
| * Add missing Quefrency layouts for QMK Configurator (#13384)Danny2021-07-011-355/+822
| | | | | | | | | | * Reformat info.json using Prettier * Add missing layouts needed for QMK Configurators
* | 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
| |