diff options
Diffstat (limited to 'keyboards/handwired/tractyl_manuform')
8 files changed, 41 insertions, 105 deletions
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk index 7fef013a38..d2d2a9b874 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk +++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk @@ -6,4 +6,3 @@ TAP_DANCE_ENABLE = yes UNICODE_ENABLE = yes OLED_ENABLE = yes WPM_ENABLE = yes -# DEBOUNCE_TYPE = sym_eager_pk diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 2ab49de9fa..73ea40fb76 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -32,10 +32,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_TARGET_PERIOD 800000 -#define RGBLED_NUM 52 +#define RGBLED_NUM 57 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT \ - { 26, 26 } + { 26, 31 } #define DEBUG_LED_PIN C13 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h deleted file mode 100644 index 0e33129e1a..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#ifndef RGBLIGHT_LIMIT_VAL -# if defined(OLED_ENABLE) -# define RGBLIGHT_LIMIT_VAL 100 -# else -# define RGBLIGHT_LIMIT_VAL 150 -# endif -#endif - -#ifndef OLED_BRIGHTNESS -# ifdef RGBLIGHT_ENABLE -# define OLED_BRIGHTNESS 80 -# else -# define OLED_BRIGHTNESS 150 -# endif -#endif diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h index f159a69174..a449a126d6 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h @@ -16,21 +16,21 @@ #pragma once -#define DEBOUNCE 45 - -#ifdef OLED_DRIVER_SH1107 -# undef OLED_DISPLAY_128X64 -#endif +#undef OLED_DISPLAY_128X64 +#define OLED_DISPLAY_128X128 +#define OLED_BRIGHTNESS 200 #define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200 #define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200 #define CHARYBDIS_MINIMUM_SNIPING_DPI 400 #define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 200 -#define ENCODER_DEFAULT_POS 0x3 - - #define BOOTMAGIC_LITE_EEPROM_ROW 1 #define BOOTMAGIC_LITE_EEPROM_COLUMN 0 #define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 7 #define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 5 + + +#define FB_ERM_LRA 0 +#define DRV_GREETING alert_750ms +#define DRV_MODE_DEFAULT buzz diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c index 93d3529edb..380e17fb09 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c @@ -90,8 +90,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_V, _______, _______ ), [_MOUSE] = LAYOUT_5x6_right( - _______, _______, _______, _______, _______, _______, DRGSCRL, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, SNP_TOG, - _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, 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, _______, _______, _______, _______, _______, _______, @@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS, _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______, _______, _______, _______, _______, - _______, _______, _______, + OL_LOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), @@ -126,96 +126,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { UC_NEXT, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY, TG(_DIABLOII), AUTO_CTN, TG_GAME, TG_DBLO, _______, QK_RBT, KC_NUKE, - _______, _______, _______, + HF_TOGG, _______, _______, _______, _______, KC_NUKE, _______ ), }; // clang-format on -#ifdef ENCODER_ENABLE -# ifdef ENCODER_MAP_ENABLE +#ifdef ENCODER_MAP_ENABLE // clang-format off const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW( KC_VOLD, KC_VOLU ), ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) }, + [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW( KC_VOLU, KC_VOLD ), ENCODER_CCW_CW( KC_WH_U, KC_WH_D ) }, [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, [_DEFAULT_LAYER_3] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, [_DEFAULT_LAYER_4] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, [_GAMEPAD] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, [_DIABLO] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, - [_MOUSE] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) }, + [_MOUSE] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, [_MEDIA] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, - [_RAISE] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( KC_PGDN, KC_PGUP ) }, - [_LOWER] = { ENCODER_CCW_CW( RGB_MOD, RGB_RMOD), ENCODER_CCW_CW( RGB_HUD, RGB_HUI ) }, - [_ADJUST] = { ENCODER_CCW_CW( CK_DOWN, CK_UP ), ENCODER_CCW_CW( _______, _______ ) }, + [_RAISE] = { ENCODER_CCW_CW( OL_BINC, OL_BDEC ), ENCODER_CCW_CW( KC_PGDN, KC_PGUP ) }, + [_LOWER] = { ENCODER_CCW_CW( RGB_MOD, RGB_RMOD), ENCODER_CCW_CW( RGB_HUI, RGB_HUD ) }, + [_ADJUST] = { ENCODER_CCW_CW( CK_UP, CK_DOWN ), ENCODER_CCW_CW( _______, _______ ) }, }; // clang-format on -# else - -deferred_token encoder_token = INVALID_DEFERRED_TOKEN; -static int8_t last_direction = -1; - -static uint32_t encoder_callback(uint32_t trigger_time, void *cb_arg) { - unregister_code(last_direction ? KC_WH_D : KC_WH_U); - last_direction = -1; - return 0; -} - -bool encoder_update_user(uint8_t index, bool clockwise) { -# ifdef SWAP_HANDS_ENABLE - if (swap_hands) { - index ^= 1; - } -# endif - if (index == 0) { - tap_code_delay(clockwise ? KC_VOLD : KC_VOLU, 5); - } else if (index == 1) { - if (last_direction != clockwise || encoder_token == INVALID_DEFERRED_TOKEN) { - uint8_t keycode = clockwise ? KC_WH_D : KC_WH_U; - last_direction = clockwise; - if (encoder_token != INVALID_DEFERRED_TOKEN) { - if (cancel_deferred_exec(encoder_token)) { - encoder_token = INVALID_DEFERRED_TOKEN; - } - unregister_code(clockwise ? KC_WH_U : KC_WH_D); - } - register_code(keycode); - encoder_token = defer_exec(MOUSEKEY_WHEEL_DELAY + MOUSEKEY_WHEEL_INTERVAL, encoder_callback, NULL); - } else { - extend_deferred_exec(encoder_token, MOUSEKEY_WHEEL_INTERVAL); - } - } - return false; -} -# endif #endif #ifdef OLED_ENABLE -# include "keyrecords/unicode.h" - oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_180; } -void oled_render_large_display(bool side) { - if (side) { - render_wpm_graph(56, 64); - } else { - oled_advance_page(true); - oled_advance_page(true); - - // clang-format off - static const char PROGMEM logo[] = { - 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - }; - // clang-format on - oled_write_P(logo, false); - - render_unicode_mode(1, 14); - } -} - void render_oled_title(bool side) { oled_write_P(side ? PSTR(" Tractyl ") : PSTR(" Manuform "), true); } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk index acec28fa6e..9f5341e973 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk @@ -5,7 +5,6 @@ CUSTOM_BOOTMAGIC_ENABLE = no CUSTOM_UNICODE_ENABLE = no HAPTIC_ENABLE = no OLED_ENABLE = no -OLED_DRIVER = custom RGBLIGHT_ENABLE = no SWAP_HANDS_ENABLE = no TAP_DANCE_ENABLE = no @@ -16,12 +15,14 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c) BOOTLOADER_SIZE = 512 CUSTOM_SPLIT_TRANSPORT_SYNC = no LTO_ENABLE = yes + MOUSEKEY_ENABLE = no endif ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/arduinomicro) BOOTLOADER = qmk-hid BOOTLOADER_SIZE = 512 CUSTOM_SPLIT_TRANSPORT_SYNC = no LTO_ENABLE = yes + MOUSEKEY_ENABLE = no endif ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp) AUTOCORRECT_ENABLE = no @@ -33,8 +34,9 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411) AUTOCORRECT_ENABLE = yes LTO_SUPPORTED = no OVERLOAD_FEATURES = yes + HAPTIC_ENABLE = yes + HAPTIC_DRIVER = DRV2605L endif -# DEBOUNCE_TYPE = sym_eager_pk ifeq ($(strip $(OVERLOAD_FEATURES)), yes) AUDIO_ENABLE = yes diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h index dd5da75821..ce8e65e924 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h @@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_SPLIT #define RGBLED_SPLIT \ { 10, 10 } -#define OLED_BRIGHTNESS 50 +#define RGBLIGHT_LIMIT_VAL 80 #define DEBUG_LED_PIN D6 diff --git a/keyboards/handwired/tractyl_manuform/post_config.h b/keyboards/handwired/tractyl_manuform/post_config.h index c48518ddd3..b5d67132b2 100644 --- a/keyboards/handwired/tractyl_manuform/post_config.h +++ b/keyboards/handwired/tractyl_manuform/post_config.h @@ -94,3 +94,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef DEBOUNCE # define DEBOUNCE 5 #endif + +#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_LIMIT_VAL) +# if defined(OLED_ENABLE) +# define RGBLIGHT_LIMIT_VAL 100 +# else +# define RGBLIGHT_LIMIT_VAL 150 +# endif +#endif + +#if !defined(OLED_BRIGHTNESS) +# if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +# define OLED_BRIGHTNESS 80 +# else +# define OLED_BRIGHTNESS 150 +# endif +#endif |