alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'fbe4c44179'
${ noResults }
Kaleidoscope/src/Kaleidoscope-MouseKeys.cpp

120 lines
3.2 KiB
Raw Normal View History Unescape

Lifted out of KeyboardioFirmware This is the same Keyboardio-MouseKeys that lived in core KeyboardioFirmware up until this point. It has been lifted out, the same GPL-2 license file added, along with a README, and the URL in library.properties has been updated. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
#include <Arduino.h>
The Big Rename Renamed the library to Kaleidoscope-MouseKeys, and followed up with other renames. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
#include "Kaleidoscope-MouseKeys.h"
Lifted out of KeyboardioFirmware This is the same Keyboardio-MouseKeys that lived in core KeyboardioFirmware up until this point. It has been lifted out, the same GPL-2 license file added, along with a README, and the URL in library.properties has been updated. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
#include "MouseWrapper.h"
The Big Rename Renamed the library to Kaleidoscope-MouseKeys, and followed up with other renames. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
#include "Kaleidoscope.h"
Lifted out of KeyboardioFirmware This is the same Keyboardio-MouseKeys that lived in core KeyboardioFirmware up until this point. It has been lifted out, the same GPL-2 license file added, along with a README, and the URL in library.properties has been updated. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
Some small code cleanups Move the hooks inside the `MouseKeys_` object, and drop the `handle_mouse_key_event` function, by inlining it into the event handler hook. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
uint8_t MouseKeys_::mouseMoveIntent;
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
uint8_t MouseKeys_::speed = 1;
uint16_t MouseKeys_::speedDelay = 0;
uint8_t MouseKeys_::accelSpeed = 1;
uint16_t MouseKeys_::accelDelay = 50;
Implement mouse wheel support With these changes, the vertical scrolling of the mouse wheel is now properly supported. It has no acceleration, because the wheel doesn't have one either. It has a delay, however, which I tried to tune to a reasonable speed. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
uint8_t MouseKeys_::wheelSpeed = 1;
uint16_t MouseKeys_::wheelDelay = 50;
Improved timer handling Instead of calculating time deltas every time we want to check a timeout, calculate the projected end ahead of time. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
uint32_t MouseKeys_::accelEndTime;
uint32_t MouseKeys_::endTime;
Implement mouse wheel support With these changes, the vertical scrolling of the mouse wheel is now properly supported. It has no acceleration, because the wheel doesn't have one either. It has a delay, however, which I tried to tune to a reasonable speed. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
uint32_t MouseKeys_::wheelEndTime;
void MouseKeys_::scrollWheel(uint8_t keyCode) {
if (millis() < wheelEndTime)
return;
wheelEndTime = millis() + wheelDelay;
if (keyCode & KEY_MOUSE_UP)
Mouse.move(0, 0, wheelSpeed);
else if (keyCode & KEY_MOUSE_DOWN)
Mouse.move(0, 0, -wheelSpeed);
}
Make diagonal mouse movement considerably smoother Instead of acting on mouse movement keys immediately in the event handler hook, just store them, and act on them during a loop hook. This has the effect of collecting all movement intents noticed in a full scan, and acting on them in one go, rather than acting individually. This makes diagonal movement (up & right keys pressed at the same time) a lot smoother, at the cost of a few ms of delay. The delay is not noticeable, and the smoothing would be a good trade anyway. No more jerky diagonal movements! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
Some small code cleanups Move the hooks inside the `MouseKeys_` object, and drop the `handle_mouse_key_event` function, by inlining it into the event handler hook. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
void MouseKeys_::loopHook(bool postClear) {
Make diagonal mouse movement considerably smoother Instead of acting on mouse movement keys immediately in the event handler hook, just store them, and act on them during a loop hook. This has the effect of collecting all movement intents noticed in a full scan, and acting on them in one go, rather than acting individually. This makes diagonal movement (up & right keys pressed at the same time) a lot smoother, at the cost of a few ms of delay. The delay is not noticeable, and the smoothing would be a good trade anyway. No more jerky diagonal movements! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
if (postClear) {
mouseMoveIntent = 0;
return;
}
Use a single accel counter Instead of calculating separate acceleration for the x and y axes, use only a single one, that applies to both axes. Thus, holding mouse up, and then pressing and holding right will move the mouse cursor in a straight diagonal line, instead of a curve. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
if (mouseMoveIntent == 0) {
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
MouseWrapper.accelStep = 0;
Improved timer handling Instead of calculating time deltas every time we want to check a timeout, calculate the projected end ahead of time. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
endTime = 0;
accelEndTime = 0;
Use a single accel counter Instead of calculating separate acceleration for the x and y axes, use only a single one, that applies to both axes. Thus, holding mouse up, and then pressing and holding right will move the mouse cursor in a straight diagonal line, instead of a curve. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
return;
}
Improved timer handling Instead of calculating time deltas every time we want to check a timeout, calculate the projected end ahead of time. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
if (millis() < endTime)
return;
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
Improved timer handling Instead of calculating time deltas every time we want to check a timeout, calculate the projected end ahead of time. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
endTime = millis() + speedDelay;
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
Minor mouse movement optimalisation When acting on `moveIntent`, set up the direction first, and move the cursor only once, instead of twice (once for each axis). This makes the movement even smoother, and also saves us a few bytes of code. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
int8_t moveX = 0, moveY = 0;
Improved timer handling Instead of calculating time deltas every time we want to check a timeout, calculate the projected end ahead of time. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
if (millis() >= accelEndTime) {
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
if (MouseWrapper.accelStep < 255 - accelSpeed)
MouseWrapper.accelStep += accelSpeed;
}
Use a single accel counter Instead of calculating separate acceleration for the x and y axes, use only a single one, that applies to both axes. Thus, holding mouse up, and then pressing and holding right will move the mouse cursor in a straight diagonal line, instead of a curve. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
Make diagonal mouse movement considerably smoother Instead of acting on mouse movement keys immediately in the event handler hook, just store them, and act on them during a loop hook. This has the effect of collecting all movement intents noticed in a full scan, and acting on them in one go, rather than acting individually. This makes diagonal movement (up & right keys pressed at the same time) a lot smoother, at the cost of a few ms of delay. The delay is not noticeable, and the smoothing would be a good trade anyway. No more jerky diagonal movements! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
if (mouseMoveIntent & KEY_MOUSE_UP)
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
moveY = -speed;
Make diagonal mouse movement considerably smoother Instead of acting on mouse movement keys immediately in the event handler hook, just store them, and act on them during a loop hook. This has the effect of collecting all movement intents noticed in a full scan, and acting on them in one go, rather than acting individually. This makes diagonal movement (up & right keys pressed at the same time) a lot smoother, at the cost of a few ms of delay. The delay is not noticeable, and the smoothing would be a good trade anyway. No more jerky diagonal movements! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
else if (mouseMoveIntent & KEY_MOUSE_DOWN)
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
moveY = speed;
Make diagonal mouse movement considerably smoother Instead of acting on mouse movement keys immediately in the event handler hook, just store them, and act on them during a loop hook. This has the effect of collecting all movement intents noticed in a full scan, and acting on them in one go, rather than acting individually. This makes diagonal movement (up & right keys pressed at the same time) a lot smoother, at the cost of a few ms of delay. The delay is not noticeable, and the smoothing would be a good trade anyway. No more jerky diagonal movements! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
if (mouseMoveIntent & KEY_MOUSE_LEFT)
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
moveX = -speed;
Make diagonal mouse movement considerably smoother Instead of acting on mouse movement keys immediately in the event handler hook, just store them, and act on them during a loop hook. This has the effect of collecting all movement intents noticed in a full scan, and acting on them in one go, rather than acting individually. This makes diagonal movement (up & right keys pressed at the same time) a lot smoother, at the cost of a few ms of delay. The delay is not noticeable, and the smoothing would be a good trade anyway. No more jerky diagonal movements! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
else if (mouseMoveIntent & KEY_MOUSE_RIGHT)
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
moveX = speed;
Minor mouse movement optimalisation When acting on `moveIntent`, set up the direction first, and move the cursor only once, instead of twice (once for each axis). This makes the movement even smoother, and also saves us a few bytes of code. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
MouseWrapper.move(moveX, moveY);
Make diagonal mouse movement considerably smoother Instead of acting on mouse movement keys immediately in the event handler hook, just store them, and act on them during a loop hook. This has the effect of collecting all movement intents noticed in a full scan, and acting on them in one go, rather than acting individually. This makes diagonal movement (up & right keys pressed at the same time) a lot smoother, at the cost of a few ms of delay. The delay is not noticeable, and the smoothing would be a good trade anyway. No more jerky diagonal movements! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
}
Some small code cleanups Move the hooks inside the `MouseKeys_` object, and drop the `handle_mouse_key_event` function, by inlining it into the event handler hook. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
Key MouseKeys_::eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState) {
Lifted out of KeyboardioFirmware This is the same Keyboardio-MouseKeys that lived in core KeyboardioFirmware up until this point. It has been lifted out, the same GPL-2 license file added, along with a README, and the URL in library.properties has been updated. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
if (mappedKey.flags != (SYNTHETIC | IS_MOUSE_KEY))
return mappedKey;
Reuse the button bit for WARP_END WARP + Button makes no sense together, so reuse the _BUTTON bit for _WARP_END. This will allow us to use the free'd up bit for something else. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
if (mappedKey.keyCode & KEY_MOUSE_BUTTON && !(mappedKey.keyCode & KEY_MOUSE_WARP)) {
Lifted out of KeyboardioFirmware This is the same Keyboardio-MouseKeys that lived in core KeyboardioFirmware up until this point. It has been lifted out, the same GPL-2 license file added, along with a README, and the URL in library.properties has been updated. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
uint8_t button = mappedKey.keyCode & ~KEY_MOUSE_BUTTON;
if (key_toggled_on(keyState)) {
MouseWrapper.press_button(button);
} else if (key_toggled_off(keyState)) {
MouseWrapper.release_button(button);
}
} else if (!(mappedKey.keyCode & KEY_MOUSE_WARP)) {
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
if (key_toggled_on(keyState)) {
Improved timer handling Instead of calculating time deltas every time we want to check a timeout, calculate the projected end ahead of time. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
endTime = millis() + speedDelay;
accelEndTime = millis() + accelDelay;
Implement mouse wheel support With these changes, the vertical scrolling of the mouse wheel is now properly supported. It has no acceleration, because the wheel doesn't have one either. It has a delay, however, which I tried to tune to a reasonable speed. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
wheelEndTime = 0;
}
if (key_is_pressed(keyState)) {
if (mappedKey.keyCode & KEY_MOUSE_WHEEL) {
scrollWheel (mappedKey.keyCode);
}
else
mouseMoveIntent |= mappedKey.keyCode;
Introducing the tuning knobs Instead of counting loops for the purpose of calculating acceleration, use timers and steps instead. This means that we can now tune how often the mouse moves (`speedDelay`), how much it moves when it does (`speed`), how fast acceleration is (`accelSpeed`), and how often we accelerate (`accelDelay`). By default, the movement speed is one, and there is no delay, while acceleration has an 50ms delay, and a speed of one. But all of these can be tuned at run-time: we can turn off acceleration completely, or slow down the mouse considerably - the possibilities are almost endless! Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
}
Lifted out of KeyboardioFirmware This is the same Keyboardio-MouseKeys that lived in core KeyboardioFirmware up until this point. It has been lifted out, the same GPL-2 license file added, along with a README, and the URL in library.properties has been updated. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
} else if (key_toggled_on(keyState)) {
if (mappedKey.keyCode & KEY_MOUSE_WARP && mappedKey.flags & IS_MOUSE_KEY) {
// we don't pass in the left and up values because those are the
// default, "no-op" conditionals
MouseWrapper.warp( ((mappedKey.keyCode & KEY_MOUSE_WARP_END) ? WARP_END : 0x00) |
((mappedKey.keyCode & KEY_MOUSE_DOWN) ? WARP_DOWN : 0x00) |
((mappedKey.keyCode & KEY_MOUSE_RIGHT) ? WARP_RIGHT : 0x00) );
}
}
return Key_NoKey;
}
MouseKeys_::MouseKeys_(void) {
}
void
MouseKeys_::begin (void) {
Some small code cleanups Move the hooks inside the `MouseKeys_` object, and drop the `handle_mouse_key_event` function, by inlining it into the event handler hook. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
event_handler_hook_use(eventHandlerHook);
loop_hook_use(loopHook);
Lifted out of KeyboardioFirmware This is the same Keyboardio-MouseKeys that lived in core KeyboardioFirmware up until this point. It has been lifted out, the same GPL-2 license file added, along with a README, and the URL in library.properties has been updated. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
8 years ago
}
MouseKeys_ MouseKeys;