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

Merge pull request #103 from Lauszus/dev

Browse Source 
Cast mouseElapsedTime to float when calculating the speed and distance
This commit is contained in:
László Monda
2018-04-08 22:24:31 +02:00
committed by GitHub
parent 7763d8a32b 9670523310
commit b4ac82d2c0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
right/src/usb_report_updater.c
View File

@@ -87,18 +87,18 @@ static void processMouseKineticState(mouse_kinetic_state_t *kineticState)
if (isMoveAction) { if (isMoveAction) {
if (kineticState->currentSpeed < kineticState->targetSpeed) { if (kineticState->currentSpeed < kineticState->targetSpeed) {
kineticState->currentSpeed += acceleration * mouseElapsedTime / 1000; kineticState->currentSpeed += acceleration * (float)mouseElapsedTime / 1000.0f;
if (kineticState->currentSpeed > kineticState->targetSpeed) { if (kineticState->currentSpeed > kineticState->targetSpeed) {
kineticState->currentSpeed = kineticState->targetSpeed; kineticState->currentSpeed = kineticState->targetSpeed;
} }
} else { } else {
kineticState->currentSpeed -= acceleration * mouseElapsedTime / 1000; kineticState->currentSpeed -= acceleration * (float)mouseElapsedTime / 1000.0f;
if (kineticState->currentSpeed < kineticState->targetSpeed) { if (kineticState->currentSpeed < kineticState->targetSpeed) {
kineticState->currentSpeed = kineticState->targetSpeed; kineticState->currentSpeed = kineticState->targetSpeed;
} }
} }
float distance = kineticState->currentSpeed * mouseElapsedTime / 1000; float distance = kineticState->currentSpeed * (float)mouseElapsedTime / 1000.0f;
if (kineticState->isScroll && !kineticState->wasMoveAction) { if (kineticState->isScroll && !kineticState->wasMoveAction) {