QMK Bot
a3760c0891
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:39:24 +00:00
James Young
1d706bd77c
handwired/bolek: correct key object order ( #12356 )
2021-03-25 22:38:52 +11:00
QMK Bot
a747ef966b
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:38:44 +00:00
Zach White
3e60997edb
Add a qmk format-json
command that will format JSON files ( #12372 )
...
* Add a command to format json files
* change to work after rebase
* add test for qmk format-json
* add documentation for qmk format-json
* Update lib/python/qmk/cli/format/json.py
2021-03-25 22:38:10 +11:00
QMK Bot
87f6df0655
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:36:57 +00:00
Wilba
a74846a0db
Added wilba.tech WT60-H2 ( #12348 )
...
* Added wilba.tech WT60-H2
* fix typo
* Fix error in keymap
2021-03-25 22:36:52 +11:00
QMK Bot
25b7a5d531
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:36:29 +00:00
Wilba
038d9118b6
Added wilba.tech WT65-G2 ( #12360 )
2021-03-25 22:36:24 +11:00
Wilba
be771e5fd2
Added wilba.tech WT60-H3 ( #12354 )
...
* Added wilba.tech WT60-H2
* fix typo
2021-03-25 22:35:54 +11:00
QMK Bot
c7436e667d
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:35:49 +00:00
Andrew-Fahmy
1fbee7c316
(Re)Fixing K-type RGB lighting ( #12084 )
...
* initial rgb driver fix
* added underglow LEDs and fixed typo in RGB locations
* removed test code
* added my key maps
* updated rgb keymap to work with changes
* refactored my code to make it more maintainable and updated keymaps.
* added GPL licence
* Turned off matrix scan rate debug info
* added checks if RGB matrix is enabled to fix errors when building keymaps without RGB matrix enabled
* Apply suggestions from code review by fauxpark
Co-authored-by: Ryan <fauxpark@gmail.com>
* Renamed led driver file to be less ambiguous
* Renamed is31fl3733 driver files to is31fl3733-dual
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 22:35:18 +11:00
QMK Bot
183dde75de
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:35:06 +00:00
Brandon Claveria
8b39ae13c7
add equator ( #12369 )
...
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-03-25 22:34:29 +11:00
QMK Bot
8086837f69
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:34:28 +00:00
Joel Challis
1bb6d8de6f
Fix USER_PRINT on avr/atsam ( #12269 )
...
* Fix USER_PRINT on avr/atsam
* Update tmk_core/common/arm_atsam/_print.h
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 22:33:53 +11:00
XScorpion2
ff41c22fdc
Adding keyboard level weak function for slave matrix scan ( #12317 )
2021-03-25 22:33:18 +11:00
QMK Bot
2f6236d1ea
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:31:17 +00:00
Ryan Roden-Corrent
a888057453
Fix a small typo in cli_commands.md ( #12379 )
2021-03-25 22:31:05 +11:00
Ryan
eae7343741
Move API_SYSEX_MAX_SIZE
out of config_common.h
( #12302 )
2021-03-25 22:30:42 +11:00
QMK Bot
921f1ba4cf
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 07:06:41 +00:00
Armando Magalhães
c59fb1b477
feat(keymaps): Changes to crkbd/keymaps/armand1m layout and README.md update ( #12252 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 18:06:30 +11:00
James Young
e7cb7bc737
Roses Lite layout macro touch-up ( #12357 )
2021-03-25 18:05:59 +11:00
QMK Bot
1bb04ea598
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 05:29:33 +00:00
Xelus22
1ed48c774e
add valor_frl_tkl info.json ( #12359 )
...
* add info.json
* remove macro keys to correct layout
2021-03-24 22:28:54 -07:00
QMK Bot
600fc8be2b
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 03:34:00 +00:00
github-actions[bot]
54b80ecf9f
[CI] Format code according to conventions ( #12363 )
...
* Format code according to conventions
* Update lib/python/qmk/cli/generate/api.py
* Update lib/python/qmk/cli/generate/api.py
Co-authored-by: QMK Bot <hello@qmk.fm>
Co-authored-by: Zach White <skullydazed@gmail.com>
2021-03-24 20:33:25 -07:00
QMK Bot
c823160d94
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 01:33:46 +00:00
sbuller
97a73637e0
[Keyboard] Preserve signedness from opt_encoder_handler for scroll data on ploopy devices ( #12223 )
2021-03-24 18:33:06 -07:00
QMK Bot
d6b18ebfe7
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 19:47:14 +00:00
Ryan
653ecf91c2
More Tap Dance docs improvements ( #12358 )
2021-03-24 19:46:22 +00:00
QMK Bot
b515651feb
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 19:39:16 +00:00
Joel Challis
b7870ae78c
Workaround for recent changes to mouse keycodes ( #12367 )
2021-03-24 19:38:35 +00:00
QMK Bot
0dc0516f0c
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 16:27:28 +00:00
Zach White
299008be36
Add support for qmk_configurator style aliases ( #11954 )
...
* Add support for qmk_configurator style aliases
* add the keyboard aliases to the api data
* add support for a keyboard metadata file
* make flake8 happy
2021-03-24 09:26:38 -07:00
QMK Bot
743d6c430b
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 10:13:37 +00:00
Ryan
723d9af04d
Add info.json for handwired/datahand ( #12320 )
2021-03-24 21:12:55 +11:00
QMK Bot
87aa3282f0
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 09:07:46 +00:00
James Young
6edcbdca19
[Keyboard] YMDK YM68 ( #12352 )
...
* [Keyboard] YMDK YM68
Converted from a KBFirmware JSON file provided via the vendor's product listing.
PCB supports Backlight on B6 and RGB Underglow on E2, but the LEDs are not pre-soldered according to the PCB photos.
* update VENDOR_ID and PRODUCT_ID
2021-03-24 02:07:12 -07:00
QMK Bot
bbc48b0ef5
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 04:25:05 +00:00
James Young
2882ee9f55
Configurator bugfix for GMMK Pro ( #12353 )
2021-03-24 15:24:20 +11:00
Ryan
bd18405cf0
LED Matrix: Fix up eeconfig code ( #12327 )
2021-03-24 13:09:56 +11:00
QMK Bot
dd5a732eac
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 02:04:16 +00:00
Ryan
78149505f9
Fix Uni660 linker errors ( #12341 )
2021-03-24 13:03:43 +11:00
QMK Bot
862b01d4c0
Merge remote-tracking branch 'origin/master' into develop
2021-03-24 02:00:40 +00:00
duoshock
7b07ce3fef
Add UC-1 keypad ( #11926 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: online <33636898+online@users.noreply.github.com>
2021-03-24 13:00:07 +11:00
QMK Bot
9afbbf21fd
Merge remote-tracking branch 'origin/master' into develop
2021-03-23 18:19:00 +00:00
Viktor Eikman
d395c81606
Configurator fixes for handwired/concertina/64key ( #12316 )
...
* Fixed bug that was hiding a key in info.json.
* Improvements to presentation.
2021-03-23 11:18:19 -07:00
QMK Bot
b2cfb629e4
Merge remote-tracking branch 'origin/master' into develop
2021-03-23 15:11:57 +00:00
Danny
be257b6f9f
Add Sinc Rev. 2 ( #12138 )
2021-03-23 11:11:07 -04:00
QMK Bot
34423580e0
Merge remote-tracking branch 'origin/master' into develop
2021-03-23 07:01:25 +00:00