uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement mouse acceleration.

Browse Source
This commit is contained in:
László Monda
2017-11-21 21:15:12 +01:00
parent 4bbc49f4ca
commit 8429ee2b71
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
right/src/key_action.h
View File

@@ -1,5 +1,5 @@
#ifndef __ACTION_H__ #ifndef __KEY_ACTION_H__
#define __ACTION_H__ #define __KEY_ACTION_H__
// Includes: // Includes:

23
right/src/usb_report_updater.c
View File

@@ -19,7 +19,9 @@ uint32_t UsbReportUpdateTime = 0;
static uint32_t elapsedTime; static uint32_t elapsedTime;
static float mouseMoveSpeed = 0.4; static float mouseMoveSpeed = 0.4;
static float mouseMoveMaxSpeed = 10; static float mouseMoveInitialSpeed = 1;
static float mouseMoveAcceleration = 5;
static float mouseMoveMaxSpeed = 5;
static float mouseScrollSpeed = 0.1; static float mouseScrollSpeed = 0.1;
static float mouseScrollMaxSpeed = 0.1; static float mouseScrollMaxSpeed = 0.1;
@@ -27,9 +29,16 @@ static float mouseScrollMaxSpeed = 0.1;
static float mouseAccelerateFactor = 2; static float mouseAccelerateFactor = 2;
static float mouseDecelerateFactor = 0.5; static float mouseDecelerateFactor = 0.5;
static bool isMouseActionProcessed;
static bool wasMouseActionProcessed;
void processMouseAction(key_action_t *action) void processMouseAction(key_action_t *action)
{ {
uint16_t distance = mouseMoveSpeed * elapsedTime; static float mouseMoveCurrentSpeed;
isMouseActionProcessed = true;
if (!wasMouseActionProcessed) {
mouseMoveCurrentSpeed = mouseMoveInitialSpeed;
}
if (action->mouse.speedActions) { if (action->mouse.speedActions) {
if (action->mouse.speedActions & MouseSpeed_Accelerate) { if (action->mouse.speedActions & MouseSpeed_Accelerate) {
@@ -44,6 +53,13 @@ void processMouseAction(key_action_t *action)
} }
if (action->mouse.moveActions) { if (action->mouse.moveActions) {
mouseMoveCurrentSpeed += mouseMoveAcceleration * elapsedTime / 1000;
if (mouseMoveCurrentSpeed > mouseMoveMaxSpeed) {
mouseMoveCurrentSpeed = mouseMoveMaxSpeed;
}
uint16_t distance = mouseMoveCurrentSpeed * elapsedTime / 10;
if (action->mouse.moveActions & MouseMove_Left) { if (action->mouse.moveActions & MouseMove_Left) {
ActiveUsbMouseReport->x = -distance; ActiveUsbMouseReport->x = -distance;
} else if (action->mouse.moveActions & MouseMove_Right) { } else if (action->mouse.moveActions & MouseMove_Right) {
@@ -132,6 +148,9 @@ static secondary_role_t secondaryRole;
void updateActiveUsbReports(void) void updateActiveUsbReports(void)
{ {
wasMouseActionProcessed = isMouseActionProcessed;
isMouseActionProcessed = false;
static uint8_t previousModifiers = 0; static uint8_t previousModifiers = 0;
elapsedTime = Timer_GetElapsedTime(&UsbReportUpdateTime); elapsedTime = Timer_GetElapsedTime(&UsbReportUpdateTime);