Merge remote-tracking branch 'upstream/master' into develop
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
Merge remote-tracking branch 'origin/master' into develop
[Docs] update Japanese translation of feature_backlight.md (#14403)
* update feature_backlight.md translation
* update file based on comments
Merge remote-tracking branch 'origin/master' into develop
[Docs] update Japanese translation of feature_advanced_keycodes.md (#14309)
* update feature_advanced_keycodes.md translation
* update file based on comments
Merge remote-tracking branch 'origin/master' into develop
[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
Merge remote-tracking branch 'origin/master' into develop
[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
Merge remote-tracking branch 'origin/master' into develop
[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
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'upstream/master' into develop
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
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Fix default keymap for Draytronics Elise V2 keyboard (#14562)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Disable console on Smallkeyboard (#14561)