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
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
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
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
QMK Bot