diff options
Diffstat (limited to 'common/mousekey.c')
| -rw-r--r-- | common/mousekey.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/common/mousekey.c b/common/mousekey.c index 222d9e445..58a6e35bb 100644 --- a/common/mousekey.c +++ b/common/mousekey.c | |||
| @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #include <stdint.h> | 18 | #include <stdint.h> |
| 19 | #include <util/delay.h> | 19 | #include <util/delay.h> |
| 20 | #include "usb_keycodes.h" | 20 | #include "keycode.h" |
| 21 | #include "host.h" | 21 | #include "host.h" |
| 22 | #include "timer.h" | 22 | #include "timer.h" |
| 23 | #include "print.h" | 23 | #include "print.h" |
| @@ -90,36 +90,36 @@ void mousekey_task(void) | |||
| 90 | 90 | ||
| 91 | void mousekey_on(uint8_t code) | 91 | void mousekey_on(uint8_t code) |
| 92 | { | 92 | { |
| 93 | if (code == KB_MS_UP) report.y = MOUSEKEY_MOVE_INIT * -1; | 93 | if (code == KC_MS_UP) report.y = MOUSEKEY_MOVE_INIT * -1; |
| 94 | else if (code == KB_MS_DOWN) report.y = MOUSEKEY_MOVE_INIT; | 94 | else if (code == KC_MS_DOWN) report.y = MOUSEKEY_MOVE_INIT; |
| 95 | else if (code == KB_MS_LEFT) report.x = MOUSEKEY_MOVE_INIT * -1; | 95 | else if (code == KC_MS_LEFT) report.x = MOUSEKEY_MOVE_INIT * -1; |
| 96 | else if (code == KB_MS_RIGHT) report.x = MOUSEKEY_MOVE_INIT; | 96 | else if (code == KC_MS_RIGHT) report.x = MOUSEKEY_MOVE_INIT; |
| 97 | else if (code == KB_MS_WH_UP) report.v = MOUSEKEY_WHEEL_INIT; | 97 | else if (code == KC_MS_WH_UP) report.v = MOUSEKEY_WHEEL_INIT; |
| 98 | else if (code == KB_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_INIT * -1; | 98 | else if (code == KC_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_INIT * -1; |
| 99 | else if (code == KB_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_INIT * -1; | 99 | else if (code == KC_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_INIT * -1; |
| 100 | else if (code == KB_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_INIT; | 100 | else if (code == KC_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_INIT; |
| 101 | else if (code == KB_MS_BTN1) report.buttons |= MOUSE_BTN1; | 101 | else if (code == KC_MS_BTN1) report.buttons |= MOUSE_BTN1; |
| 102 | else if (code == KB_MS_BTN2) report.buttons |= MOUSE_BTN2; | 102 | else if (code == KC_MS_BTN2) report.buttons |= MOUSE_BTN2; |
| 103 | else if (code == KB_MS_BTN3) report.buttons |= MOUSE_BTN3; | 103 | else if (code == KC_MS_BTN3) report.buttons |= MOUSE_BTN3; |
| 104 | else if (code == KB_MS_BTN4) report.buttons |= MOUSE_BTN4; | 104 | else if (code == KC_MS_BTN4) report.buttons |= MOUSE_BTN4; |
| 105 | else if (code == KB_MS_BTN5) report.buttons |= MOUSE_BTN5; | 105 | else if (code == KC_MS_BTN5) report.buttons |= MOUSE_BTN5; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | void mousekey_off(uint8_t code) | 108 | void mousekey_off(uint8_t code) |
| 109 | { | 109 | { |
| 110 | if (code == KB_MS_UP && report.y < 0) report.y = 0; | 110 | if (code == KC_MS_UP && report.y < 0) report.y = 0; |
| 111 | else if (code == KB_MS_DOWN && report.y > 0) report.y = 0; | 111 | else if (code == KC_MS_DOWN && report.y > 0) report.y = 0; |
| 112 | else if (code == KB_MS_LEFT && report.x < 0) report.x = 0; | 112 | else if (code == KC_MS_LEFT && report.x < 0) report.x = 0; |
| 113 | else if (code == KB_MS_RIGHT && report.x > 0) report.x = 0; | 113 | else if (code == KC_MS_RIGHT && report.x > 0) report.x = 0; |
| 114 | else if (code == KB_MS_WH_UP && report.v > 0) report.v = 0; | 114 | else if (code == KC_MS_WH_UP && report.v > 0) report.v = 0; |
| 115 | else if (code == KB_MS_WH_DOWN && report.v < 0) report.v = 0; | 115 | else if (code == KC_MS_WH_DOWN && report.v < 0) report.v = 0; |
| 116 | else if (code == KB_MS_WH_LEFT && report.h < 0) report.h = 0; | 116 | else if (code == KC_MS_WH_LEFT && report.h < 0) report.h = 0; |
| 117 | else if (code == KB_MS_WH_RIGHT && report.h > 0) report.h = 0; | 117 | else if (code == KC_MS_WH_RIGHT && report.h > 0) report.h = 0; |
| 118 | else if (code == KB_MS_BTN1) report.buttons &= ~MOUSE_BTN1; | 118 | else if (code == KC_MS_BTN1) report.buttons &= ~MOUSE_BTN1; |
| 119 | else if (code == KB_MS_BTN2) report.buttons &= ~MOUSE_BTN2; | 119 | else if (code == KC_MS_BTN2) report.buttons &= ~MOUSE_BTN2; |
| 120 | else if (code == KB_MS_BTN3) report.buttons &= ~MOUSE_BTN3; | 120 | else if (code == KC_MS_BTN3) report.buttons &= ~MOUSE_BTN3; |
| 121 | else if (code == KB_MS_BTN4) report.buttons &= ~MOUSE_BTN4; | 121 | else if (code == KC_MS_BTN4) report.buttons &= ~MOUSE_BTN4; |
| 122 | else if (code == KB_MS_BTN5) report.buttons &= ~MOUSE_BTN5; | 122 | else if (code == KC_MS_BTN5) report.buttons &= ~MOUSE_BTN5; |
| 123 | 123 | ||
| 124 | if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0) | 124 | if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0) |
| 125 | mousekey_repeat = 0; | 125 | mousekey_repeat = 0; |
