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

Clean up the debug lines of processMouseAction()

Browse Source
This commit is contained in:
László Monda
2017-11-28 22:45:51 +01:00
parent 7318175ce7
commit b7e73b7b38
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
right/src/usb_report_updater.c
View File

@@ -96,7 +96,6 @@ void processMouseKineticState(mouse_kinetic_state_t *kineticState)
} }
float distance = kineticState->currentSpeed * elapsedTime / 1000; float distance = kineticState->currentSpeed * elapsedTime / 1000;
kineticState->distance = distance;
if (activeMouseStates[kineticState->leftState]) { if (activeMouseStates[kineticState->leftState]) {
kineticState->xSum -= distance; kineticState->xSum -= distance;
@@ -137,16 +136,18 @@ void processMouseActions()
processMouseKineticState(&mouseScrollState); processMouseKineticState(&mouseScrollState);
ActiveUsbMouseReport->wheelX = mouseScrollState.xOut; ActiveUsbMouseReport->wheelX = mouseScrollState.xOut;
*(float*)(DebugBuffer + 50) = mouseScrollState.currentSpeed;
*(uint16_t*)(DebugBuffer + 54) = mouseScrollState.xOut;
*(float*)(DebugBuffer + 56) = mouseScrollState.xSum;
*(float*)(DebugBuffer + 60) = mouseScrollState.distance;
// SetDebugBufferFloat(60, mouseScrollState.currentSpeed);
ActiveUsbMouseReport->wheelY = mouseScrollState.yOut; ActiveUsbMouseReport->wheelY = mouseScrollState.yOut;
// SetDebugBufferFloat(62, mouseScrollState.ySum);
mouseScrollState.xOut = 0; mouseScrollState.xOut = 0;
mouseScrollState.yOut = 0; mouseScrollState.yOut = 0;
// The following line makes the firmware crash for some reason:
// SetDebugBufferFloat(60, mouseScrollState.currentSpeed);
// TODO: Figure out why.
// Oddly, the following line (which is the inlined version of the above) works:
// *(float*)(DebugBuffer + 60) = mouseScrollState.currentSpeed;
// The value parameter of SetDebugBufferFloat() seems to be the culprit because
// if it's not used within the function it doesn't crash anymore.
if (activeMouseStates[SerializedMouseAction_LeftClick]) { if (activeMouseStates[SerializedMouseAction_LeftClick]) {
ActiveUsbMouseReport->buttons |= MouseButton_Left; ActiveUsbMouseReport->buttons |= MouseButton_Left;
} }

1
right/src/usb_report_updater.h
View File

@@ -51,7 +51,6 @@
mouse_speed_t prevMouseSpeed; mouse_speed_t prevMouseSpeed;
float intMultiplier; float intMultiplier;
float currentSpeed; float currentSpeed;
float distance;
float targetSpeed; float targetSpeed;
uint8_t initialSpeed; uint8_t initialSpeed;
uint8_t acceleration; uint8_t acceleration;