diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
| commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
| tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /layouts/community/split_3x6_3/drashna | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'layouts/community/split_3x6_3/drashna')
| -rw-r--r-- | layouts/community/split_3x6_3/drashna/config.h | 2 | ||||
| -rw-r--r-- | layouts/community/split_3x6_3/drashna/keymap.c | 4 | ||||
| -rw-r--r-- | layouts/community/split_3x6_3/drashna/rules.mk | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h index 0ef36d1f32..e43ad5e3ac 100644 --- a/layouts/community/split_3x6_3/drashna/config.h +++ b/layouts/community/split_3x6_3/drashna/config.h @@ -26,7 +26,7 @@ #undef USE_I2C #undef SSD1306OLED -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 // #define TAPPING_TERM 100 #ifdef RGBLIGHT_ENABLE diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c index 59f5fefb48..7e051b6b5c 100644 --- a/layouts/community/split_3x6_3/drashna/keymap.c +++ b/layouts/community/split_3x6_3/drashna/keymap.c @@ -79,14 +79,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [_RAISE] = LAYOUT_split_3x6_3_wrapper( \ + [_RAISE] = LAYOUT_split_3x6_3_wrapper( _______, _________________RAISE_L1__________________, _________________RAISE_R1__________________, _______, _______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS, _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______, _______, _______, _______, _______, _______, _______ ), - [_ADJUST] = LAYOUT_split_3x6_3_wrapper( \ + [_ADJUST] = LAYOUT_split_3x6_3_wrapper( QK_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, QK_BOOT, VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EE_CLR, KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL, diff --git a/layouts/community/split_3x6_3/drashna/rules.mk b/layouts/community/split_3x6_3/drashna/rules.mk index 3fd4279bef..2d07ad5a77 100644 --- a/layouts/community/split_3x6_3/drashna/rules.mk +++ b/layouts/community/split_3x6_3/drashna/rules.mk @@ -22,9 +22,6 @@ USE_ARM_CONFIG ?= no ifeq ($(strip $(CONVERT_TO)), proton_c) USE_ARM_CONFIG = yes endif -ifeq ($(strip $(CTPC)), yes) - USE_ARM_CONFIG = yes -endif ifeq ($(strip $(MCU)), STM32F303) USE_ARM_CONFIG = yes endif |