QMK Bot
935079f266
Merge remote-tracking branch 'origin/master' into develop
2021-07-29 15:50:58 +00:00
bomb
768072e824
[Keyboard] Add Mojo68 for Melgeek ( #13578 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:50:28 -07:00
QMK Bot
957bd4d1d1
Merge remote-tracking branch 'origin/master' into develop
2021-07-29 15:50:24 +00:00
AquaCylinder
ae268596ce
[Keyboard] Add Emi20 ( #13603 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:49:51 -07:00
QMK Bot
faf4f6d005
Merge remote-tracking branch 'origin/master' into develop
2021-07-29 15:49:11 +00:00
DA
ad6acb3a03
[Keyboard] add cherryb studio cb1800 keyboard ( #13639 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:48:39 -07:00
QMK Bot
58baf5a3d8
Merge remote-tracking branch 'origin/master' into develop
2021-07-29 15:48:22 +00:00
QMK Bot
04a0f0cb18
Merge remote-tracking branch 'origin/master' into develop
2021-07-29 15:47:52 +00:00
X-Bows Tech
8fa674727d
[Keyboard] Add X-Bows Ranger Keyboard ( #13660 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:47:51 -07:00
Jonavin
8d611f6873
[Keymap] Jonavin keymap Mercutio add win key lockout function ( #13670 )
...
Co-authored-by: Jonavin <=>
2021-07-29 08:47:14 -07:00
QMK Bot
1df2f23ab4
Merge remote-tracking branch 'origin/master' into develop
2021-07-29 15:43:12 +00:00
N2-Sumikko
dc2dfe2a6c
[Keyboard] Add halfcliff keyboard ( #13515 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:42:28 -07:00
QMK Bot
5418777454
Merge remote-tracking branch 'origin/master' into develop
2021-07-29 15:29:02 +00:00
ESCA47
3a48cd64cb
[Keyboard] Add GetawayVan ( #13412 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:28:33 -07:00
QMK Bot
ec8d08810f
Merge remote-tracking branch 'origin/master' into develop
2021-07-29 15:23:56 +00:00
Jordan Blackbourn
f3d7901950
[Keyboard] Added Orthocode keyboard ( #13487 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:23:27 -07:00
QMK Bot
614c627114
Merge remote-tracking branch 'origin/master' into develop
2021-07-29 02:01:05 +00:00
Joel Challis
e646211919
Fix unit tests after recent refactor ( #13765 )
2021-07-29 12:00:39 +10:00
QMK Bot
69661eb5ab
Merge remote-tracking branch 'origin/master' into develop
2021-07-28 23:34:48 +00:00
James Young
ccdb432f71
Allison Numpad: Configurator fix for LAYOUT_numpad_6x4 ( #13759 )
...
* info.json: human-friendly formatting
- one key object per line; line breaks between physical rows
- four-space indent
- remove trailing whitespace
* info.json: correct key object order for LAYOUT_numpad_6x4
2021-07-28 16:34:17 -07:00
QMK Bot
aabbaf11aa
Merge remote-tracking branch 'origin/master' into develop
2021-07-28 11:02:58 +00:00
Ryan
491b83aa32
Update "make format" message ( #13741 )
...
* Update "make format" message
* Add examples for `qmk` command as well
2021-07-28 12:02:29 +01:00
Joel Challis
4ef8ff458d
Minor tidy up of key overrides ( #13747 )
...
* Minor tidy up of key overrides
* Update quantum/quantum.c
* Update quantum/quantum.c
2021-07-28 12:01:49 +01:00
QMK Bot
50964ae821
Merge remote-tracking branch 'origin/master' into develop
2021-07-28 11:01:28 +00:00
Joel Challis
03d258c222
matrix_scan_x -> x_task ( #13748 )
2021-07-28 12:01:23 +01:00
Shane Celis
fcce9f2a4f
fix: Fix typo in documentation for one shot keys. ON_TOGG -> OS_TOGG ( #13754 )
...
`ON_TOGG` doesn't exist in the codebase.
2021-07-28 12:00:55 +01:00
Drashna Jaelre
c52c69d45f
Allow for higher USB Polling rate on ATSAM boards ( #13755 )
2021-07-28 12:00:16 +01:00
QMK Bot
2f4361c88f
Merge remote-tracking branch 'origin/master' into develop
2021-07-28 07:25:28 +00:00
Jonavin
9088df04c3
[Keyboard] fix short circuit in led_update_kb for quefrency rev3 ( #13752 )
...
Co-authored-by: Jonavin <=>
2021-07-28 00:24:51 -07:00
Joel Challis
7ac7ca96e9
Remove some legacy files ( #13715 )
2021-07-27 23:57:42 +01:00
Joel Challis
3858a784c7
Align AW20216 driver ( #13712 )
...
* Align AW20216 driver
* Update drivers/awinic/aw20216.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Review comments
* formatting fixes
* stop if start failed?
* review comments
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-27 23:55:51 +01:00
Ryan
56443fe3cf
Fix typo in Dactyl Manuform ( #13740 )
2021-07-27 08:16:41 -07:00
Ryan
468f705455
Dactyl Manuform cleanup ( #13686 )
2021-07-27 22:00:38 +10:00
QMK Bot
95de60513d
Merge remote-tracking branch 'origin/master' into develop
2021-07-27 02:45:36 +00:00
ForsakenRei
ae2c2358ec
[Docs] Add default
case in Tap Dance Example 6 ( #13727 )
...
Added a `default` case in `switch(ql_tap_state.state)` at line 493 and 494.
Without it compile firmware with Example 6 code will encounter 2 errors:
`enumeration value 'TD_NONE' not handled in switch`
`enumeration value 'TD_UNKNOWN' not handled in switch`
2021-07-26 19:45:08 -07:00
QMK Bot
998ac203e4
Merge remote-tracking branch 'origin/master' into develop
2021-07-27 02:44:18 +00:00
James Young
a617c8b80a
[Keyboard] Ares refactor ( #13730 )
2021-07-26 19:43:48 -07:00
Albert Y
be34fdea4b
[Keyboard] Add RGB matrix support for Kyria ( #12789 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-26 19:42:34 -07:00
Drashna Jaelre
3affdcb45b
Reduce firmware size in prep for #12670 ( #13724 )
...
* Reduce firmware size in pre for #12670
* Also disable pixel mode, just in case
2021-07-27 12:41:28 +10:00
Albert Y
e032fbe326
[Keyboard] Update kyria make path example ( #13720 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-26 18:01:16 -07:00
Drashna Jaelre
eb46c954dc
[Keymap] Drashna's Defaults cleanup ( #13722 )
2021-07-26 17:59:49 -07:00
Joel Challis
368efb5d2b
Remove legacy BACKLIGHT_CUSTOM_DRIVER option ( #13731 )
2021-07-27 10:17:58 +10:00
Nick Brassel
394272a266
Merge remote-tracking branch 'upstream/master' into develop
2021-07-27 10:11:52 +10:00
datafx
b1c5a53a68
Add bootloader size ( #13729 )
...
* Add bootloader size
Bootloader size needs to be 6144 to allow QMK to jump to the correct location with bootmagic
* Include dz60rgb v2.1
Add boot loader size to this pcb also
2021-07-27 10:07:29 +10:00
James Young
e6e4ec6267
40percentclub/nein: update info.json layout macro reference ( #13726 )
...
- change LAYOUT to LAYOUT_ortho_3x3
2021-07-26 21:02:44 +01:00
Xelus22
e0375c0b71
[Keyboard Update] Change to L422 ( #13717 )
...
* change to L422
* Add bootloader
Co-authored-by: Ryan <fauxpark@gmail.com>
* add bootloader
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-26 16:05:13 +10:00
Cyril
a73e0a7b13
Revert "Fixed the ortho60 and ortho48 matrix layout after testing ( #12106 )" ( #13456 )
...
This reverts commit e25f05224f
.
2021-07-25 22:51:23 -07:00
Xelus22
b9902a3f59
[Keyboard] Valor Rev 2 ( #13551 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-25 22:34:39 -07:00
Drashna Jaelre
9e782e4f14
[Bug] Include gpio.h in solenoid driver for GPIO Control functions ( #13716 )
2021-07-25 21:24:47 -07:00
bomb
2e5cecd704
[Keyboard] Change RGB light defaults for melgeek/mj6xy ( #13657 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-25 21:22:13 -07:00