d7e61e56bb
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 08:32:00 +00:00
66857b919b
Wuque Mammoth20x Layout Macro Refactor ( #14568 )
...
* mammoth20x: edit size of RightEncode key in Configurator
* physically arrange layout macro
Arranges the keycodes to resemble the assembled board.
* rename LAYOUT_default to LAYOUT
Includes "layout_aliases" tree in info.json for backwards compatibility.
* rules.mk touch-up
* convert tabs to spaces
* add line break before ENCODER_ENABLE (not included in QMK's template)
* readme.md touch-up
* remove zero-width space characters
* markdown fix for info paragraph
* update link text
2021-09-23 01:31:11 -07:00
c679911f3d
Merge remote-tracking branch 'upstream/master' into develop
2021-09-23 00:59:31 -07:00
62ef4a9c8a
Meira Refactor ( #14566 )
...
* clean up keyboard header files
* use #pragma once include guard
* convert tabs to spaces
* remove redundant #include statements
* update revision references to main header (`../meira.h` -> `meira.h`)
* refactor default keymap
* use LAYOUT as layout macro reference
* use enum statement for layer indexes; make layers contiguous
* use four-space indent
* update keycode grid alignment
* update layout macro aliases
* move layout macro aliases to info.json
* alias KEYMAP to LAYOUT_ortho_4x12 so the user keymaps don't have to be edited
* touch up meira.h
There's no Planck MIT layout reference here.
* add copyright headers
* workaround patch for grahampheath keymap
The `matrix_init_kb()` function in `meira.c` calls `backlight_set()`, but the grahampheath keymap disables Backlight to make space for Audio, causing the firmware to fail to compile.
This commit wraps the `backlight_set()` call in an ifdef statement, so the call is excluded if Backlight is disabled.
* clean up rules.mk inline comments
* re-order rules.mk settings
* clean up readme.md
* correct link to keyboard image
* change metadata section to unordered list
* spelling corrections
* update make instructions and Docs links
2021-09-23 00:49:02 -07:00
399d26c990
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 04:03:00 +00:00
0fc15f4d30
[Docs] update Japanese translation of feature_backlight.md ( #14403 )
...
* update feature_backlight.md translation
* update file based on comments
2021-09-23 13:02:32 +09:00
125d4c413f
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 04:02:12 +00:00
7f0c397c72
[Docs] update Japanese translation of feature_advanced_keycodes.md ( #14309 )
...
* update feature_advanced_keycodes.md translation
* update file based on comments
2021-09-23 13:01:42 +09:00
3edd4bc48f
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 03:59:22 +00:00
5347577346
[Docs] update Japanese translation of isp_flashing_guide.md ( #13700 )
...
* update isp_flashing_guide.md translation
* update isp_flashing_guide.md translation
* correct url
* trim remaining merge identifier
2021-09-23 12:58:56 +09:00
787cce1415
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 03:55:47 +00:00
7bfc6083b7
[Docs] update Japanese translation of feature_leader_key.md ( #13669 )
...
* update feature_leader_key.md translation
* update file based on comments
* update text based on comments
2021-09-23 12:55:19 +09:00
e41f1e9460
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 03:53:29 +00:00
618a28c6ae
[Docs] update Japanese translation of one_shot_keys.md ( #13656 )
...
* update one_shot_keys.md translation
* update one_shot_keys.md translation
* correct paramter for function
* add change of #13754
2021-09-23 12:52:53 +09:00
d5df1b81a3
Merge remote-tracking branch 'origin/master' into develop
2021-09-23 01:03:23 +00:00
4062860c05
[Keyboard] Bkf ( #14534 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-22 18:02:49 -07:00
4093732581
Merge remote-tracking branch 'upstream/master' into develop
2021-09-22 13:55:48 -07:00
1aaef6c988
Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22) ( #14567 )
...
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (2021-09-22)
* update keyboards/handwired/slash/rules.mk per fauxpark
2021-09-22 12:33:41 -07:00
45ec15d1c3
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 16:53:42 +00:00
ce5bb612a9
[Keyboard] Fix default keymap for Draytronics Elise V2 keyboard ( #14562 )
2021-09-23 02:53:03 +10:00
46e1b0d81c
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 16:48:25 +00:00
57d4e80845
[Keyboard] Disable console on Smallkeyboard ( #14561 )
2021-09-23 02:47:56 +10:00
cd7ebe2a4e
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 06:50:17 +00:00
01b0eeac1e
[Keyboard] Version 2 of Draytronics Elise Keyboard + ISO Keymap Change ( #14253 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-21 23:49:46 -07:00
71f34274ab
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 06:38:36 +00:00
c78a057ec4
[Keyboard] add kk980 keyboard ( #14436 )
2021-09-21 23:38:07 -07:00
cf0ebe2d10
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 05:52:23 +00:00
5ddbabfa2a
[Keyboard] Fix jkb65 compile issues ( #14554 )
2021-09-21 22:51:54 -07:00
d315268355
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 05:39:49 +00:00
ea5735b074
[Keyboard] Fix font file for Ein 60 Keyboard ( #14553 )
2021-09-21 22:39:19 -07:00
0a4fef4549
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:26:27 +00:00
9c564b6a5f
[Keyboard] Add Dango40 ( #14437 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Swiftrax <swiftrax@gmail.com>
Co-authored-by: Swiftrax <swiftrax@github.com>
2021-09-21 21:25:59 -07:00
6a26c5cb80
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:24:51 +00:00
c8a3353003
[Keyboard] Add Free Willy Keyboard ( #14394 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-21 21:24:44 -07:00
c0cf461874
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:24:24 +00:00
02556b3d8a
[Keyboard] 0-Sixty: Splits kb config into base and underglow ( #14384 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21 21:24:14 -07:00
4e0125c22c
[Keyboard] Add support for XT8x ( #14440 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21 21:23:51 -07:00
e6126ef6a6
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:22:14 +00:00
f37af05f2a
[Keyboard] fixed one of the unicode drawings of the layout in dz60.h ( #14482 )
2021-09-21 21:22:04 -07:00
77bf0a5fc4
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:21:55 +00:00
88f6776216
[Keyboard] Add JadooKB JKB65 RGB ( #14525 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21 21:21:44 -07:00
e0022daf11
Changed VENDOR_ID and PRODUCT_ID of Boston keyboard ( #14528 )
2021-09-21 21:21:23 -07:00
02b7515c67
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:20:18 +00:00
88283cdab8
[Keyboard] Add commented out OLED/encoder code in default Kyria ( #14539 )
...
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-21 21:19:50 -07:00
975792bf53
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:18:59 +00:00
43e88f34aa
[Keyboard] add ein_60 ( #14398 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-21 21:18:25 -07:00
aa797aaa99
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 04:16:53 +00:00
208ea0e18c
[Keyboard] smallkeyboard fix of rgb matrix config ( #14548 )
2021-09-21 21:16:19 -07:00
2300f52ef5
Merge remote-tracking branch 'origin/master' into develop
2021-09-22 00:13:53 +00:00
033a318bdf
[Keyboard] Addition of VIA keymap and a few fixes for naked48 ( #14177 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-21 17:12:57 -07:00
QMK Bot
James Young
umi
drhigsby
Drashna Jaelre
Blake
Sets3n
Brandon Claveria
Caleb Lightfoot
Vinam Arora
kopibeng
milostatsea
WiZ.GG
Pylon
precondition
James Smith
Salicylic-acid3