QMK Bot
b6f451194e
Merge remote-tracking branch 'origin/develop' into xap
2022-04-19 10:33:23 +00:00
QMK Bot
1dee7bc7f3
Merge remote-tracking branch 'origin/master' into develop
2022-04-19 10:32:51 +00:00
QMK Bot
bf9facddc5
Merge remote-tracking branch 'origin/develop' into xap
2022-04-19 10:32:20 +00:00
Álvaro Cortés
50ec365806
[Keymap] A Colemak keymap for the crkbd keyboard ( #16550 )
2022-04-19 20:32:11 +10:00
QMK Bot
2744c1b2cf
Merge remote-tracking branch 'origin/master' into develop
2022-04-19 10:31:47 +00:00
Takeshi ISHII
bde724e124
Change helix:yshrsmz keymap to use split_common ( #16537 )
2022-04-19 20:31:10 +10:00
QMK Bot
9145458eb6
Merge remote-tracking branch 'origin/develop' into xap
2022-04-19 10:29:53 +00:00
uqs
690dc4bdaf
Add support for multiple sensors to pmw3360 ( #15996 )
2022-04-19 20:29:17 +10:00
QMK Bot
892f88e7d1
Merge remote-tracking branch 'origin/develop' into xap
2022-04-19 10:18:22 +00:00
peepeetee and Nick Brassel
9f63bce70b
move keyhive exclusive boards into /keyhive ( #16084 )
...
Co-authored-by: Nick Brassel <nick@tzarc.org >
2022-04-19 20:17:21 +10:00
QMK Bot
0df5dae0f6
Merge remote-tracking branch 'origin/develop' into xap
2022-04-19 10:07:11 +00:00
peepeetee and Nick Brassel
cff489bfdb
move 麦田 boards into /mt ( #16095 )
...
Co-authored-by: Nick Brassel <nick@tzarc.org >
2022-04-19 20:06:35 +10:00
QMK Bot
5616513800
Merge remote-tracking branch 'origin/develop' into xap
2022-04-19 08:58:27 +00:00
peepeetee
e13aefe41d
move z150_bh at101_bh omnikey_bh to viktus/ ( #16004 )
2022-04-19 18:57:53 +10:00
QMK Bot
abec2e9052
Merge remote-tracking branch 'origin/develop' into xap
2022-04-19 02:34:31 +00:00
QMK Bot
860f53dac4
Merge remote-tracking branch 'origin/master' into develop
2022-04-19 02:33:59 +00:00
Nick Brassel
d17aed8e82
Verify struct sizing at build time.
2022-04-19 12:33:56 +10: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
zvecr
3730ddacac
Fix ARM builds due to packing inconsistencies
2022-04-19 02:07:05 +01:00
zvecr
1d96fc866d
Add route for hardware_id
2022-04-19 02:07:05 +01:00
QMK Bot
81cce42118
Merge remote-tracking branch 'origin/develop' into xap
2022-04-19 00:24:13 +00:00
Andrew Charnley
90dd16ccd2
[Keymap] Add andrewcharnley keymap for GMMK Pro ( #15320 )
2022-04-18 17:23:38 -07:00
QMK Bot
84c3879435
Merge remote-tracking branch 'origin/develop' into xap
2022-04-19 00:19:27 +00:00
QMK Bot
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
QMK Bot
36bc8c0c1a
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 17:02:38 +00:00
QMK Bot
c397720c87
Merge remote-tracking branch 'origin/master' into develop
2022-04-18 17:02:06 +00:00
jack
1ab1ce1b46
[Keyboard] Fix resume1800 - Dynamic layer count undefined ( #16877 )
2022-04-18 10:01:33 -07:00
QMK Bot
e28727d8ba
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 14:47:37 +00:00
Nick Brassel
6819420b0e
Preinstall python dependencies before executing qmk. ( #16874 )
2022-04-18 15:46:52 +01:00
QMK Bot
bdfe1470ab
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 14:40:19 +00: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
QMK Bot
4cfcd51acb
Merge remote-tracking branch 'origin/develop' into xap
2022-04-18 10:52:10 +00:00
Joel Challis
b8245a5507
Expose API for hardware unique ID ( #16869 )
2022-04-18 20:51:40 +10:00
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
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
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
QMK Bot