summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Add GET_TAPPING_TERM macro to reduce duplicate code (#16681)Jouke Witteveen2022-04-167-43/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | * Add GET_TAPPING_TERM macro to reduce duplicate code The macro gives the right tapping term depending on whether per-key tapping terms and/or dynamic tapping terms are enabled. Unnecessary function calls and variable resolution are avoided. Fixes #16472. * Use GET_TAPPING_TERM for Cirque trackpads Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1611-12/+16
|\|
| * [Keyboard] Update X-Bows Keyboard (#16765)X-Bows Tech2022-04-1611-12/+16
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Shulin <mumu@x-bows.com>
* | Implement XAP 'secure' core requirements (#16843)Joel Challis2022-04-1615-13/+312
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-161-0/+4
|\|
| * rgblight: Limit max repeat times in rgblight_blink_layer_repeat (#16860)Simon Arlott2022-04-161-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-161-3/+3
|\|
| * Resolve layout macro inconsistencies for rmkeebs/rm_numpad (#16856)Joel Challis2022-04-161-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-1419-0/+473
|\|
| * [Keyboard] Add avalanche (#16407)Will Winder2022-04-1419-0/+473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add avalanche * PR feedback * Update keyboards/avalanche/v1/config.h * Update keyboards/avalanche/v1/v1.h * Update keyboards/avalanche/v2/config.h * Update keyboards/avalanche/v2/v2.h * Update keyboards/avalanche/v3/config.h * Update keyboards/avalanche/v3/v3.h * Apply suggestions from code review * Remove rules.mk comment and fix other comments. * Shared encoder code, follow conventions in rules.mk files. * Remove config files which do not change defaul behavior.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-144-3/+60
|\|
| * [Keyboard] Add via support for creatkeebs/glacier (#16747)Tim Liu2022-04-144-3/+60
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-149-6/+10
|\|
| * [Keyboard] move/rename obro to Meridian RGB (#16828)holtenc2022-04-149-6/+10
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-141-0/+3
|\|
| * Ignore VIA(L) json files (#16845)Drashna Jaelre2022-04-141-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-142-4/+4
|\|
| * Fix external flash on AVR (#16851)leah-splitkb2022-04-142-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-131-4/+2
|\|
| * [Keyboard] Fix kay65 - Missing keycode (#16849)jack2022-04-131-4/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-04-132-54/+53
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 11:35:13 +0000