From dfe3646dd785f58407393e84c02b4ad86094453e Mon Sep 17 00:00:00 2001 From: Ryan Neff Date: Sat, 25 Nov 2023 14:43:28 -0800 Subject: [PATCH] Moved mouse config to .json --- keyboards/sofle_pico/info.json | 7 +++++++ keyboards/sofle_pico/keymaps/default/config.h | 10 ++-------- keyboards/sofle_pico/keymaps/jellytitan/config.h | 10 ++-------- keyboards/sofle_pico/keymaps/jellytitan/rules.mk | 2 -- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/keyboards/sofle_pico/info.json b/keyboards/sofle_pico/info.json index 0bccf640a7d..d468826d22c 100644 --- a/keyboards/sofle_pico/info.json +++ b/keyboards/sofle_pico/info.json @@ -12,6 +12,13 @@ "pin": "GP0", "driver": "vendor" }, + "mouse_key": { + "enabled": true, + "delay": 10, + "interval": 16, + "max_speed": 2, + "time_to_max": 40 + } "rgb_matrix": { "driver": "ws2812", "max_brightness": 128, diff --git a/keyboards/sofle_pico/keymaps/default/config.h b/keyboards/sofle_pico/keymaps/default/config.h index 03fc25f7498..f9144c6c59b 100644 --- a/keyboards/sofle_pico/keymaps/default/config.h +++ b/keyboards/sofle_pico/keymaps/default/config.h @@ -13,16 +13,10 @@ #define TAPPING_TERM 210 /* Allows for the setting of constant mouse speed levels. */ -/* Delay between pressing a movement key and cursor movement */ -#define MOUSEKEY_DELAY 10 -/* Time between cursor movements in milliseconds */ -#define MOUSEKEY_INTERVAL 16 +/* Not all mouse wheel config settings are currently supported in .json config.*/ +/* https://github.com/qmk/qmk_firmware/blob/master/docs/reference_info_json.md */ /* Step size */ #define MOUSEKEY_MOVE_DELTA 8 -/* Maximum cursor speed at which acceleration stops */ -#define MOUSEKEY_MAX_SPEED 2 -/* Time until maximum cursor speed is reached */ -#define MOUSEKEY_TIME_TO_MAX 40 /* Maximum number of scroll steps per scroll action */ #define MOUSEKEY_WHEEL_MAX_SPEED 42 /* Time until maximum scroll speed is reached */ diff --git a/keyboards/sofle_pico/keymaps/jellytitan/config.h b/keyboards/sofle_pico/keymaps/jellytitan/config.h index 9ba447d360b..c6e92cefcbe 100644 --- a/keyboards/sofle_pico/keymaps/jellytitan/config.h +++ b/keyboards/sofle_pico/keymaps/jellytitan/config.h @@ -21,16 +21,10 @@ #define TAPPING_TERM 210 /* Allows for the setting of constant mouse speed levels. */ -/* Delay between pressing a movement key and cursor movement */ -#define MOUSEKEY_DELAY 10 -/* Time between cursor movements in milliseconds */ -#define MOUSEKEY_INTERVAL 16 +/* Not all mouse wheel config settings are currently supported in .json config.*/ +/* https://github.com/qmk/qmk_firmware/blob/master/docs/reference_info_json.md */ /* Step size */ #define MOUSEKEY_MOVE_DELTA 8 -/* Maximum cursor speed at which acceleration stops */ -#define MOUSEKEY_MAX_SPEED 2 -/* Time until maximum cursor speed is reached */ -#define MOUSEKEY_TIME_TO_MAX 40 /* Maximum number of scroll steps per scroll action */ #define MOUSEKEY_WHEEL_MAX_SPEED 42 /* Time until maximum scroll speed is reached */ diff --git a/keyboards/sofle_pico/keymaps/jellytitan/rules.mk b/keyboards/sofle_pico/keymaps/jellytitan/rules.mk index f716a785edd..b6489e4076d 100644 --- a/keyboards/sofle_pico/keymaps/jellytitan/rules.mk +++ b/keyboards/sofle_pico/keymaps/jellytitan/rules.mk @@ -1,7 +1,5 @@ # Enables Audio control and System control Keycodes EXTRAKEY_ENABLE = yes -# Enables Mousekeys -MOUSEKEY_ENABLE = yes # Encoder Support ENCODER_ENABLE = yes # Use Enocoder Mapping