Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[keymap] upstreaming a minor keymap update #9366

Merged
merged 6 commits into from
Jun 13, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions keyboards/planck/keymaps/callum/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,15 @@
#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 winl C(G(KC_LEFT))
#define winr C(G(KC_RGHT))

#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 f1 KC_F1
#define f2 KC_F2
Expand Down Expand Up @@ -168,9 +173,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, ctl4, ctl1, winl, winr, xxxx, xxxx, home, up, end, xxxx, caps,
del, ctl5, ctl2, tabl, tabr, xxxx, xxxx, left, down, rght, xxxx, xxxx,
____, ctl6, ctl3, back, fwd, xxxx, xxxx, pgdn, pgup, xxxx, xxxx, ____,
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____
),

Expand Down
8 changes: 0 additions & 8 deletions keyboards/planck/keymaps/callum/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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