QMK Bot
3d43baf3f2
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 09:30:56 +00:00
QMK Bot
7aa9a353ac
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:30:24 +00:00
DeeDesired
ad9a137942
[Keyboard] Add CrimsonKeyboards' Resume1800 ( #16842 )
2022-04-18 02:29:53 -07:00
QMK Bot
9f78fb69e4
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 09:29:32 +00:00
QMK Bot
886b257c3f
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:29:04 +00:00
jack
8c91e90381
[Keyboard] sandbox - fix keymaps ( #16873 )
2022-04-18 02:28:28 -07:00
QMK Bot
1f212894e1
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 09:16:07 +00:00
QMK Bot
dce3dc3fe5
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:15:38 +00:00
Md. Mashur Shalehin Sakib
f52f3f1077
[Keyboard] Add deskpad ( #15602 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-04-18 02:13:44 -07:00
QMK Bot
5af8b47bb9
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 09:13:21 +00:00
Denis Savran
b1ceb4bb6a
Fix one-shot locked modifiers ( #16114 )
...
* 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.
2022-04-18 02:12:25 -07:00
QMK Bot
2e3fe5f1b2
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 09:12:12 +00:00
QMK Bot
5fc8f8488f
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:12:03 +00:00
alaviss
0d67eec5e2
Ploopy Trackball Mini: only define DPI options as needed ( #16160 )
2022-04-18 02:11:56 -07:00
QMK Bot
9bd8d08834
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:11:43 +00:00
Ramon Imbao
8826a1dea5
[Keyboard] Add the Ciel ( #16816 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-04-18 02:11:32 -07:00
Brandon Claveria
c6de26fc6f
[Keyboard] Add digicarpice ( #16791 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: swiftrax <swiftrax@github.com>
2022-04-18 02:11:11 -07:00
QMK Bot
f6b7c2ebee
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 09:08:51 +00:00
QMK Bot
f6fd6942ef
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:08:22 +00:00
QMK Bot
6f134870ab
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 09:08:04 +00:00
Álvaro A. Volpato
5fe3b9ffa5
[Keyboard] SharkPCB release Beta compatibility ( #16713 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-04-18 02:07:49 -07:00
Michał Szczepaniak
5b6faa173b
Add customizable snake and knight animation increments ( #16337 )
2022-04-18 02:07:36 -07:00
QMK Bot
b4dc49601e
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 07:38:38 +00:00
QMK Bot
4d67fe66a3
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 07:38:07 +00:00
yfuku
fdd4af9973
[Keyboard] Add sandbox keyboard ( #16021 )
...
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>
2022-04-18 00:37:25 -07:00
QMK Bot
a608afdcf4
Merge remote-tracking branch 'origin/develop' into xap
2022-04-17 19:55:02 +00:00
QMK Bot
58c2bb4d64
Merge remote-tracking branch 'origin/master' into develop
2022-04-17 19:54:33 +00:00
James Young
7d60a141a2
Anne Pro 2 Refactor ( #16864 )
...
* 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
2022-04-17 12:53:59 -07:00
QMK Bot
b0fbcdd8a4
Merge remote-tracking branch 'origin/develop' into xap
2022-04-17 00:37:39 +00:00
QMK Bot
d958329258
Merge remote-tracking branch 'origin/master' into develop
2022-04-17 00:37:07 +00:00
Albert Y
a5a4597311
Refine LED indicator documentation ( #16304 )
2022-04-16 17:36:07 -07:00
QMK Bot
379dac6ade
Merge remote-tracking branch 'origin/develop' into xap
2022-04-16 23:10:03 +00:00
Nick Brassel
df95495d5b
Fix #16859 . ( #16865 )
2022-04-17 00:09:37 +01:00
zvecr
3c20f00238
Merge remote-tracking branch 'origin/develop' into xap
2022-04-16 23:49:41 +01:00
Stefan Kerkmann
147e57fd59
[QP] Check BPP capabilities before loading the palette ( #16863 )
2022-04-17 08:30:51 +10:00
Simon Arlott
5841c755ae
rgblight: Add functions to stop blinking one or all but one layer ( #16859 )
2022-04-17 00:02:32 +02:00
Albert Y
e5918cf968
Heatmap incorrect matrix effect workaround ( #16315 )
2022-04-16 11:34:07 -07:00
QMK Bot
030a96a3f5
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 18:28:19 +00:00
moyi4681
3b6e48b012
[Keyboard] Add Phase One keyboard ( #16430 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-04-16 11:28:16 -07:00
Amber Cronin
6d13199ed0
Fix Xorg segfault with KeebCats PCBs ( #16434 )
2022-04-16 11:27:51 -07:00
Jouke Witteveen
8f585153c4
Add GET_TAPPING_TERM macro to reduce duplicate code ( #16681 )
...
* 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>
2022-04-16 11:24:09 -07:00
QMK Bot
cad0af09a8
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 18:19:59 +00:00
X-Bows Tech
7d75f88ac9
[Keyboard] Update X-Bows Keyboard ( #16765 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Shulin <mumu@x-bows.com>
2022-04-16 11:19:24 -07:00
Joel Challis
92a61aa0cd
Implement XAP 'secure' core requirements ( #16843 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-04-16 11:13:05 -07:00
QMK Bot
c79bfc6ed9
Merge remote-tracking branch 'origin/develop' into xap
2022-04-16 17:41:49 +00:00
QMK Bot
ae4d518352
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 17:41:18 +00:00
Simon Arlott
1cfe49714f
rgblight: Limit max repeat times in rgblight_blink_layer_repeat ( #16860 )
2022-04-16 10:40:48 -07:00
QMK Bot
78acf2c1a1
Merge remote-tracking branch 'origin/develop' into xap
2022-04-16 01:24:26 +00:00
QMK Bot
14d084ae13
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 01:23:46 +00:00
Joel Challis
b331c98ca4
Resolve layout macro inconsistencies for rmkeebs/rm_numpad ( #16856 )
2022-04-16 02:23:19 +01:00