aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCallum Oakley <hello@callumoakley.net>2020-06-13 12:11:28 +0100
committerGitHub <noreply@github.com>2020-06-13 21:11:28 +1000
commitd1730ec760360b38fd6f5d162a5eb1f22e893b0f (patch)
treed2d644690f9088b7f232414a4f40b173fc1d2f2e
parent4057d44989e2ee83ca3b171bdb1a29bc9f3ae0cd (diff)
downloadqmk_firmware-d1730ec760360b38fd6f5d162a5eb1f22e893b0f.tar.gz
qmk_firmware-d1730ec760360b38fd6f5d162a5eb1f22e893b0f.zip
[keymap] upstreaming a minor keymap update (#9366)
-rw-r--r--keyboards/planck/keymaps/callum/keymap.c23
-rw-r--r--keyboards/planck/keymaps/callum/readme.md8
2 files changed, 16 insertions, 15 deletions
diff --git a/keyboards/planck/keymaps/callum/keymap.c b/keyboards/planck/keymaps/callum/keymap.c
index 34ef05248..4db54577b 100644
--- a/keyboards/planck/keymaps/callum/keymap.c
+++ b/keyboards/planck/keymaps/callum/keymap.c
@@ -75,11 +75,20 @@
75#define tabr G(S(KC_RBRC)) 75#define tabr G(S(KC_RBRC))
76#define fwd G(KC_RBRC) 76#define fwd G(KC_RBRC)
77#define back G(KC_LBRC) 77#define back G(KC_LBRC)
78#define dtl C(KC_LEFT)
79#define dtr C(KC_RGHT)
80#define slup S(A(KC_UP)) 78#define slup S(A(KC_UP))
81#define sldn S(A(KC_DOWN)) 79#define sldn S(A(KC_DOWN))
82 80
81#define ctl1 C(KC_1)
82#define ctl2 C(KC_2)
83#define ctl3 C(KC_3)
84#define ctl4 C(KC_4)
85#define ctl5 C(KC_5)
86#define ctl6 C(KC_6)
87#define ctl7 C(KC_7)
88#define ctl8 C(KC_8)
89#define ctl9 C(KC_9)
90#define ctl0 C(KC_0)
91
83#define f1 KC_F1 92#define f1 KC_F1
84#define f2 KC_F2 93#define f2 KC_F2
85#define f3 KC_F3 94#define f3 KC_F3
@@ -105,8 +114,8 @@
105#define next KC_MNXT 114#define next KC_MNXT
106#define play KC_MPLY 115#define play KC_MPLY
107#define prev KC_MPRV 116#define prev KC_MPRV
108#define vold KC_F11 117#define vold KC_VOLD
109#define volu KC_F12 118#define volu KC_VOLU
110 119
111#define symb MO(SYMB) 120#define symb MO(SYMB)
112#define move MO(MOVE) 121#define move MO(MOVE)
@@ -168,9 +177,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
168 ), 177 ),
169 178
170 [MOVE] = LAYOUT_planck_grid( 179 [MOVE] = LAYOUT_planck_grid(
171 esc, xxxx, slup, dtl, dtr, xxxx, xxxx, home, up, end, xxxx, caps, 180 esc, ctl1, ctl2, ctl3, ctl4, xxxx, xxxx, home, up, end, ctl7, caps,
172 del, xxxx, sldn, tabl, tabr, xxxx, xxxx, left, down, rght, xxxx, xxxx, 181 del, ctl5, slup, tabl, tabr, xxxx, xxxx, left, down, rght, ctl8, xxxx,
173 ____, xxxx, xxxx, back, fwd, xxxx, xxxx, pgdn, pgup, xxxx, xxxx, ____, 182 ____, ctl6, sldn, back, fwd, xxxx, xxxx, pgdn, pgup, ctl0, ctl9, ____,
174 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ 183 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____
175 ), 184 ),
176 185
diff --git a/keyboards/planck/keymaps/callum/readme.md b/keyboards/planck/keymaps/callum/readme.md
index 3eae9ad3c..561901b48 100644
--- a/keyboards/planck/keymaps/callum/readme.md
+++ b/keyboards/planck/keymaps/callum/readme.md
@@ -26,13 +26,5 @@ This is a layout for the grid planck, built with a few ideals in mind:
26 higher ones. (number arrangement borrowed from [dustypomeleau's minidox 26 higher ones. (number arrangement borrowed from [dustypomeleau's minidox
27 layout][]. 27 layout][].
28 28
29Layout rendered with [keyboard-layout-editor.com][]:
30
31![](https://callumoakley.net/images/keymap.png)
32
33The only behaviour not captured in this graphic is: pressing both cmd keys will
34send cmd+ctrl. See [keymap.c][] for details.
35
36[dustypomeleau's minidox layout]: https://github.com/qmk/qmk_firmware/tree/master/keyboards/minidox/keymaps/dustypomerleau 29[dustypomeleau's minidox layout]: https://github.com/qmk/qmk_firmware/tree/master/keyboards/minidox/keymaps/dustypomerleau
37[keyboard-layout-editor.com]: http://www.keyboard-layout-editor.com
38[keymap.c]: keymap.c 30[keymap.c]: keymap.c