[Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271)
This commit is contained in:
Drashna Jaelre
GitHub
parent
c1e5c920a9
commit
37aef4ebe1
9 changed files with 132 additions and 114 deletions
|
|
@ -30,7 +30,7 @@
|
|||
# ifdef WPM_ENABLE
|
||||
# define SPLIT_WPM_ENABLE
|
||||
# endif
|
||||
# ifdef OLED_DRIVER_ENABLE
|
||||
# ifdef OLED_ENABLE
|
||||
# define SPLIT_OLED_ENABLE
|
||||
# endif
|
||||
# if defined(__AVR__) && !defined(SELECT_SOFT_SERIAL_SPEED)
|
||||
|
|
@ -130,14 +130,6 @@
|
|||
# define DISABLE_RGB_MATRIX_SOLID_SPLASH
|
||||
# define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
|
||||
# endif // AVR
|
||||
# ifndef RGB_MATRIX_REST_MODE
|
||||
# if defined(SPLIT_KEYBOARD) || defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_moonlander)
|
||||
# define RGB_MATRIX_REST_MODE RGB_MATRIX_CYCLE_OUT_IN_DUAL
|
||||
# else
|
||||
# define RGB_MATRIX_REST_MODE RGB_MATRIX_CYCLE_OUT_IN
|
||||
# endif
|
||||
# endif
|
||||
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_REST_MODE
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
|
||||
#ifdef OLED_ENABLE
|
||||
|
|
@ -171,11 +163,6 @@
|
|||
# define ONESHOT_TIMEOUT 3000
|
||||
#endif // !ONESHOT_TIMEOUT
|
||||
|
||||
#ifdef QMK_KEYS_PER_SCAN
|
||||
# undef QMK_KEYS_PER_SCAN
|
||||
#endif
|
||||
#define QMK_KEYS_PER_SCAN 4
|
||||
|
||||
// this makes it possible to do rolling combos (zx) with keys that
|
||||
// convert to other keys on hold (z becomes ctrl when you hold it,
|
||||
// and when this option isn't enabled, z rapidly followed by x
|
||||
|
|
@ -213,13 +200,6 @@
|
|||
# undef LOCKING_RESYNC_ENABLE
|
||||
#endif
|
||||
|
||||
#if !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_32BIT)
|
||||
# define LAYER_STATE_16BIT
|
||||
#endif
|
||||
#ifndef DYNAMIC_KEYMAP_LAYER_COUNT
|
||||
# define DYNAMIC_KEYMAP_LAYER_COUNT 11
|
||||
#endif
|
||||
|
||||
#ifdef CONVERT_TO_PROTON_C
|
||||
// pins that are available but not present on Pro Micro
|
||||
# define A3 PAL_LINE(GPIOA, 3)
|
||||
|
|
@ -238,79 +218,3 @@
|
|||
# define C14 PAL_LINE(GPIOC, 14)
|
||||
# define C15 PAL_LINE(GPIOC, 15)
|
||||
#endif
|
||||
|
||||
#ifdef MOUSEKEY_ENABLE
|
||||
// mouse movement config
|
||||
# ifdef MK_3_SPEED
|
||||
# undef MK_3_SPEED
|
||||
# endif
|
||||
# define MK_KINETIC_SPEED
|
||||
# ifdef MK_KINETIC_SPEED
|
||||
# ifndef MOUSEKEY_DELAY
|
||||
# define MOUSEKEY_DELAY 8
|
||||
# endif
|
||||
# ifndef MOUSEKEY_INTERVAL
|
||||
# define MOUSEKEY_INTERVAL 20
|
||||
# endif
|
||||
# ifdef MOUSEKEY_MOVE_DELTA
|
||||
# define MOUSEKEY_MOVE_DELTA 25
|
||||
# endif
|
||||
# else
|
||||
# ifndef MOUSEKEY_DELAY
|
||||
# define MOUSEKEY_DELAY 300
|
||||
# endif
|
||||
# ifndef MOUSEKEY_INTERVAL
|
||||
# define MOUSEKEY_INTERVAL 50
|
||||
# endif
|
||||
# ifndef MOUSEKEY_MOVE_DELTA
|
||||
# define MOUSEKEY_MOVE_DELTA 5
|
||||
# endif
|
||||
# endif
|
||||
# ifndef MOUSEKEY_MAX_SPEED
|
||||
# define MOUSEKEY_MAX_SPEED 7
|
||||
# endif
|
||||
# ifndef MOUSEKEY_TIME_TO_MAX
|
||||
# define MOUSEKEY_TIME_TO_MAX 60
|
||||
# endif
|
||||
# ifndef MOUSEKEY_INITIAL_SPEED
|
||||
# define MOUSEKEY_INITIAL_SPEED 100
|
||||
# endif
|
||||
# ifndef MOUSEKEY_BASE_SPEED
|
||||
# define MOUSEKEY_BASE_SPEED 1000
|
||||
# endif
|
||||
# ifndef MOUSEKEY_DECELERATED_SPEED
|
||||
# define MOUSEKEY_DECELERATED_SPEED 400
|
||||
# endif
|
||||
# ifndef MOUSEKEY_ACCELERATED_SPEED
|
||||
# define MOUSEKEY_ACCELERATED_SPEED 3000
|
||||
# endif
|
||||
// mouse scroll config
|
||||
# ifndef MOUSEKEY_WHEEL_DELAY
|
||||
# define MOUSEKEY_WHEEL_DELAY 15
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_DELTA
|
||||
# define MOUSEKEY_WHEEL_DELTA 1
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_INTERVAL
|
||||
# define MOUSEKEY_WHEEL_INTERVAL 50
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_MAX_SPEED
|
||||
# define MOUSEKEY_WHEEL_MAX_SPEED 8
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_TIME_TO_MAX
|
||||
# define MOUSEKEY_WHEEL_TIME_TO_MAX 80
|
||||
# endif
|
||||
// mouse scroll kinetic config
|
||||
# ifndef MOUSEKEY_WHEEL_INITIAL_MOVEMENTS
|
||||
# define MOUSEKEY_WHEEL_INITIAL_MOVEMENTS 8
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_BASE_MOVEMENTS
|
||||
# define MOUSEKEY_WHEEL_BASE_MOVEMENTS 48
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS
|
||||
# define MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS 48
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS
|
||||
# define MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS 8
|
||||
# endif
|
||||
#endif // MOUSEKEY_ENABLE
|
||||
|
|
|
|||
|
|
@ -50,11 +50,17 @@ static const char PROGMEM code_to_name[0xFF] = {
|
|||
};
|
||||
// clang-format on
|
||||
|
||||
void add_keylog(uint16_t keycode) {
|
||||
void add_keylog(uint16_t keycode, keyrecord_t *record) {
|
||||
if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
|
||||
keycode = keycode & 0xFF;
|
||||
} else if (keycode > 0xFF) {
|
||||
keycode = 0;
|
||||
if (((keycode & 0xFF) == KC_BSPC) && mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_CTRL) {
|
||||
memset(keylog_str, ' ', sizeof(keylog_str) - 1);
|
||||
return;
|
||||
}
|
||||
if (record->tap.count) {
|
||||
keycode = keycode & 0xFF;
|
||||
} else if (keycode > 0xFF) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
for (uint8_t i = 1; i < KEYLOGGER_LENGTH; i++) {
|
||||
|
|
@ -72,7 +78,7 @@ bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
|
|||
if (record->event.pressed) {
|
||||
#ifdef OLED_ENABLE
|
||||
oled_timer = timer_read32();
|
||||
add_keylog(keycode);
|
||||
add_keylog(keycode, record);
|
||||
#endif
|
||||
}
|
||||
return true;
|
||||
|
|
@ -384,9 +390,8 @@ void render_status_main(void) {
|
|||
__attribute__((weak)) oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return rotation; }
|
||||
|
||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
||||
for (uint8_t i = 0; i < (KEYLOGGER_LENGTH - 1); i++) {
|
||||
add_keylog(0);
|
||||
}
|
||||
memset(keylog_str, ' ', sizeof(keylog_str) - 1);
|
||||
|
||||
return oled_init_keymap(rotation);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,3 +38,102 @@
|
|||
# define RGBLIGHT_EFFECT_TWINKLE
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
# ifndef RGB_MATRIX_REST_MODE
|
||||
# if defined(SPLIT_KEYBOARD) || defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_moonlander)
|
||||
# define RGB_MATRIX_REST_MODE RGB_MATRIX_CYCLE_OUT_IN_DUAL
|
||||
# else
|
||||
# define RGB_MATRIX_REST_MODE RGB_MATRIX_CYCLE_OUT_IN
|
||||
# endif
|
||||
# endif
|
||||
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_REST_MODE
|
||||
#endif
|
||||
|
||||
#ifdef QMK_KEYS_PER_SCAN
|
||||
# undef QMK_KEYS_PER_SCAN
|
||||
#endif
|
||||
#define QMK_KEYS_PER_SCAN 4
|
||||
|
||||
#ifdef MOUSEKEY_ENABLE
|
||||
// mouse movement config
|
||||
# ifdef MK_3_SPEED
|
||||
# undef MK_3_SPEED
|
||||
# endif
|
||||
# define MK_KINETIC_SPEED
|
||||
# ifdef MK_KINETIC_SPEED
|
||||
# ifndef MOUSEKEY_DELAY
|
||||
# define MOUSEKEY_DELAY 8
|
||||
# endif
|
||||
# ifndef MOUSEKEY_INTERVAL
|
||||
# define MOUSEKEY_INTERVAL 20
|
||||
# endif
|
||||
# ifndef MOUSEKEY_MOVE_DELTA
|
||||
# define MOUSEKEY_MOVE_DELTA 25
|
||||
# endif
|
||||
# else
|
||||
# ifndef MOUSEKEY_DELAY
|
||||
# define MOUSEKEY_DELAY 300
|
||||
# endif
|
||||
# ifndef MOUSEKEY_INTERVAL
|
||||
# define MOUSEKEY_INTERVAL 50
|
||||
# endif
|
||||
# ifndef MOUSEKEY_MOVE_DELTA
|
||||
# define MOUSEKEY_MOVE_DELTA 5
|
||||
# endif
|
||||
# endif
|
||||
# ifndef MOUSEKEY_MAX_SPEED
|
||||
# define MOUSEKEY_MAX_SPEED 7
|
||||
# endif
|
||||
# ifndef MOUSEKEY_TIME_TO_MAX
|
||||
# define MOUSEKEY_TIME_TO_MAX 60
|
||||
# endif
|
||||
# ifndef MOUSEKEY_INITIAL_SPEED
|
||||
# define MOUSEKEY_INITIAL_SPEED 100
|
||||
# endif
|
||||
# ifndef MOUSEKEY_BASE_SPEED
|
||||
# define MOUSEKEY_BASE_SPEED 1000
|
||||
# endif
|
||||
# ifndef MOUSEKEY_DECELERATED_SPEED
|
||||
# define MOUSEKEY_DECELERATED_SPEED 400
|
||||
# endif
|
||||
# ifndef MOUSEKEY_ACCELERATED_SPEED
|
||||
# define MOUSEKEY_ACCELERATED_SPEED 3000
|
||||
# endif
|
||||
// mouse scroll config
|
||||
# ifndef MOUSEKEY_WHEEL_DELAY
|
||||
# define MOUSEKEY_WHEEL_DELAY 15
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_DELTA
|
||||
# define MOUSEKEY_WHEEL_DELTA 1
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_INTERVAL
|
||||
# define MOUSEKEY_WHEEL_INTERVAL 50
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_MAX_SPEED
|
||||
# define MOUSEKEY_WHEEL_MAX_SPEED 8
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_TIME_TO_MAX
|
||||
# define MOUSEKEY_WHEEL_TIME_TO_MAX 80
|
||||
# endif
|
||||
// mouse scroll kinetic config
|
||||
# ifndef MOUSEKEY_WHEEL_INITIAL_MOVEMENTS
|
||||
# define MOUSEKEY_WHEEL_INITIAL_MOVEMENTS 8
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_BASE_MOVEMENTS
|
||||
# define MOUSEKEY_WHEEL_BASE_MOVEMENTS 48
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS
|
||||
# define MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS 48
|
||||
# endif
|
||||
# ifndef MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS
|
||||
# define MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS 8
|
||||
# endif
|
||||
#endif // MOUSEKEY_ENABLE
|
||||
|
||||
#if !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_32BIT)
|
||||
# define LAYER_STATE_16BIT
|
||||
#endif
|
||||
#ifndef DYNAMIC_KEYMAP_LAYER_COUNT
|
||||
# define DYNAMIC_KEYMAP_LAYER_COUNT 11
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue