From 1b29979433b25c83c15f851dc8156efba704b1e2 Mon Sep 17 00:00:00 2001 From: Florian Didron Date: Thu, 18 Mar 2021 10:07:38 +0900 Subject: Increase mouse wheel key delay (#333) * feat: increase mouse wheel key delay * feat: increase mouse wheel key delay for the Planck --- keyboards/ergodox_ez/config.h | 2 +- keyboards/moonlander/config.h | 2 +- keyboards/planck/ez/config.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index 64289666de..65d307d28c 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -49,7 +49,7 @@ along with this program. If not, see . #define MOUSEKEY_DELAY 0 #define MOUSEKEY_TIME_TO_MAX 60 #define MOUSEKEY_MAX_SPEED 7 -#define MOUSEKEY_WHEEL_DELAY MOUSEKEY_DELAY +#define MOUSEKEY_WHEEL_DELAY 400 #define MOUSEKEY_WHEEL_INTERVAL MOUSEKEY_INTERVAL #define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED #define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h index 459630a006..d49c33de8c 100644 --- a/keyboards/moonlander/config.h +++ b/keyboards/moonlander/config.h @@ -108,7 +108,7 @@ along with this program. If not, see . #define MOUSEKEY_DELAY 0 #define MOUSEKEY_TIME_TO_MAX 60 #define MOUSEKEY_MAX_SPEED 7 -#define MOUSEKEY_WHEEL_DELAY MOUSEKEY_DELAY +#define MOUSEKEY_WHEEL_DELAY 400 #define MOUSEKEY_WHEEL_INTERVAL MOUSEKEY_INTERVAL #define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED #define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index 1ead277542..e5071f7e0c 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h @@ -164,7 +164,7 @@ #define MOUSEKEY_DELAY 0 #define MOUSEKEY_TIME_TO_MAX 60 #define MOUSEKEY_MAX_SPEED 7 -#define MOUSEKEY_WHEEL_DELAY MOUSEKEY_DELAY +#define MOUSEKEY_WHEEL_DELAY 400 #define MOUSEKEY_WHEEL_INTERVAL MOUSEKEY_INTERVAL #define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED #define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX -- cgit v1.2.3 From 53d1cfb7058b5010556f85dd527fc6db4596364e Mon Sep 17 00:00:00 2001 From: Florian Didron Date: Thu, 18 Mar 2021 10:07:50 +0900 Subject: Adds caps lock led status on Moonlander/Ergodox (#332) * feat: adds caps lock led status on Moonlander/Ergodox * fix: botched source file * fix: light up the most right leds --- keyboards/ergodox_ez/ergodox_ez.c | 13 +++++++++++++ keyboards/moonlander/moonlander.c | 15 ++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c index a2bbbfe09d..6b76b1d8cb 100644 --- a/keyboards/ergodox_ez/ergodox_ez.c +++ b/keyboards/ergodox_ez/ergodox_ez.c @@ -470,5 +470,18 @@ void matrix_scan_kb(void) { } #endif +#ifdef CAPS_LOCK_STATUS + led_t led_state = host_keyboard_led_state(); + if(led_state.caps_lock) { + ergodox_right_led_3_on(); + } + else { + uint8_t layer = get_highest_layer(layer_state); + if(layer != 1) { + ergodox_right_led_3_off(); + } + } +#endif + matrix_scan_user(); } diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index 52cccc9727..42c119c2d9 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -128,7 +128,20 @@ void moonlander_led_task(void) { wait_ms(150); } #endif - +#ifdef CAPS_LOCK_STATUS + else { + led_t led_state = host_keyboard_led_state(); + if(led_state.caps_lock) { + ML_LED_6(true); + } + else { + uint8_t layer = get_highest_layer(layer_state); + if(layer != 1) { + ML_LED_6(false); + } + } + } +#endif } static THD_WORKING_AREA(waLEDThread, 128); -- cgit v1.2.3