aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCallum Oakley <c.oakley108@gmail.com>2019-04-24 03:31:42 +0100
committerDrashna Jaelre <drashna@live.com>2019-04-23 19:31:42 -0700
commiteda924d7dc71bd5bc229cc64dcd89a8703ed8582 (patch)
treea7f085bf1f5160c496eaa0fcd456722ebc9f0d59
parentdafdb5f9aee5444691c09388575b23b76bb49cb0 (diff)
downloadqmk_firmware-eda924d7dc71bd5bc229cc64dcd89a8703ed8582.tar.gz
qmk_firmware-eda924d7dc71bd5bc229cc64dcd89a8703ed8582.zip
[Keymap] update (mouse emulation, rev 6 compatibility) (#5696)
* mess with mouse emulation some more * reverse scrolling * mouse speed 20 * ndash and £ on symbol layer * rev6 compatibility
-rw-r--r--keyboards/planck/keymaps/callum/config.h8
-rw-r--r--keyboards/planck/keymaps/callum/keymap.c262
-rw-r--r--keyboards/planck/keymaps/callum/rules.mk1
3 files changed, 120 insertions, 151 deletions
diff --git a/keyboards/planck/keymaps/callum/config.h b/keyboards/planck/keymaps/callum/config.h
index 49f61dee5..e66db1d7e 100644
--- a/keyboards/planck/keymaps/callum/config.h
+++ b/keyboards/planck/keymaps/callum/config.h
@@ -1,7 +1,7 @@
1#define MOUSEKEY_DELAY 0 1#define MOUSEKEY_DELAY 0
2#define MOUSEKEY_INTERVAL 16 2#define MOUSEKEY_INTERVAL 16
3#define MOUSEKEY_MAX_SPEED 10 3#define MOUSEKEY_MAX_SPEED 20
4#define MOUSEKEY_TIME_TO_MAX 60 4#define MOUSEKEY_TIME_TO_MAX 100
5#define MOUSEKEY_WHEEL_DELAY 0 5#define MOUSEKEY_WHEEL_DELAY 0
6#define MOUSEKEY_WHEEL_MAX_SPEED 8 6#define MOUSEKEY_WHEEL_MAX_SPEED 1
7#define MOUSEKEY_WHEEL_TIME_TO_MAX 60 7#define MOUSEKEY_WHEEL_TIME_TO_MAX 100
diff --git a/keyboards/planck/keymaps/callum/keymap.c b/keyboards/planck/keymaps/callum/keymap.c
index 02456aa7d..08d0c69b8 100644
--- a/keyboards/planck/keymaps/callum/keymap.c
+++ b/keyboards/planck/keymaps/callum/keymap.c
@@ -1,4 +1,3 @@
1#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
2#include "planck.h" 1#include "planck.h"
3#include "action_layer.h" 2#include "action_layer.h"
4 3
@@ -38,28 +37,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
38 * |Func |Ctrl | Alt |Super|Symb |Enter|Space|Move |Super| Alt |Ctrl |Func | 37 * |Func |Ctrl | Alt |Super|Symb |Enter|Space|Move |Super| Alt |Ctrl |Func |
39 * `-----------------------------------------------------------------------' 38 * `-----------------------------------------------------------------------'
40 */ 39 */
41 [_COLEMAK] = { 40 [_COLEMAK] = LAYOUT_planck_grid(
42 { 41 KC_TAB, KC_Q, KC_W, KC_F,
43 KC_TAB, KC_Q, KC_W, KC_F, 42 KC_P, KC_G, KC_J, KC_L,
44 KC_P, KC_G, KC_J, KC_L, 43 KC_U, KC_Y, KC_SCLN, KC_MINS,
45 KC_U, KC_Y, KC_SCLN, KC_MINS 44
46 }, 45 KC_BSPC, KC_A, KC_R, KC_S,
47 { 46 KC_T, KC_D, KC_H, KC_N,
48 KC_BSPC, KC_A, KC_R, KC_S, 47 KC_E, KC_I, KC_O, KC_QUOT,
49 KC_T, KC_D, KC_H, KC_N, 48
50 KC_E, KC_I, KC_O, KC_QUOT 49 KC_LSFT, KC_Z, KC_X, KC_C,
51 }, 50 KC_V, KC_B, KC_K, KC_M,
52 { 51 KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
53 KC_LSFT, KC_Z, KC_X, KC_C, 52
54 KC_V, KC_B, KC_K, KC_M, 53 FUNC, KC_LCTL, KC_LALT, KC_LGUI,
55 KC_COMM, KC_DOT, KC_SLSH, KC_RSFT 54 SYMB, KC_ENT, KC_SPC, MOVE,
56 }, 55 KC_RGUI, KC_RALT, KC_RCTL, FUNC
57 { 56 ),
58 FUNC, KC_LCTL, KC_LALT, KC_LGUI,
59 SYMB, KC_ENT, KC_SPC, MOVE,
60 KC_RGUI, KC_RALT, KC_RCTL, FUNC
61 }
62 },
63 57
64 /* QWERTY 58 /* QWERTY
65 * ,-----------------------------------------------------------------------. 59 * ,-----------------------------------------------------------------------.
@@ -72,96 +66,81 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
72 * |Func |Ctrl | Alt |Super|Symb |Enter|Space|Move |Super| Alt |Ctrl |Func | 66 * |Func |Ctrl | Alt |Super|Symb |Enter|Space|Move |Super| Alt |Ctrl |Func |
73 * `-----------------------------------------------------------------------' 67 * `-----------------------------------------------------------------------'
74 */ 68 */
75 [_QWERTY] = { 69 [_QWERTY] = LAYOUT_planck_grid(
76 { 70 KC_TAB, KC_Q, KC_W, KC_E,
77 KC_TAB, KC_Q, KC_W, KC_E, 71 KC_R, KC_T, KC_Y, KC_U,
78 KC_R, KC_T, KC_Y, KC_U, 72 KC_I, KC_O, KC_P, KC_MINS,
79 KC_I, KC_O, KC_P, KC_MINS 73
80 }, 74 KC_BSPC, KC_A, KC_S, KC_D,
81 { 75 KC_F, KC_G, KC_H, KC_J,
82 KC_BSPC, KC_A, KC_S, KC_D, 76 KC_K, KC_L, KC_SCLN, KC_QUOT,
83 KC_F, KC_G, KC_H, KC_J, 77
84 KC_K, KC_L, KC_SCLN, KC_QUOT 78 KC_LSFT, KC_Z, KC_X, KC_C,
85 }, 79 KC_V, KC_B, KC_N, KC_M,
86 { 80 KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
87 KC_LSFT, KC_Z, KC_X, KC_C, 81
88 KC_V, KC_B, KC_N, KC_M, 82 FUNC, KC_LCTL, KC_LALT, KC_LGUI,
89 KC_COMM, KC_DOT, KC_SLSH, KC_RSFT 83 SYMB, KC_ENT, KC_SPC, MOVE,
90 }, 84 KC_RGUI, KC_RALT, KC_RCTL, FUNC
91 { 85 ),
92 FUNC, KC_LCTL, KC_LALT, KC_LGUI,
93 SYMB, KC_ENT, KC_SPC, MOVE,
94 KC_RGUI, KC_RALT, KC_RCTL, FUNC
95 }
96 },
97 86
98 /* SYMB 87 /* SYMB
99 * ,-----------------------------------------------------------------------. 88 * ,-----------------------------------------------------------------------.
100 * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | 89 * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |ndash|
101 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 90 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
102 * | Del | ! | @ | # | $ | % | ^ | & | * | ( | ) | | 91 * | Del | ! | @ | # | $ | % | ^ | & | * | ( | ) | £ |
103 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 92 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
104 * | | ~ | ` | + | = | | | \ | [ | ] | { | } | | 93 * | | ~ | ` | + | = | | | \ | [ | ] | { | } | |
105 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 94 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
106 * | | | | | | | |Mouse| | | | | 95 * | | | | | | | | | | | | |
107 * `-----------------------------------------------------------------------' 96 * `-----------------------------------------------------------------------'
108 */ 97 */
109 [_SYMB] = { 98 [_SYMB] = LAYOUT_planck_grid(
110 { 99 KC_ESC, KC_1, KC_2, KC_3,
111 KC_ESC, KC_1, KC_2, KC_3, 100 KC_4, KC_5, KC_6, KC_7,
112 KC_4, KC_5, KC_6, KC_7, 101 KC_8, KC_9, KC_0, A(KC_MINS),
113 KC_8, KC_9, KC_0, _______ 102
114 }, 103 KC_DEL, KC_EXLM, KC_AT, KC_HASH,
115 { 104 KC_DLR, KC_PERC, KC_CIRC, KC_AMPR,
116 KC_DEL, KC_EXLM, KC_AT, KC_HASH, 105 KC_ASTR, KC_LPRN, KC_RPRN, A(KC_3),
117 KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, 106
118 KC_ASTR, KC_LPRN, KC_RPRN, _______ 107 _______, KC_TILD, KC_GRV, KC_PLUS,
119 }, 108 KC_EQL, KC_PIPE, KC_BSLS, KC_LBRC,
120 { 109 KC_RBRC, KC_LCBR, KC_RCBR, _______,
121 _______, KC_TILD, KC_GRV, KC_PLUS, 110
122 KC_EQL, KC_PIPE, KC_BSLS, KC_LBRC, 111 _______, _______, _______, _______,
123 KC_RBRC, KC_LCBR, KC_RCBR, _______ 112 _______, _______, _______, _______,
124 }, 113 _______, _______, _______, _______
125 { 114 ),
126 _______, _______, _______, _______,
127 _______, _______, _______, MOUSE,
128 _______, _______, _______, _______
129 }
130 },
131 115
132 /* MOVE 116 /* MOVE
133 * ,-----------------------------------------------------------------------. 117 * ,-----------------------------------------------------------------------.
134 * | | | | | | |CtrUp|Home | Up | End |Caps | Esc | 118 * | | | | | | |CtrUp|Home | Up | End |Caps |Mouse|
135 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 119 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
136 * | | | | | | |SpaL |Left |Down |Right|SpaR | Del | 120 * | | | | | | |CtrL |Left |Down |Right|CtrR | |
137 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 121 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
138 * | | | | | | |CtrDn|PgDn |PgUp |TabL |TabR | | 122 * | | | | | | |CtrDn|PgDn |PgUp |TabL |TabR | |
139 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 123 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
140 * | | | | |Mouse| | | | | | | | 124 * | | | | | | | | | | | | |
141 * `-----------------------------------------------------------------------' 125 * `-----------------------------------------------------------------------'
142 */ 126 */
143 [_MOVE] = { 127 [_MOVE] = LAYOUT_planck_grid(
144 { 128 AC(KC_A), AC(KC_B), AC(KC_C), AC(KC_D),
145 AC(KC_A), AC(KC_B), AC(KC_C), AC(KC_D), 129 AC(KC_E), AC(KC_F), C(KC_UP), KC_HOME,
146 AC(KC_E), AC(KC_F), C(KC_UP), KC_HOME, 130 KC_UP, KC_END, KC_CAPS, MOUSE,
147 KC_UP, KC_END, KC_CAPS, KC_ESC 131
148 }, 132 AC(KC_G), AC(KC_H), AC(KC_I), AC(KC_J),
149 { 133 AC(KC_K), AC(KC_L), C(KC_LEFT), KC_LEFT,
150 AC(KC_G), AC(KC_H), AC(KC_I), AC(KC_J), 134 KC_DOWN, KC_RGHT, C(KC_RIGHT), XXXXXXX,
151 AC(KC_K), AC(KC_L), C(KC_LEFT), KC_LEFT, 135
152 KC_DOWN, KC_RGHT, C(KC_RIGHT), KC_DEL 136 _______, AC(KC_M), AC(KC_N), AC(KC_O),
153 }, 137 AC(KC_P), AC(KC_Q), C(KC_DOWN), KC_PGDN,
154 { 138 KC_PGUP, SC(KC_TAB), C(KC_TAB), _______,
155 _______, AC(KC_M), AC(KC_N), AC(KC_O), 139
156 AC(KC_P), AC(KC_Q), C(KC_DOWN), KC_PGDN, 140 _______, _______, _______, _______,
157 KC_PGUP, SC(KC_TAB), C(KC_TAB), _______ 141 _______, _______, _______, _______,
158 }, 142 _______, _______, _______, _______
159 { 143 ),
160 _______, _______, _______, _______,
161 MOUSE, _______, _______, _______,
162 _______, _______, _______, _______
163 }
164 },
165 144
166 /* FUNC 145 /* FUNC
167 * ,-----------------------------------------------------------------------. 146 * ,-----------------------------------------------------------------------.
@@ -169,67 +148,57 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
169 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 148 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
170 * |Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |VolDn| 149 * |Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |VolDn|
171 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 150 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
172 * | | |Home |TabL |TabR |End | | | |Clmak|Qwrty| | 151 * | | | | | | | | | |Clmak|Qwrty| |
173 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 152 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
174 * | | | | |Prev |Mute |Play |Next | | | | | 153 * | | | | |Prev |Mute |Play |Next | | | | |
175 * `-----------------------------------------------------------------------' 154 * `-----------------------------------------------------------------------'
176 */ 155 */
177 [_FUNC] = { 156 [_FUNC] = LAYOUT_planck_grid(
178 { 157 RESET, KC_F1, KC_F2, KC_F3,
179 RESET, KC_F1, KC_F2, KC_F3, 158 KC_F4, KC_F5, KC_F6, KC_F7,
180 KC_F4, KC_F5, KC_F6, KC_F7, 159 KC_F8, KC_F9, KC_F10, KC_VOLU,
181 KC_F8, KC_F9, KC_F10, KC_VOLU 160
182 }, 161 KC_POWER, KC_F11, KC_F12, KC_F13,
183 { 162 KC_F14, KC_F15, KC_F16, KC_F17,
184 KC_POWER, KC_F11, KC_F12, KC_F13, 163 KC_F18, KC_F19, KC_F20, KC_VOLD,
185 KC_F14, KC_F15, KC_F16, KC_F17, 164
186 KC_F18, KC_F19, KC_F20, KC_VOLD 165 _______, XXXXXXX, KC_HOME, SC(KC_TAB),
187 }, 166 C(KC_TAB), KC_END, XXXXXXX, XXXXXXX,
188 { 167 XXXXXXX, COLEMAK, QWERTY, _______,
189 _______, XXXXXXX, KC_HOME, SC(KC_TAB), 168
190 C(KC_TAB), KC_END, XXXXXXX, XXXXXXX, 169 _______, _______, _______, _______,
191 XXXXXXX, COLEMAK, QWERTY, _______ 170 KC_MPRV, KC_MUTE, KC_MPLY, KC_MNXT,
192 }, 171 _______, _______, _______, _______
193 { 172 ),
194 _______, _______, _______, _______,
195 KC_MPRV, KC_MUTE, KC_MPLY, KC_MNXT,
196 _______, _______, _______, _______
197 }
198 },
199 173
200 /* MOUSE 174 /* MOUSE
201 * ,-----------------------------------------------------------------------. 175 * ,-----------------------------------------------------------------------.
202 * | | | | | | | | ScL |Up | ScR | | | 176 * | | |CtrL |CtrU |CtrR | B5 |CtrU | ScL |Up | ScR | | |
203 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 177 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
204 * | | B4 | B3 | B2 | B1 | | |Left |Down |Right| | | 178 * | | | Ac0 | Ac1 | Ac2 | B4 |CtrL |Left |Down |Right|CtrR | |
205 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 179 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
206 * | | | Ac0 | Ac1 | Ac2 | | | ScD | ScU | | | | 180 * | | | |Home | End | B3 |CtrD | ScD | ScU |TabL |TabR | |
207 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| 181 * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
208 * | | | | | | | | | | | | | 182 * | | | | | | B2 | B1 | | | | | |
209 * `-----------------------------------------------------------------------' 183 * `-----------------------------------------------------------------------'
210 */ 184 */
211 [_MOUSE] = { 185 [_MOUSE] = LAYOUT_planck_grid(
212 { 186 _______, XXXXXXX, C(KC_LEFT), C(KC_UP),
213 _______, _______, C(KC_LEFT), C(KC_UP), 187 C(KC_RIGHT), KC_BTN5, C(KC_UP), KC_WH_R,
214 C(KC_RIGHT), _______, _______, KC_WH_L, 188 KC_MS_U, KC_WH_L, XXXXXXX, XXXXXXX,
215 KC_MS_U, KC_WH_R, _______, _______ 189
216 }, 190 _______, XXXXXXX, KC_ACL0, KC_ACL1,
217 { 191 KC_ACL2, KC_BTN4, C(KC_LEFT), KC_MS_L,
218 _______, KC_BTN4, KC_BTN3, KC_BTN2, 192 KC_MS_D, KC_MS_R, C(KC_RIGHT), XXXXXXX,
219 KC_BTN1, _______, _______, KC_MS_L, 193
220 KC_MS_D, KC_MS_R, _______, _______ 194 _______, XXXXXXX, XXXXXXX, KC_HOME,
221 }, 195 KC_END, KC_BTN3, C(KC_DOWN), KC_WH_U,
222 { 196 KC_WH_D, SC(KC_TAB), C(KC_TAB), _______,
223 _______, _______, KC_ACL0, KC_ACL1, 197
224 KC_ACL2, _______, _______, KC_WH_D, 198 _______, _______, _______, _______,
225 KC_WH_U, _______, _______, _______ 199 _______, KC_BTN2, KC_BTN1, _______,
226 }, 200 _______, _______, _______, _______
227 { 201 )
228 _______, _______, _______, _______,
229 _______, _______, _______, _______,
230 _______, _______, _______, _______
231 }
232 }
233}; 202};
234 203
235#ifdef AUDIO_ENABLE 204#ifdef AUDIO_ENABLE
@@ -267,6 +236,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
267 return false; 236 return false;
268 case SYMB: 237 case SYMB:
269 if (record->event.pressed) { 238 if (record->event.pressed) {
239 layer_off(_MOUSE);
270 layer_on(_SYMB); 240 layer_on(_SYMB);
271 } else { 241 } else {
272 layer_off(_SYMB); 242 layer_off(_SYMB);
@@ -274,6 +244,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
274 return false; 244 return false;
275 case MOVE: 245 case MOVE:
276 if (record->event.pressed) { 246 if (record->event.pressed) {
247 layer_off(_MOUSE);
277 layer_on(_MOVE); 248 layer_on(_MOVE);
278 } else { 249 } else {
279 layer_off(_MOVE); 250 layer_off(_MOVE);
@@ -281,6 +252,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
281 return false; 252 return false;
282 case FUNC: 253 case FUNC:
283 if (record->event.pressed) { 254 if (record->event.pressed) {
255 layer_off(_MOUSE);
284 layer_on(_FUNC); 256 layer_on(_FUNC);
285 } else { 257 } else {
286 layer_off(_FUNC); 258 layer_off(_FUNC);
@@ -289,8 +261,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
289 case MOUSE: 261 case MOUSE:
290 if (record->event.pressed) { 262 if (record->event.pressed) {
291 layer_on(_MOUSE); 263 layer_on(_MOUSE);
292 } else {
293 layer_off(_MOUSE);
294 } 264 }
295 return false; 265 return false;
296 266
diff --git a/keyboards/planck/keymaps/callum/rules.mk b/keyboards/planck/keymaps/callum/rules.mk
index 4774c2c41..182322ae2 100644
--- a/keyboards/planck/keymaps/callum/rules.mk
+++ b/keyboards/planck/keymaps/callum/rules.mk
@@ -17,4 +17,3 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
17 17
18# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 18# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
19SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 19SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
20