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

Make processMouseAction() handle acceleration and deceleration, even though I can't yet trigger these actions for some reason.

Browse Source
This commit is contained in:
László Monda
2017-11-23 01:54:54 +01:00
parent 4d211f0fe1
commit b68e8a736e
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
right/src/usb_report_updater.c
View File

@@ -18,19 +18,17 @@
uint32_t UsbReportUpdateTime = 0; uint32_t UsbReportUpdateTime = 0;
static uint32_t elapsedTime; static uint32_t elapsedTime;
static float mouseMoveSpeed = 0.4;
static float mouseMoveInitialSpeed = 1; static float mouseMoveInitialSpeed = 1;
static float mouseMoveAcceleration = 4; static float mouseMoveBaseAcceleration = 3;
static float mouseMoveMaxSpeed = 5; static float mouseMoveBaseSpeed = 5;
static float mouseMoveAcceleratedSpeed = 10;
static float mouseMoveDeceleratedSpeed = 2.5;
static float mouseScrollSpeed = 0.1; static float mouseScrollSpeed = 0.1;
static float mouseScrollMaxSpeed = 0.1;
static float mouseAccelerateFactor = 2;
static float mouseDecelerateFactor = 0.5;
static bool isMouseMoving; static bool isMouseMoving;
static bool wasMouseMoving; static bool wasMouseMoving;
void processMouseAction(key_action_t *action) void processMouseAction(key_action_t *action)
{ {
static float mouseMoveCurrentSpeed; static float mouseMoveCurrentSpeed;
@@ -39,23 +37,28 @@ void processMouseAction(key_action_t *action)
mouseMoveCurrentSpeed = mouseMoveInitialSpeed; mouseMoveCurrentSpeed = mouseMoveInitialSpeed;
} }
if (action->mouse.speedActions) {
if (action->mouse.speedActions & MouseSpeed_Accelerate) {
if (mouseMoveSpeed < mouseMoveMaxSpeed) {
mouseMoveSpeed++;
}
} else if (action->mouse.speedActions & MouseSpeed_Decelerate) {
if (mouseMoveSpeed > 1) {
mouseMoveSpeed--;
}
}
}
if (action->mouse.moveActions) { if (action->mouse.moveActions) {
isMouseMoving = true; isMouseMoving = true;
mouseMoveCurrentSpeed += mouseMoveAcceleration * elapsedTime / 1000;
if (mouseMoveCurrentSpeed > mouseMoveMaxSpeed) { float targetSpeed;
mouseMoveCurrentSpeed = mouseMoveMaxSpeed; if (action->mouse.speedActions & MouseSpeed_Accelerate) {
targetSpeed = mouseMoveAcceleratedSpeed;
} else if (action->mouse.speedActions & MouseSpeed_Decelerate) {
targetSpeed = mouseMoveDeceleratedSpeed;
} else {
targetSpeed = mouseMoveBaseSpeed;
}
if (mouseMoveCurrentSpeed < targetSpeed) {
mouseMoveCurrentSpeed += mouseMoveBaseAcceleration * elapsedTime / 1000;
if (mouseMoveCurrentSpeed > targetSpeed) {
mouseMoveCurrentSpeed = targetSpeed;
}
} else {
mouseMoveCurrentSpeed -= mouseMoveBaseAcceleration * elapsedTime / 1000;
if (mouseMoveCurrentSpeed < targetSpeed) {
mouseMoveCurrentSpeed = targetSpeed;
}
} }
uint16_t distance = mouseMoveCurrentSpeed * elapsedTime / 10; uint16_t distance = mouseMoveCurrentSpeed * elapsedTime / 10;