summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-181-3/+5
|\
| * preonic/rev3_drop: Fix old custom matrix code (#14857)Sergey Vlasov2021-10-181-3/+5
| | | | | | | | | | | | | | | | | | | | The old custom matrix code for Preonic rev3 was relying on the `matrix_col_t` type, because the code actually reads the row pins and assembles the state for whole columns, and then transposes the matrix in the custom debouncing code. Restore that type (which is no longer defined by the core QMK code) to make the custom matrix code work properly (when `matrix_row_t` was used instead of `matrix_col_t`, the state of two electrical rows was lost, and those electrical rows corresponded to the bottom physical row, which did not work).
* | Remove legacy Makefile functionality (#14858)Joel Challis2021-10-181-29/+0
| |
* | Infer more when building features (#13890)Joel Challis2021-10-174-83/+50
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-172-7/+7
|\|
| * [Keymap] added media controls, copy and paste; moved print screen (#14850)Roger2021-10-162-7/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-177-0/+202
|\|
| * [Keyboard] Add SpiderIsland 25 key keyboard (#14793)​Andrzej Ressel2021-10-167-0/+202
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1714-130/+217
|\|
| * [Keyboard] Update Support for The Uni (#14569)Peter Park2021-10-1614-130/+217
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-161-2/+2
|\|
| * Try to clarify "number of elements in info.json does not match" error (#14844)Ryan2021-10-161-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-161-3/+3
|\|
| * [Keyboard] Fix minor typo in Ploopy Trackball Nano Docs (#14717)tangowithfoxtrot2021-10-161-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-161-0/+34
|\|
| * add docs/ja/ja_doc_status.sh (#14402)Takeshi ISHII2021-10-161-0/+34
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-161-4/+4
|\|
| * [Keyboard] Amended Some Pins - KiwiKeebs Macro V2 (#14824)AKiwi922021-10-151-4/+4
| | | | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ash <ash@splitpixel.co.uk>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1618-0/+648
|\|
| * [Keyboard] Adding CK60 and CK65 (#14737)hadi2021-10-1518-0/+648
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1654-463/+617
|\|
| * [Keymap] Update Miryoku (#14827)Manna Harbour2021-10-1554-463/+617
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-10-1519-1049/+1032
|\|
| * [Keymap] Drashna Keymap Updates (#14842)Drashna Jaelre2021-10-1519-1049/+1031
| | | | | | | | | | | | | | * Fix issues with user split transport code * Improve OLED (More font stuff, improved keylogger, etc) * Add `KEYLOCK` macro to disable USB, borrowed from command feature. * Convert Kyria fully to proton C (no more AVR kyria) * Add Work Louder Work Board keymap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1610-8/+101
|\|
| * [Keyboard] Tractyl Manuform Updates (#14841)Drashna Jaelre2021-10-1510-8/+101
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-10-152-50/+73
|\|
| * [Keymap] Added GMMK Pro keymap with RGB (#14648)BenSchaeff2021-10-152-0/+146
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1633-19/+1503
|\|
| * [Keymap] zigotica userspace (#14670)Sergi Meseguer2021-10-1525-19/+1057
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] add Pluckey (#14672)floookay2021-10-158-0/+446
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-162-2/+3
|\|
| * [Keymap] Userspace updates (#14832)stanrc852021-10-152-2/+3
| |
* | Further tidy up of STM32 eeprom emulation (#14591)Joel Challis2021-10-163-38/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-161-1/+1
|\|
| * Update documentation because GPIO functions are no longer in quantum.h (#14826)Aaron Paterson2021-10-161-1/+1
| | | | | | | | | | | | | | | | | | * GPIO functions are no longer in quantum.h * Update docs/internals_gpio_control.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Enable CLI flashing via mdloader (#14729)Joel Challis2021-10-153-6/+21
| | | | | | | | | | | | | | * Enable CLI flashing via mdloader * remove flag * Update qmk flash help
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-10-1421-141/+934
|\|
| * [Keyboard] Add MK61-RGB-ANSI keyboard (#14795)Felix Jen2021-10-149-0/+381
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Docs] Clean up reference_info_json.md (#14806)Ryan2021-10-151-43/+51
| |
| * [Keymap] Add keebio iris layout beakl 15 (#14762)Tom2021-10-144-0/+231
| |
| * remove Bracket Pair Colorizer recommendation (#14816)Alex Meyer2021-10-151-2/+1
| | | | | | | | As of v1.60, vscode has a much faster built-in method of colorizing bracket pairs, making the extension unnecessary. https://code.visualstudio.com/blogs/2021/09/29/bracket-pair-colorization
| * [Keyboard] PLX Refactor (#14809)James Young2021-10-146-75/+315
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-149-0/+851
|\|
| * [Keyboard] Add ginkgo65 (#14802)rhmokey2021-10-149-0/+851
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-1415-49/+61
|\|
| * Documentation: Updated KBDFans readmes (#14725)MechMerlin2021-10-1415-49/+61
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-141-1/+13
|\|
| * [Keymap] Display default layer name (#14819)Reibl János Dániel2021-10-141-1/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-141-3/+3
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 03:31:39 +0000