Merge remote-tracking branch 'qmk/master' into merge-2023-03-12

This commit is contained in:
Ilya Zhuravlev
2023-03-18 17:51:58 -06:00
19466 changed files with 296791 additions and 222541 deletions

View File

@ -36,34 +36,48 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# endif
# ifndef MOUSEKEY_MOVE_DELTA
# ifndef MK_KINETIC_SPEED
# define MOUSEKEY_MOVE_DELTA 8
# else
# if defined(MK_KINETIC_SPEED)
# define MOUSEKEY_MOVE_DELTA 16
# elif defined(MOUSEKEY_INERTIA)
# define MOUSEKEY_MOVE_DELTA 1
# else
# define MOUSEKEY_MOVE_DELTA 8
# endif
# endif
# ifndef MOUSEKEY_WHEEL_DELTA
# define MOUSEKEY_WHEEL_DELTA 1
# endif
# ifndef MOUSEKEY_DELAY
# ifndef MK_KINETIC_SPEED
# define MOUSEKEY_DELAY 10
# else
# if defined(MK_KINETIC_SPEED)
# define MOUSEKEY_DELAY 5
# elif defined(MOUSEKEY_INERTIA)
# define MOUSEKEY_DELAY 150 // allow single-pixel movements before repeat activates
# else
# define MOUSEKEY_DELAY 10
# endif
# endif
# ifndef MOUSEKEY_INTERVAL
# ifndef MK_KINETIC_SPEED
# define MOUSEKEY_INTERVAL 20
# else
# if defined(MK_KINETIC_SPEED)
# define MOUSEKEY_INTERVAL 10
# elif defined(MOUSEKEY_INERTIA)
# define MOUSEKEY_INTERVAL 16 // 60 fps
# else
# define MOUSEKEY_INTERVAL 20
# endif
# endif
# ifndef MOUSEKEY_MAX_SPEED
# define MOUSEKEY_MAX_SPEED 10
# if defined(MOUSEKEY_INERTIA)
# define MOUSEKEY_MAX_SPEED 32
# else
# define MOUSEKEY_MAX_SPEED 10
# endif
# endif
# ifndef MOUSEKEY_TIME_TO_MAX
# define MOUSEKEY_TIME_TO_MAX 30
# if defined(MOUSEKEY_INERTIA)
# define MOUSEKEY_TIME_TO_MAX 32
# else
# define MOUSEKEY_TIME_TO_MAX 30
# endif
# endif
# ifndef MOUSEKEY_WHEEL_DELAY
# define MOUSEKEY_WHEEL_DELAY 10
@ -78,6 +92,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define MOUSEKEY_WHEEL_TIME_TO_MAX 40
# endif
# ifndef MOUSEKEY_FRICTION
# define MOUSEKEY_FRICTION 24 // 0 to 255
# endif
# ifndef MOUSEKEY_INITIAL_SPEED
# define MOUSEKEY_INITIAL_SPEED 100
# endif