860f53dac4
Merge remote-tracking branch 'origin/master' into develop
2022-04-19 02:33:59 +00:00
958600d518
[Keyboard] Add Amber80 Solder & VCL65 Solder ( #15945 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
2022-04-18 19:33:32 -07:00
90dd16ccd2
[Keymap] Add andrewcharnley keymap for GMMK Pro ( #15320 )
2022-04-18 17:23:38 -07:00
02104270ed
Merge remote-tracking branch 'origin/master' into develop
2022-04-19 00:18:54 +00:00
773124e9c0
[Keyboard] Add converter/a1200/mistress1200 variant ( #16634 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
2022-04-18 17:18:10 -07:00
c397720c87
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 17:02:06 +00:00
1ab1ce1b46
[Keyboard] Fix resume1800 - Dynamic layer count undefined ( #16877 )
2022-04-18 10:01:33 -07:00
6819420b0e
Preinstall python dependencies before executing qmk. ( #16874 )
2022-04-18 15:46:52 +01:00
f50a623909
Fixup AVR builds. ( #16875 )
...
* 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 >
2022-04-18 15:39:45 +01:00
b8245a5507
Expose API for hardware unique ID ( #16869 )
2022-04-18 20:51:40 +10:00
7aa9a353ac
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:30:24 +00:00
ad9a137942
[Keyboard] Add CrimsonKeyboards' Resume1800 ( #16842 )
2022-04-18 02:29:53 -07:00
886b257c3f
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:29:04 +00:00
8c91e90381
[Keyboard] sandbox - fix keymaps ( #16873 )
2022-04-18 02:28:28 -07:00
dce3dc3fe5
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:15:38 +00:00
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
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
5fc8f8488f
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:12:03 +00:00
0d67eec5e2
Ploopy Trackball Mini: only define DPI options as needed ( #16160 )
2022-04-18 02:11:56 -07:00
9bd8d08834
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:11:43 +00:00
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
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
f6fd6942ef
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 09:08:22 +00:00
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
5b6faa173b
Add customizable snake and knight animation increments ( #16337 )
2022-04-18 02:07:36 -07:00
4d67fe66a3
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 07:38:07 +00:00
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
58c2bb4d64
Merge remote-tracking branch 'origin/master' into develop
2022-04-17 19:54:33 +00:00
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
d958329258
Merge remote-tracking branch 'origin/master' into develop
2022-04-17 00:37:07 +00:00
a5a4597311
Refine LED indicator documentation ( #16304 )
2022-04-16 17:36:07 -07:00
df95495d5b
Fix #16859 . ( #16865 )
2022-04-17 00:09:37 +01:00
147e57fd59
[QP] Check BPP capabilities before loading the palette ( #16863 )
2022-04-17 08:30:51 +10:00
5841c755ae
rgblight: Add functions to stop blinking one or all but one layer ( #16859 )
2022-04-17 00:02:32 +02:00
e5918cf968
Heatmap incorrect matrix effect workaround ( #16315 )
2022-04-16 11:34:07 -07:00
030a96a3f5
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 18:28:19 +00:00
3b6e48b012
[Keyboard] Add Phase One keyboard ( #16430 )
...
Co-authored-by: Ryan <fauxpark@gmail.com >
2022-04-16 11:28:16 -07:00
6d13199ed0
Fix Xorg segfault with KeebCats PCBs ( #16434 )
2022-04-16 11:27:51 -07:00
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
cad0af09a8
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 18:19:59 +00:00
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
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
ae4d518352
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 17:41:18 +00:00
1cfe49714f
rgblight: Limit max repeat times in rgblight_blink_layer_repeat ( #16860 )
2022-04-16 10:40:48 -07:00
14d084ae13
Merge remote-tracking branch 'origin/master' into develop
2022-04-16 01:23:46 +00:00
b331c98ca4
Resolve layout macro inconsistencies for rmkeebs/rm_numpad ( #16856 )
2022-04-16 02:23:19 +01:00
84baff51c2
Port foldkb to vial ( #146 )
...
* add vial support
* choose light over combo
* secure the hell of it
* left space: 1u-2u, right space: 2.75u
split backspace: 2x1u backslash: 1.5u, right shift: 1.75u + 1u
* typo
* key setups update
* get ready for vial 0.5 dynamic key overrides
2022-04-14 22:05:03 -06:00
59885d07af
Merge remote-tracking branch 'origin/master' into develop
2022-04-14 18:24:36 +00:00
8de4065b09
[Keyboard] Add avalanche ( #16407 )
...
* [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.
2022-04-14 11:23:32 -07:00
399de0be12
Merge remote-tracking branch 'origin/master' into develop
2022-04-14 17:02:01 +00:00
