diff options
Diffstat (limited to 'keyboards/bastardkb/charybdis')
5 files changed, 7 insertions, 58 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c index 02cb89fe65..e458a84373 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c @@ -82,29 +82,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { EE_CLR, KC_NUKE, _______, _______, QK_BOOT ), }; - -#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill) -void keyboard_pre_init_keymap(void) { - setPinInputHigh(A0); -} - -void housekeeping_task_keymap(void) { - if (!readPin(A0)) { - reset_keyboard(); - } -} - -# ifdef USB_VBUS_PIN -bool usb_vbus_state(void) { - setPinInputLow(USB_VBUS_PIN); - wait_us(5); - return readPin(USB_VBUS_PIN); -} -# endif - -void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { - for (int32_t i = 0; i < 40; i++) { - __asm__ volatile("nop" ::: "memory"); - } -} -#endif diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk index ff4ede45ca..029b4a498b 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk @@ -40,6 +40,4 @@ ifeq ($(strip $(OVERLOAD_FEATURES)), yes) CUSTOM_UNICODE_ENABLE = yes CUSTOM_POINTING_DEVICE = yes CUSTOM_SPLIT_TRANSPORT_SYNC = yes - - DEBOUNCE_TYPE = asym_eager_defer_pk endif diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h index 07c4bfc008..7fa9826125 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h @@ -65,3 +65,5 @@ #define BOOTMAGIC_LITE_EEPROM_COLUMN 0 #define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 1 #define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 0 + +#define DEBOUNCE 15 diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c index 85bb2bc77f..31d1e92a7f 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { SFT_T(KC_SPACE), ALT_T(KC_Q), _______ ), [_MOUSE] = LAYOUT_charybdis_4x6( - _______, _______, _______, _______, _______, _______, _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, PD_JIGGLER, _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, DRGSCRL, _______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING, _______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______, @@ -130,28 +130,6 @@ void keyboard_post_init_keymap(void) { void keyboard_pre_init_keymap(void) { setPinInputHigh(A0); } - -void housekeeping_task_keymap(void) { - if (!readPin(A0)) { - reset_keyboard(); - } -} -#endif - -#ifdef USB_VBUS_PIN -bool usb_vbus_state(void) { - setPinInputLow(USB_VBUS_PIN); - wait_us(5); - return readPin(USB_VBUS_PIN); -} -#endif - -#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill) -void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { - for (int32_t i = 0; i < 40; i++) { - __asm__ volatile("nop" ::: "memory"); - } -} #endif #ifdef SWAP_HANDS_ENABLE diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk index 0b7759f156..ef6b7cd24b 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk @@ -1,6 +1,7 @@ CUSTOM_UNICODE_ENABLE = no CUSTOM_POINTING_DEVICE = no CUSTOM_SPLIT_TRANSPORT_SYNC = no +PER_KEY_TAPPING = yes ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill) # MCU name @@ -16,16 +17,13 @@ ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill) OVERLOAD_FEATURES = yes endif -ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/stemcell) - OVERLOAD_FEATURES = yes -endif -ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/splinky) - OVERLOAD_FEATURES = yes -endif ifeq ($(strip $(MCU)), atmega32u4) LTO_ENABLE = yes BOOTLOADER = qmk-hid BOOTLOADER_SIZE = 512 + EXTRAKEY_ENABLE = no +else + OVERLOAD_FEATURES = yes endif ifeq ($(strip $(OVERLOAD_FEATURES)), yes) @@ -43,7 +41,6 @@ ifeq ($(strip $(OVERLOAD_FEATURES)), yes) CAPS_WORD_ENABLE = yes SWAP_HANDS_ENABLE = yes TAP_DANCE_ENABLE = yes - DEBOUNCE_TYPE = asym_eager_defer_pk WPM_ENABLE = yes LTO_ENABLE = no # OPT = 3 |