summaryrefslogtreecommitdiffstats
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)
[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 34ef052487..4db54577b0 100644
--- a/keyboards/planck/keymaps/callum/keymap.c
+++ b/keyboards/planck/keymaps/callum/keymap.c
@@ -75,11 +75,20 @@
#define tabr G(S(KC_RBRC))
#define fwd G(KC_RBRC)
#define back G(KC_LBRC)
-#define dtl C(KC_LEFT)
-#define dtr C(KC_RGHT)
#define slup S(A(KC_UP))
#define sldn S(A(KC_DOWN))
+#define ctl1 C(KC_1)
+#define ctl2 C(KC_2)
+#define ctl3 C(KC_3)
+#define ctl4 C(KC_4)
+#define ctl5 C(KC_5)
+#define ctl6 C(KC_6)
+#define ctl7 C(KC_7)
+#define ctl8 C(KC_8)
+#define ctl9 C(KC_9)
+#define ctl0 C(KC_0)
+
#define f1 KC_F1
#define f2 KC_F2
#define f3 KC_F3
@@ -105,8 +114,8 @@
#define next KC_MNXT
#define play KC_MPLY
#define prev KC_MPRV
-#define vold KC_F11
-#define volu KC_F12
+#define vold KC_VOLD
+#define volu KC_VOLU
#define symb MO(SYMB)
#define move MO(MOVE)
@@ -168,9 +177,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[MOVE] = LAYOUT_planck_grid(
- esc, xxxx, slup, dtl, dtr, xxxx, xxxx, home, up, end, xxxx, caps,
- del, xxxx, sldn, tabl, tabr, xxxx, xxxx, left, down, rght, xxxx, xxxx,
- ____, xxxx, xxxx, back, fwd, xxxx, xxxx, pgdn, pgup, xxxx, xxxx, ____,
+ esc, ctl1, ctl2, ctl3, ctl4, xxxx, xxxx, home, up, end, ctl7, caps,
+ del, ctl5, slup, tabl, tabr, xxxx, xxxx, left, down, rght, ctl8, xxxx,
+ ____, ctl6, sldn, back, fwd, xxxx, xxxx, pgdn, pgup, ctl0, ctl9, ____,
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____
),
diff --git a/keyboards/planck/keymaps/callum/readme.md b/keyboards/planck/keymaps/callum/readme.md
index 3eae9ad3ce..561901b48e 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:
higher ones. (number arrangement borrowed from [dustypomeleau's minidox
layout][].
-Layout rendered with [keyboard-layout-editor.com][]:
-
-![](https://callumoakley.net/images/keymap.png)
-
-The only behaviour not captured in this graphic is: pressing both cmd keys will
-send cmd+ctrl. See [keymap.c][] for details.
-
[dustypomeleau's minidox layout]: https://github.com/qmk/qmk_firmware/tree/master/keyboards/minidox/keymaps/dustypomerleau
-[keyboard-layout-editor.com]: http://www.keyboard-layout-editor.com
[keymap.c]: keymap.c