Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 7 | -136/+135 | |
|\| | ||||||
| * | FJLabs Midway60: physically arrange layout macro and fix info.json data (#13386) | James Young | 2021-07-01 | 4 | -94/+93 | |
| | | ||||||
| * | Sanctified Dystopia: physically arrange layout macro (#13385) | James Young | 2021-07-01 | 3 | -42/+42 | |
| | | | | | | Arranges the layout macro and keycodes to resemble the assembled keyboard. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 3 | -6/+7 | |
|\| | ||||||
| * | Updates for keymap: ut472/stefanopace (#13370) | Stefano Pace | 2021-07-01 | 3 | -6/+7 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 2 | -4/+12 | |
|\| | ||||||
| * | [Keyboard] update debounce time on kint boards (#13351) | Michael Stapelberg | 2021-07-01 | 2 | -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 develop | QMK Bot | 2021-07-01 | 3 | -36/+68 | |
|\| | ||||||
| * | [Keymap] RGB Timeout added to userspace (#13339) | stanrc85 | 2021-07-01 | 3 | -36/+68 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 2 | -0/+2 | |
|\| | ||||||
| * | [Keyboard][Bug] Fix LED indicators on Skeletn87 (#13335) | kb-elmo | 2021-07-01 | 2 | -0/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 10 | -0/+426 | |
|\| | ||||||
| * | [Keyboard] Pteron36, open source 3x5_3 supporting layout (#13313) | Harshit Goel | 2021-07-01 | 10 | -0/+426 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 3 | -0/+206 | |
|\| | ||||||
| * | [Keymap] Create bingocaller keymap for DZ60RGB-ANSI (#13311) | Jesper Nellemann Jakobsen | 2021-07-01 | 3 | -0/+206 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Drashna's split updates (#13350) | Drashna Jaelre | 2021-07-01 | 54 | -1829/+1899 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 10 | -0/+400 | |
|\| | ||||||
| * | [Keyboard] Added flygone60 rev3 (#13280) | Shandon Anderson | 2021-07-01 | 10 | -0/+400 | |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 5 | -7/+11 | |
|\| | ||||||
| * | [Keyboard] mb44 - Update info.json and encoder (#13244) | melonbred | 2021-07-01 | 5 | -7/+11 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 57 | -1027/+1027 | |
|\| | ||||||
| * | Cleanup junk chars, part 4 (#13345) | Ryan | 2021-07-01 | 57 | -1027/+1027 | |
| | | ||||||
* | | Remove `API_SYSEX_ENABLE`s from rules.mk (#13389) | Ryan | 2021-06-30 | 66 | -71/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-07-01 | 11 | -22/+22 | |
|\| | ||||||
| * | [Update] Change Original TAGs of Japanese translations (#13396) | Takeshi ISHII | 2021-07-01 | 11 | -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 Brassel | 2021-06-30 | 11 | -3/+467 | |
| | | | | | | | | | | | | | | * Adds support for STM32L412xB, STM32L422xB. * Add to list of supported MCUs. * Disable SPI1 by default. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-29 | 4 | -54/+117 | |
|\| | ||||||
| * | Ergocheap handwired Layout Macro refactor (#13348) | James Young | 2021-06-29 | 4 | -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 Stapelberg | 2021-06-30 | 8 | -0/+322 | |
| | | | | | | fixes https://github.com/kinx-project/kint/issues/5 | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-29 | 1 | -1/+1 | |
|\| | ||||||
| * | Update lazydesigners/the40/the40.h (#13354) | jackytrabbit | 2021-06-30 | 1 | -1/+1 | |
| | | | | | | Fix error in the40.h | |||||
* | | Relocate RGB/HSV color defs to a more fitting place (#13377) | Ryan | 2021-06-29 | 4 | -87/+101 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-29 | 3 | -5/+8 | |
|\| | ||||||
| * | Jabberwocky quick fixes (#13369) | nopunin10did | 2021-06-29 | 3 | -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> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-29 | 6 | -0/+304 | |
|\| | ||||||
| * | [Keyboard] Add Quefrency Rev. 4 (#13368) | Danny | 2021-06-28 | 6 | -0/+304 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-29 | 4 | -4/+8 | |
|\| | ||||||
| * | [Keyboard] fix encoder void to bool (#13334) | Xelus22 | 2021-06-28 | 4 | -4/+8 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-29 | 3 | -28/+28 | |
|\| | ||||||
| * | Swiftrax Nodu handwired: layout macro sequence fix (#13329) | James Young | 2021-06-28 | 3 | -28/+28 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-29 | 1 | -1/+1 | |
|\| | ||||||
| * | [Bug] Missing empty line at the end of file (#13374) | Xelus22 | 2021-06-29 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-28 | 4 | -47/+133 | |
|\| | ||||||
| * | FJLabs BKS65 Solder Layout Macro Refactor (#13347) | James Young | 2021-06-28 | 4 | -47/+133 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * grid align layout macro and keymaps * physically arrange layout macro, phase 1 * physically arrange layout macro, phase 2 * replace KC_PAUSE with KC_PAUS Makes the grid alignment nice. :) * rename LAYOUT_65_ansi to LAYOUT_all The included layout macro isn't actually correct for QMK's 65% ANSI community layout. * add an actual LAYOUT_65_ansi This is a semi-educated guess as to this macro; it may be wrong. | |||||
* | | Move RGBLight code into its own folder (#13312) | Ryan | 2021-06-28 | 9 | -23/+16 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-27 | 1 | -0/+1 | |
|\| | ||||||
| * | Doctor: print CLI version (#13356) | Ryan | 2021-06-27 | 1 | -0/+1 | |
| | | ||||||
* | | Fix building layouts from JSON (#13310) | Joakim Tufvegren | 2021-06-27 | 1 | -2/+3 | |
| | | | | | | Broken by #12632. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-06-26 | 9 | -152/+415 | |
|\| | ||||||
| * | Exent cleanup (#13353) | Ryan | 2021-06-27 | 9 | -152/+415 | |
| | |