summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1915-0/+321
|\
| * [Keyboard] New kbd 1k (#15509)MakotoKurauchi2022-04-1915-0/+321
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mtei <2170248+mtei@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-194-0/+312
|\|
| * Add my planck layout (#13143)Abhinav2022-04-194-0/+312
| | | | | | | | | | | | | | | | | | * Add my planck layout * Add copyright * Address requested changes * Fix dipswitch return type
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1913-0/+676
|\|
| * [Keymap] A Colemak keymap for the crkbd keyboard (#16550)Álvaro Cortés2022-04-1913-0/+676
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-192-28/+140
|\|
| * Change helix:yshrsmz keymap to use split_common (#16537)Takeshi ISHII2022-04-192-28/+140
| |
* | Add support for multiple sensors to pmw3360 (#15996)uqs2022-04-194-84/+123
| |
* | move keyhive exclusive boards into /keyhive (#16084)peepeetee2022-04-19148-19/+19
| | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | move 麦田 boards into /mt (#16095)peepeetee2022-04-1959-9/+9
| | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | move z150_bh at101_bh omnikey_bh to viktus/ (#16004)peepeetee2022-04-1922-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1927-0/+799
|\|
| * [Keyboard] Add Amber80 Solder & VCL65 Solder (#15945)Sắn2022-04-1827-0/+799
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keymap] Add andrewcharnley keymap for GMMK Pro (#15320)Andrew Charnley2022-04-183-0/+129
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-194-5/+90
|\|
| * [Keyboard] Add converter/a1200/mistress1200 variant (#16634)8bits4ever2022-04-184-5/+90
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-183-37/+7
|\|
| * [Keyboard] Fix resume1800 - Dynamic layer count undefined (#16877)jack2022-04-183-37/+7
| |
* | Preinstall python dependencies before executing `qmk`. (#16874)Nick Brassel2022-04-181-1/+3
| |
* | Fixup AVR builds. (#16875)Nick Brassel2022-04-181-0/+6
| | | | | | | | | | | | | | | | | | | | * Fixup AVR builds. * Update platforms/avr/hardware_id.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Expose API for hardware unique ID (#16869)Joel Challis2022-04-187-0/+93
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1811-0/+486
|\|
| * [Keyboard] Add CrimsonKeyboards' Resume1800 (#16842)DeeDesired2022-04-1811-0/+486
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1810-114/+10
|\|
| * [Keyboard] sandbox - fix keymaps (#16873)jack2022-04-1810-114/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1810-0/+578
|\|
| * [Keyboard] Add deskpad (#15602)Md. Mashur Shalehin Sakib2022-04-1810-0/+578
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Fix one-shot locked modifiers (#16114)Denis Savran2022-04-181-5/+2
| | | | | | | | | | | | | | | | | | | | | | * Fix state updates of one-shot locked modifiers Activating additional one-shot locked modifiers removed previously enabled locked modifiers from the state. `get_oneshot_locked_mods` returned zero when two or more one-shot locked modifiers were enabled and then one was disabled. * Do not delete one-shot locked modifiers on a one-shot layer toggle Non-locked one-shot modifiers are not removed so this behavior adds inconsistency. Also the one-shot locked modifiers state was reset without unregistering any modifiers.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-181-3/+10
|\|
| * Ploopy Trackball Mini: only define DPI options as needed (#16160)alaviss2022-04-181-3/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1819-0/+785
|\|
| * [Keyboard] Add the Ciel (#16816)Ramon Imbao2022-04-1810-0/+538
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add digicarpice (#16791)Brandon Claveria2022-04-189-0/+247
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: swiftrax <swiftrax@github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1824-59/+712
|\|
| * [Keyboard] SharkPCB release Beta compatibility (#16713)Álvaro A. Volpato2022-04-1824-59/+712
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Add customizable snake and knight animation increments (#16337)Michał Szczepaniak2022-04-182-4/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1828-0/+762
|\|
| * [Keyboard] Add sandbox keyboard (#16021)yfuku2022-04-1828-0/+762
| | | | | | | | | | Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1713-503/+211
|\|
| * Anne Pro 2 Refactor (#16864)James Young2022-04-1713-503/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move RGB Matrix rules to keyboard level * move PERMISSIVE_HOLD config to keyboard level * annepro2.c: convert tabs to spaces * refactor rules.mk files Reformats each version's `rules.mk` file to be arranged more similarly to those of the rest of the keyboards in QMK. No logic change. * annepro2.c: allow compilation without RGB Matrix Wraps the `led_enabled` definition and the `KC_AP_RGB_*` keycodes in `#ifdef RGB_MATRIX_ENABLE`, allowing successful compilation if the user sets `RGB_MATRIX_ENABLE = no`. * rework readme files Reworks the main `readme.md` file to be more friendly to GitHub viewing, and removes the single-line version-specific readme files (exposes the main readme to QMK Configurator users). * info.json: update maintainer value * info.json: apply friendly formatting
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-171-25/+21
|\|
| * Refine LED indicator documentation (#16304)Albert Y2022-04-161-25/+21
| |
* | Fix #16859. (#16865)Nick Brassel2022-04-171-1/+1
| |
* | [QP] Check BPP capabilities before loading the palette (#16863)Stefan Kerkmann2022-04-171-6/+6
| |
* | rgblight: Add functions to stop blinking one or all but one layer (#16859)Simon Arlott2022-04-173-1/+47
| |
* | Heatmap incorrect matrix effect workaround (#16315)Albert Y2022-04-162-6/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1610-2/+279
|\|
| * [Keyboard] Add Phase One keyboard (#16430)moyi46812022-04-168-0/+277
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * Fix Xorg segfault with KeebCats PCBs (#16434)Amber Cronin2022-04-162-2/+2
| |