Merge pull request #1029 from gedankenexperimenter/remove-diagonalize

pull/1038/head
Jesse Vincent 4 years ago committed by GitHub
commit 32446ae18c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -110,15 +110,6 @@ uint8_t MouseWrapper_::acceleration(uint8_t cycles) {
}
}
// Get the diagonalized version of a value, i.e. value * sqrt(2) / 2. If the
// value ends up being zero, return the original value instead.
static int16_t diagonalize(int16_t value) {
// 99 / 140 closely approximates sqrt(2) / 2. Since integer division
// truncates towards zero we do not need to worry about truncation errors.
int16_t diagonalValue = value * 99 / 140;
return (diagonalValue == 0 ? value : diagonalValue);
}
void MouseWrapper_::move(int8_t x, int8_t y) {
int16_t moveX = 0;
int16_t moveY = 0;
@ -126,15 +117,6 @@ void MouseWrapper_::move(int8_t x, int8_t y) {
static int8_t remainderY = 0;
int16_t effectiveSpeedLimit = speedLimit;
if (x != 0 && y != 0) {
// For diagonal movements, we apply a diagonalized speed limit. The
// effective speed limit is set based on whether we are moving diagonally.
effectiveSpeedLimit = diagonalize(effectiveSpeedLimit);
x = diagonalize(x);
y = diagonalize(y);
}
if (x != 0) {
moveX = remainderX + (x * acceleration(accelStep));
if (moveX > effectiveSpeedLimit) moveX = effectiveSpeedLimit;
@ -149,7 +131,7 @@ void MouseWrapper_::move(int8_t x, int8_t y) {
end_warping();
// move by whole pixels, not subpixels
Kaleidoscope.hid().mouse().move(moveX / subpixelsPerPixel, moveY / subpixelsPerPixel, 0);
Kaleidoscope.hid().mouse().move(moveX / subpixelsPerPixel, moveY / subpixelsPerPixel);
// save leftover subpixel movements for later
remainderX = moveX - moveX / subpixelsPerPixel * subpixelsPerPixel;
remainderY = moveY - moveY / subpixelsPerPixel * subpixelsPerPixel;

Loading…
Cancel
Save