summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2615-0/+465
|\|
| * [Keyboard] add support for Phoenix45_Ortho PCB (#14798)npspears2021-10-2615-0/+465
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-262-0/+34
|\|
| * [Keymap] Add via keymap for meishi2 (#14892)MakotoKurauchi2021-10-262-0/+34
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-261-13/+12
|\|
| * Update mcu_selection.mk with current ChibiOS path (#14909)MasterSpoon2021-10-261-13/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-261-0/+58
|\|
| * [Keymap] Adding a new keymap for bm60poker and some led configs (#14918)David Martinz2021-10-261-0/+58
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2621-0/+1242
|\|
| * [Keyboard] Add Mammoth75x (#14925)GG2021-10-2621-0/+1242
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2621-0/+1082
|\|
| * [Keyboard] Add zoom65 (#14926)GG2021-10-2621-0/+1082
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2631-35/+4
|\|
| * Remove unused KEYBOARD_LOCK_ENABLE from rules (#14920)Drashna Jaelre2021-10-2531-35/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-251-0/+2
|\|
| * [Keyboard] temporary fix for SpiderIsland 78 (#14935) (#14941)Lucas Rodrigues2021-10-251-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-241-1/+1
|\|
| * Fix Typo in documentation (#14942)coliss862021-10-241-1/+1
| |
* | Begin to carve out platform/protocol API - Migrate keyboard_* calls (#14888)Joel Challis2021-10-245-35/+27
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-244-3355/+461
|\|
| * Tidy up ADNS9800 and PMW3360 firmware blobs (#14936)Ryan2021-10-244-3355/+461
| |
* | Align usbasp flashing behaviour (#14928)Joel Challis2021-10-241-0/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-231-1/+35
|\|
| * [Keymap] Add logo to riblee userspace (#14875)Reibl János Dániel2021-10-231-1/+35
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-231-0/+6
|\|
| * [Docs] Add default case to tap dance example 5. (#14893)ForsakenRei2021-10-221-0/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-236-0/+176
|\|
| * [Keymap] Add Gergoplex keymap (#14768)George Petri2021-10-226-0/+176
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-232-6/+12
|\|
| * [Keymap] Simplify unicode input mode change and CTRL and GUI swapping (#14874)Reibl János Dániel2021-10-222-6/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-231-11/+11
|\|
| * Reformat iris keymap antonlindstrom to be a bit more readable and consistent ↵Ingomancer2021-10-231-11/+11
| | | | | | | | | | (#14902) Co-authored-by: Ingo Junefjord <ingo.junefjord@attentec.se>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2316-37/+105
|\|
| * [Keymap] Jonavin userspace keymap updates INVERT_NUMLOCK_INDICATOR (#14880)jonavin2021-10-2214-25/+93
| | | | | | Co-authored-by: Jonavin <=>
| * Corrected keyboard layout which was causing issue in QMK configurator (#14891)jurassic732021-10-222-12/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-237-14/+16
|\|
| * [Keyboard] Update encoder callback on Evolv75 (#14757)Álvaro A. Volpato2021-10-227-14/+16
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-2310-0/+424
|\|
| * [Keyboard] Add MW75 support (#14833)TW594202021-10-2210-0/+424
| |
* | Remove legacy handling for ErgoDox Infinity handedness (#14919)Joel Challis2021-10-222-33/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-231-0/+11
|\|
| * Check usb transmit status in send_extra() (#14643)Dasky2021-10-231-0/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-221-1/+3
|\|
| * Fix right half of Nyquist in 4x12 mode having row shifted up by one (#14914)Danny2021-10-221-1/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-225-59/+144
|\|
| * Pteron36 Refactor (#14904)James Young2021-10-225-59/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * reformat info.json - friendly-format info.json - move the right half to the left by 0.5u (improves readability, for me anyway) - correct key sequence * refactor default keymap - use short-form keycodes - use four-space indent * refactor via keymap - use short-form keycodes - use four-space indent * update maintainer field in info.json Use the maintainer's GitHub username. * readme touch-up Minor edit to the lead paragraph, and reformat the Hardware Availability section. * change BOOTMAGIC_ENABLE from `lite` to `yes`
* | Initial USB2422 driver (#14835)Joel Challis2021-10-2213-206/+278
| |
* | Split out arm_atsam shift register logic (#14848)Joel Challis2021-10-2210-140/+301
| |
* | Fix ccache default (#14906)Joel Challis2021-10-221-1/+1
| |
* | Move USE_CCACHE logic to common location (#14899)Joel Challis2021-10-215-11/+8
| |