summaryrefslogtreecommitdiff
path: root/keyboards/kitten_paw/keymaps
diff options
context:
space:
mode:
authorAdam Lee <adam@bigtuna.io>2017-05-07 14:36:10 -0700
committerAdam Lee <adam@bigtuna.io>2017-05-07 14:36:10 -0700
commitf2fcab96a8dd8cc70d6785da76621c48df1af94c (patch)
tree9be0967ab0d3795e6d20299988c84280f3ad98f6 /keyboards/kitten_paw/keymaps
parentf90321bdcbcbd196ee642cdd8cc31aa0f6ac121e (diff)
parent2704c163da590d3020f6d87717c400611de81110 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/kitten_paw/keymaps')
-rw-r--r--keyboards/kitten_paw/keymaps/ickerwx/config.h2
-rw-r--r--keyboards/kitten_paw/keymaps/ickerwx/keymap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/kitten_paw/keymaps/ickerwx/config.h b/keyboards/kitten_paw/keymaps/ickerwx/config.h
index 04a2d253c7..142aba8909 100644
--- a/keyboards/kitten_paw/keymaps/ickerwx/config.h
+++ b/keyboards/kitten_paw/keymaps/ickerwx/config.h
@@ -22,7 +22,7 @@
#undef MOUSEKEY_WHEEL_MAX_SPEED
#define MOUSEKEY_WHEEL_MAX_SPEED 3
#undef MOUSEKEY_WHEEL_TIME_TO_MAX
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 1000
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
#undef ONESHOT_TIMEOUT
#define ONESHOT_TIMEOUT 500
#undef TAPPING_TOGGLE
diff --git a/keyboards/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/kitten_paw/keymaps/ickerwx/keymap.c
index 9a00c80dc8..9dffbb272c 100644
--- a/keyboards/kitten_paw/keymaps/ickerwx/keymap.c
+++ b/keyboards/kitten_paw/keymaps/ickerwx/keymap.c
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,S(NUBS),_______,_______,_______,_______,_______,_______,_______,KC_NUBS,S(NUBS),S(MINS), _______, _______, _______,_______,_______,_______, \
_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______),
/* Layer 3: media layer */
- [MEDIA] = KEYMAP(\
+ [MEDIA] = KEYMAP(\
KC_PWR,KC_SLEP,KC_WAKE,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \
XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_MPRV,KC_MPLY,KC_MNXT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \
XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_VOLD,KC_MUTE,KC_VOLU, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \