diff --git a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp index a1190ff8..11424b69 100644 --- a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp +++ b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp @@ -29,7 +29,7 @@ #include "kaleidoscope/key_defs.h" // for Key, SYNTHETIC #include "kaleidoscope/keyswitch_state.h" // for keyToggledOn #include "kaleidoscope/plugin/mousekeys/MouseKeyDefs.h" // for KEY_MOUSE_BUTTON, KEY_MOUS... -#include "kaleidoscope/plugin/mousekeys/MouseWrapper.h" // for MouseWrapper, wrapper, WAR... +#include "kaleidoscope/plugin/mousekeys/MouseWrapper.h" // for MouseWrapper, WARP_DOWN namespace kaleidoscope { namespace plugin { @@ -37,7 +37,7 @@ namespace plugin { #ifndef NDEPRECATED #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -uint8_t MouseKeys::speed = 1; +uint8_t MouseKeys::speed = 1; uint16_t MouseKeys::speedDelay = 1; uint8_t MouseKeys::accelSpeed = 1; @@ -226,6 +226,7 @@ void MouseKeys::sendMouseWarpReport(const KeyEvent &event) const { void MouseKeys::sendMouseMoveReport() const { int8_t dx = 0; int8_t dy = 0; + uint8_t direction = directions_ & cursor_mask_; if (direction != 0) { @@ -252,7 +253,7 @@ void MouseKeys::sendMouseMoveReport() const { // Get the current point on the acceleration curve's x axis, translating time // elapsed since mouse movement started to a value between 0 and 255. uint8_t MouseKeys::accelStep() const { - uint16_t elapsed_time = Runtime.millisAtCycleStart() - cursor_start_time_; + uint16_t elapsed_time = Runtime.millisAtCycleStart() - cursor_start_time_; uint16_t accel_duration = settings_.cursor_accel_duration; if (elapsed_time > accel_duration) return 255; @@ -271,6 +272,7 @@ uint8_t accelFactor(uint8_t accel_step) { return 1 + (y >> 7); } else { uint16_t remaining_steps = 256 - accel_step; + uint16_t y = remaining_steps * remaining_steps; return 255 - (y >> 7); } @@ -303,9 +305,9 @@ uint8_t MouseKeys::cursorDelta() const { // difference between the starting speed and the full speed, then add the // starting speed (multiplied by the full value of the scaling factor) to get // the current speed. - uint8_t max_speed = settings_.cursor_base_speed; - uint8_t min_speed = settings_.cursor_init_speed; - uint8_t speed_range = max_speed - min_speed; + uint8_t max_speed = settings_.cursor_base_speed; + uint8_t min_speed = settings_.cursor_init_speed; + uint8_t speed_range = max_speed - min_speed; uint16_t subpixel_speed = (speed_range * accel_factor); subpixel_speed += (min_speed * 256); @@ -346,6 +348,7 @@ uint8_t MouseKeys::cursorDelta() const { void MouseKeys::sendMouseWheelReport() const { int8_t dh = 0; int8_t dv = 0; + uint8_t direction = directions_ >> wheel_offset_; if (direction != 0) { diff --git a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.h b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.h index 3dee363d..465fbd48 100644 --- a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.h +++ b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.h @@ -22,43 +22,42 @@ #include "kaleidoscope/event_handler_result.h" // for EventHandlerResult #include "kaleidoscope/key_defs.h" // for Key #include "kaleidoscope/plugin.h" // for Plugin - // ============================================================================= // Deprecated MousKeys code #include "kaleidoscope_internal/deprecations.h" // for DEPRECATED -#define _DEPRECATED_MESSAGE_MOUSEKEYS_SET_SPEED_LIMIT \ - "The `MouseKeys.setSpeedLimit()` function is deprecated. It no longer has\n" \ +#define _DEPRECATED_MESSAGE_MOUSEKEYS_SET_SPEED_LIMIT \ + "The `MouseKeys.setSpeedLimit()` function is deprecated. It no longer has\n" \ "any function, and can be safely removed." -#define _DEPRECATED_MESSAGE_MOUSEKEYS_SPEED \ - "Direct access to the `MouseKeys.speed` variable has been deprecated.\n" \ - "Please refer to the MouseKeys documentation for instructions on how to\n" \ +#define _DEPRECATED_MESSAGE_MOUSEKEYS_SPEED \ + "Direct access to the `MouseKeys.speed` variable has been deprecated.\n" \ + "Please refer to the MouseKeys documentation for instructions on how to\n" \ "configure the plugin.\n" -#define _DEPRECATED_MESSAGE_MOUSEKEYS_SPEED_DELAY \ - "Direct access to the `MouseKeys.speedDelay` variable has been deprecated.\n" \ - "Please refer to the MouseKeys documentation for instructions on how to\n" \ +#define _DEPRECATED_MESSAGE_MOUSEKEYS_SPEED_DELAY \ + "Direct access to the `MouseKeys.speedDelay` variable has been deprecated.\n" \ + "Please refer to the MouseKeys documentation for instructions on how to\n" \ "configure the plugin.\n" -#define _DEPRECATED_MESSAGE_MOUSEKEYS_ACCEL_SPEED \ - "Direct access to the `MouseKeys.accelSpeed` variable has been deprecated.\n" \ - "Please refer to the MouseKeys documentation for instructions on how to\n" \ +#define _DEPRECATED_MESSAGE_MOUSEKEYS_ACCEL_SPEED \ + "Direct access to the `MouseKeys.accelSpeed` variable has been deprecated.\n" \ + "Please refer to the MouseKeys documentation for instructions on how to\n" \ "configure the plugin.\n" -#define _DEPRECATED_MESSAGE_MOUSEKEYS_ACCEL_DELAY \ - "Direct access to the `MouseKeys.accelDelay` variable has been deprecated.\n" \ - "Please refer to the MouseKeys documentation for instructions on how to\n" \ +#define _DEPRECATED_MESSAGE_MOUSEKEYS_ACCEL_DELAY \ + "Direct access to the `MouseKeys.accelDelay` variable has been deprecated.\n" \ + "Please refer to the MouseKeys documentation for instructions on how to\n" \ "configure the plugin.\n" -#define _DEPRECATED_MESSAGE_MOUSEKEYS_WHEEL_SPEED \ - "Direct access to the `MouseKeys.wheelSpeed` variable has been deprecated.\n" \ - "Please refer to the MouseKeys documentation for instructions on how to\n" \ +#define _DEPRECATED_MESSAGE_MOUSEKEYS_WHEEL_SPEED \ + "Direct access to the `MouseKeys.wheelSpeed` variable has been deprecated.\n" \ + "Please refer to the MouseKeys documentation for instructions on how to\n" \ "configure the plugin.\n" -#define _DEPRECATED_MESSAGE_MOUSEKEYS_WHEEL_DELAY \ - "Direct access to the `MouseKeys.wheelDelay` variable has been deprecated.\n" \ - "Please refer to the MouseKeys documentation for instructions on how to\n" \ +#define _DEPRECATED_MESSAGE_MOUSEKEYS_WHEEL_DELAY \ + "Direct access to the `MouseKeys.wheelDelay` variable has been deprecated.\n" \ + "Please refer to the MouseKeys documentation for instructions on how to\n" \ "configure the plugin.\n" @@ -66,7 +65,6 @@ namespace kaleidoscope { namespace plugin { class MouseKeys : public kaleidoscope::Plugin { public: - #ifndef NDEPRECATED DEPRECATED(MOUSEKEYS_SPEED) static uint8_t speed; @@ -201,8 +199,8 @@ class MouseKeysConfig : public Plugin { uint16_t settings_addr_; }; -} // namespace plugin -} // namespace kaleidoscope +} // namespace plugin +} // namespace kaleidoscope extern kaleidoscope::plugin::MouseKeys MouseKeys; extern kaleidoscope::plugin::MouseKeysConfig MouseKeysConfig; diff --git a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.cpp b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.cpp index b17e2271..b3944b38 100644 --- a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.cpp +++ b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.cpp @@ -16,7 +16,7 @@ #include "kaleidoscope/plugin/mousekeys/MouseWrapper.h" -#include // for uint16_t, uint8_t, int8_t +#include // for uint16_t, uint8_t #include "kaleidoscope/Runtime.h" // for Runtime, Runtime_ #include "kaleidoscope/device/device.h" // for Base<>::HID, VirtualProps:... @@ -95,9 +95,9 @@ void MouseWrapper::warp(uint8_t warp_cmd) { warpJump(section_left, section_top, next_height, next_width); } -} // namespace mousekeys +} // namespace mousekeys mousekeys::MouseWrapper MouseWrapper; -} // namespace plugin -} // namespace kaleidoscope +} // namespace plugin +} // namespace kaleidoscope diff --git a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.h b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.h index 9e2813dd..e48b4ba1 100644 --- a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.h +++ b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.h @@ -16,9 +16,9 @@ #pragma once -#include // for uint8_t, uint16_t +#include // for uint16_t, uint8_t -#include "kaleidoscope/plugin/mousekeys/MouseWarpModes.h" +#include "kaleidoscope/plugin/mousekeys/MouseWarpModes.h" // for MOUSE_WARP_GRID_2X2 // Mouse acceleration @@ -63,9 +63,9 @@ class MouseWrapper { void warpJump(uint16_t left, uint16_t top, uint16_t height, uint16_t width); }; -} // namespace mousekeys +} // namespace mousekeys extern mousekeys::MouseWrapper MouseWrapper; -} // namespace plugin -} // namespace kaleidoscope +} // namespace plugin +} // namespace kaleidoscope