diff options
author | Drashna Jaelre <drashna@live.com> | 2021-12-29 20:17:34 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-29 20:17:34 -0800 |
commit | c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf (patch) | |
tree | 67dc381a45d59626132c4c59b71c4b36fa971f8b /layouts/community/split_3x6_3 | |
parent | 1a8a842cfb3e87a82afb57ba29ca59c5fa6fe97b (diff) | |
download | qmk_firmware-c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf.tar.gz qmk_firmware-c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf.zip |
[Keymap] Reorganization, cleanup and readmes for drashna code (#15617)
Diffstat (limited to 'layouts/community/split_3x6_3')
-rw-r--r-- | layouts/community/split_3x6_3/drashna/config.h | 4 | ||||
-rw-r--r-- | layouts/community/split_3x6_3/drashna/keymap.c | 5 | ||||
-rw-r--r-- | layouts/community/split_3x6_3/drashna/rules.mk | 35 |
3 files changed, 23 insertions, 21 deletions
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h index b86448c67..cfcb873a8 100644 --- a/layouts/community/split_3x6_3/drashna/config.h +++ b/layouts/community/split_3x6_3/drashna/config.h | |||
@@ -93,3 +93,7 @@ | |||
93 | #endif | 93 | #endif |
94 | 94 | ||
95 | #define TAPPING_TERM_PER_KEY | 95 | #define TAPPING_TERM_PER_KEY |
96 | #ifdef TAPPING_TERM | ||
97 | # undef TAPPING_TERM | ||
98 | #endif | ||
99 | #define TAPPING_TERM 200 | ||
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c index 7c31972e3..476ca5fce 100644 --- a/layouts/community/split_3x6_3/drashna/keymap.c +++ b/layouts/community/split_3x6_3/drashna/keymap.c | |||
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
90 | KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET, | 90 | KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET, |
91 | VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST, | 91 | VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST, |
92 | KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL, | 92 | KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL, |
93 | HPT_TOG, KC_NUKE, _______, _______, TG_MODS, HPT_FBK | 93 | AUTO_CTN,KC_NUKE, _______, _______, TG_MODS, HPT_FBK |
94 | ) | 94 | ) |
95 | }; | 95 | }; |
96 | // clang-format on | 96 | // clang-format on |
@@ -265,7 +265,7 @@ void check_default_layer(uint8_t mode, uint8_t type, uint8_t led_min, uint8_t le | |||
265 | } | 265 | } |
266 | } | 266 | } |
267 | 267 | ||
268 | void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { | 268 | bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) { |
269 | if (userspace_config.rgb_layer_change) { | 269 | if (userspace_config.rgb_layer_change) { |
270 | switch (get_highest_layer(layer_state)) { | 270 | switch (get_highest_layer(layer_state)) { |
271 | case _GAMEPAD: | 271 | case _GAMEPAD: |
@@ -291,5 +291,6 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { | |||
291 | } | 291 | } |
292 | check_default_layer(0, LED_FLAG_MODIFIER, led_min, led_max); | 292 | check_default_layer(0, LED_FLAG_MODIFIER, led_min, led_max); |
293 | } | 293 | } |
294 | return false; | ||
294 | } | 295 | } |
295 | #endif | 296 | #endif |
diff --git a/layouts/community/split_3x6_3/drashna/rules.mk b/layouts/community/split_3x6_3/drashna/rules.mk index cf2dfbdc8..9164dcdeb 100644 --- a/layouts/community/split_3x6_3/drashna/rules.mk +++ b/layouts/community/split_3x6_3/drashna/rules.mk | |||
@@ -1,9 +1,8 @@ | |||
1 | |||
2 | # Build Options | 1 | # Build Options |
3 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options |
4 | # the appropriate keymap folder that will get included automatically | ||
5 | # | 3 | # |
6 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite | 4 | |
5 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite | ||
7 | MOUSEKEY_ENABLE = no # Mouse keys | 6 | MOUSEKEY_ENABLE = no # Mouse keys |
8 | EXTRAKEY_ENABLE = yes # Audio control and System control | 7 | EXTRAKEY_ENABLE = yes # Audio control and System control |
9 | CONSOLE_ENABLE = no # Console for debug | 8 | CONSOLE_ENABLE = no # Console for debug |
@@ -12,27 +11,25 @@ NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see her | |||
12 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 11 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
13 | AUDIO_ENABLE = no # Audio output | 12 | AUDIO_ENABLE = no # Audio output |
14 | UNICODE_ENABLE = no # Unicode | 13 | UNICODE_ENABLE = no # Unicode |
15 | BLUETOOTH_ENABLE = no # Enable Bluetooth | ||
16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 14 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
17 | SWAP_HANDS_ENABLE = no # Enable one-hand typing | 15 | SWAP_HANDS_ENABLE = no # Enable one-hand typing |
18 | 16 | ||
19 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | ||
20 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
21 | |||
22 | ifeq ($(strip $(KEYBOARD)), crkbd/rev1) | 17 | ifeq ($(strip $(KEYBOARD)), crkbd/rev1) |
23 | OLED_ENABLE = yes | 18 | OLED_ENABLE = yes |
24 | RGB_MATRIX_ENABLE = yes | 19 | RGB_MATRIX_ENABLE = yes |
25 | HAPTIC_ENABLE = no | 20 | HAPTIC_ENABLE = no |
26 | endif | 21 | endif |
27 | 22 | ||
28 | ifeq ($(strip $(CTPC)), yes) | 23 | ifeq ($(strip $(CTPC)), yes) |
29 | HAPTIC_ENABLE = no | 24 | HAPTIC_ENABLE = no |
30 | WS2812_DRIVER = pwm # won't work without a patch to the ctpc mk file | 25 | WS2812_DRIVER = pwm # won't work without a patch to the ctpc mk file |
31 | SERIAL_DRIVER = usart | 26 | SERIAL_DRIVER = usart |
32 | SWAP_HANDS_ENABLE = yes | 27 | SWAP_HANDS_ENABLE = yes |
33 | WPM_ENABLE = yes | 28 | WPM_ENABLE = yes |
29 | AUTOCORRECTION_ENABLE = yes | ||
30 | CAPS_WORD_ENABLE = yes | ||
34 | else | 31 | else |
35 | CUSTOM_UNICODE_ENABLE = no | 32 | CUSTOM_UNICODE_ENABLE = no |
36 | BOOTLOADER = qmk-hid | 33 | BOOTLOADER = qmk-hid |
37 | BOOTLOADER_SIZE = 512 | 34 | BOOTLOADER_SIZE = 512 |
38 | endif | 35 | endif |