diff options
| author | QMK Bot <hello@qmk.fm> | 2021-12-15 04:54:21 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-12-15 04:54:21 +0000 |
| commit | c0bb15315170f9265143833ad879b7c8f87b06ac (patch) | |
| tree | 3a61a9cec73aac6c0172af3bf48efda147dedef9 /layouts | |
| parent | 3c5b9f70f5faf9215d654b4f5d92c1ea6b34248a (diff) | |
| parent | 3fa592a4024a24a636fa0c562e6761667a94f565 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/community/ergodox/drashna/rules.mk | 10 | ||||
| -rw-r--r-- | layouts/community/ortho_5x12/drashna/rules.mk | 1 | ||||
| -rw-r--r-- | layouts/community/split_3x6_3/drashna/rules.mk | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk index 853f1efd24..61b6263071 100644 --- a/layouts/community/ergodox/drashna/rules.mk +++ b/layouts/community/ergodox/drashna/rules.mk @@ -1,4 +1,4 @@ -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite TAP_DANCE_ENABLE = no COMMAND_ENABLE = no # Commands for debug and configuration CONSOLE_ENABLE = no @@ -9,12 +9,12 @@ ifeq ($(strip $(KEYBOARD)), ergodox_ez) RGB_MATRIX_ENABLE = yes INDICATOR_LIGHTS = no RGBLIGHT_STARTUP_ANIMATION = yes - PIMORONI_TRACKBALL_ENABLE = yes + PIMORONI_TRACKBALL_ENABLE = no MOUSEKEY_ENABLE = no endif -UNICODE_ENABLE = no -UNICDOEMAP_ENABLE = no - +UNICODE_ENABLE = no +UNICDOEMAP_ENABLE = no +CUSTOM_UNICODE_ENABLE = no DEBOUNCE_TYPE = sym_eager_pr diff --git a/layouts/community/ortho_5x12/drashna/rules.mk b/layouts/community/ortho_5x12/drashna/rules.mk index 69a025cc03..98ac829092 100644 --- a/layouts/community/ortho_5x12/drashna/rules.mk +++ b/layouts/community/ortho_5x12/drashna/rules.mk @@ -14,4 +14,5 @@ ifeq ($(strip $(KEYBOARD)), fractal) RGBLIGHT_ENABLE = yes RGBLIGHT_STARTUP_ANIMATION = yes BOOTLOADER = qmk-dfu + CUSTOM_UNICODE_ENABLE = no endif diff --git a/layouts/community/split_3x6_3/drashna/rules.mk b/layouts/community/split_3x6_3/drashna/rules.mk index edc9304fec..cf2dfbdc88 100644 --- a/layouts/community/split_3x6_3/drashna/rules.mk +++ b/layouts/community/split_3x6_3/drashna/rules.mk @@ -32,6 +32,7 @@ ifeq ($(strip $(CTPC)), yes) SWAP_HANDS_ENABLE = yes WPM_ENABLE = yes else + CUSTOM_UNICODE_ENABLE = no BOOTLOADER = qmk-hid BOOTLOADER_SIZE = 512 endif |