diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-04-29 15:03:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 15:03:52 +0200 |
| commit | 584b804ee33d53102fef3b8cdd045bca4c47bf26 (patch) | |
| tree | cccdc512fed02293ffd0bfb962ec14d8a8664e7f /tmk_core/common/mousekey.h | |
| parent | 215dd126d08b29939c53bf0eaa006ce6ecdedb83 (diff) | |
| parent | 26bbfd78125224abdbd2e4ccf3aa3df1b5fc4968 (diff) | |
| download | qmk_firmware-584b804ee33d53102fef3b8cdd045bca4c47bf26.tar.gz qmk_firmware-584b804ee33d53102fef3b8cdd045bca4c47bf26.zip | |
Merge pull request #21 from qmk/master
Merge from QMK
Diffstat (limited to 'tmk_core/common/mousekey.h')
| -rw-r--r-- | tmk_core/common/mousekey.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tmk_core/common/mousekey.h b/tmk_core/common/mousekey.h index 6eede06b4..9338d0af7 100644 --- a/tmk_core/common/mousekey.h +++ b/tmk_core/common/mousekey.h | |||
| @@ -23,8 +23,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | /* max value on report descriptor */ | 25 | /* max value on report descriptor */ |
| 26 | #define MOUSEKEY_MOVE_MAX 127 | 26 | #ifndef MOUSEKEY_MOVE_MAX |
| 27 | #define MOUSEKEY_WHEEL_MAX 127 | 27 | #define MOUSEKEY_MOVE_MAX 127 |
| 28 | #elif MOUSEKEY_MOVE_MAX > 127 | ||
| 29 | #error MOUSEKEY_MOVE_MAX needs to be smaller than 127 | ||
| 30 | #endif | ||
| 31 | |||
| 32 | #ifndef MOUSEKEY_WHEEL_MAX | ||
| 33 | #define MOUSEKEY_WHEEL_MAX 127 | ||
| 34 | #elif MOUSEKEY_WHEEL_MAX > 127 | ||
| 35 | #error MOUSEKEY_WHEEL_MAX needs to be smaller than 127 | ||
| 36 | #endif | ||
| 28 | 37 | ||
| 29 | #ifndef MOUSEKEY_MOVE_DELTA | 38 | #ifndef MOUSEKEY_MOVE_DELTA |
| 30 | #define MOUSEKEY_MOVE_DELTA 5 | 39 | #define MOUSEKEY_MOVE_DELTA 5 |