From 2fc727c1541a2791436b9b200dab5c6459061cdf Mon Sep 17 00:00:00 2001 From: Callum Oakley Date: Sun, 26 Nov 2017 07:09:28 +0000 Subject: [PATCH] Keymap update (#2045) * linux shake-around * move terminal and browser spawning keys * add a shift to window resizing keys to free combo up for window management * "jump to tab" shortcuts for firefox * change window resize modifiers * change wm keys * change wm keys again, and reformat keymap to 80chars * typos * language key * qwerty layer for SO, general cleanup --- keyboards/planck/keymaps/callum/keymap.c | 298 ++++++++++++++-------- keyboards/planck/keymaps/callum/readme.md | 110 ++++---- keyboards/planck/keymaps/callum/rules.mk | 6 +- 3 files changed, 254 insertions(+), 160 deletions(-) diff --git a/keyboards/planck/keymaps/callum/keymap.c b/keyboards/planck/keymaps/callum/keymap.c index 98417a1c8..4758ffacf 100644 --- a/keyboards/planck/keymaps/callum/keymap.c +++ b/keyboards/planck/keymaps/callum/keymap.c @@ -1,148 +1,246 @@ #include "planck.h" #include "action_layer.h" -#ifdef AUDIO_ENABLE - #include "audio.h" -#endif -#include "eeconfig.h" extern keymap_config_t keymap_config; -#define _BASE 0 -#define _MOVE 1 -#define _SYMB 2 -#define _MORE 3 -#define _FUNC 4 -#define ENDASH LALT(KC_MINS) -#define POUND LALT(KC_3) -#define LDQUOT LALT(KC_LBRC) -#define RDQUOT LALT(S(KC_LBRC)) -#define LSQUOT LALT(KC_RBRC) -#define RSQUOT LALT(S(KC_RBRC)) -#define H(X) LALT(LCTL(X)) +#define G(X) LGUI(X) +#define A(X) LALT(X) +#define C(X) LCTL(X) +#define GC(X) G(C(X)) +#define GAC(X) G(A(C(X))) +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +enum planck_layers { + _COLEMAK, + _QWERTY, + _SYMB, + _MOVE, + _FUNC +}; enum planck_keycodes { - MOVE = SAFE_RANGE, + COLEMAK = SAFE_RANGE, + QWERTY, SYMB, + MOVE, FUNC }; -// Fillers to make layering more clear -#define _______ KC_TRNS -#define XXXXXXX KC_NO - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* BASE - * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | F | P | G | J | L | U | Y | ; | - | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Bksp | A | R | S | T | D | H | N | E | I | O | ' | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | K | M | , | . | / | Shift| - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Func | Ctrl | Alt | Cmd | Symb | Enter| Space| Move | Cmd | Alt | Ctrl | Func | - * `-----------------------------------------------------------------------------------' +/* COLEMAK + * ,-----------------------------------------------------------------------. + * |Tab | Q | W | F | P | G | J | L | U | Y | ; | - | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Bksp | A | R | S | T | D | H | N | E | I | O | ' | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Shift| Z | X | C | V | B | K | M | , | . | / |Shift| + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Func |Super| Alt |Ctrl |Symb |Enter|Space|Move |Ctrl | Alt |Super|Func | + * `-----------------------------------------------------------------------' */ -[_BASE] = { - {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_MINS}, - {KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, - {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, - {FUNC, KC_LCTL, KC_LALT, KC_LGUI, SYMB, KC_ENT, KC_SPC, MOVE, KC_RGUI, KC_RALT, KC_RCTL, FUNC } +[_COLEMAK] = { + { + KC_TAB, KC_Q, KC_W, KC_F, + KC_P, KC_G, KC_J, KC_L, + KC_U, KC_Y, KC_SCLN, KC_MINS + }, + { + KC_BSPC, KC_A, KC_R, KC_S, + KC_T, KC_D, KC_H, KC_N, + KC_E, KC_I, KC_O, KC_QUOT + }, + { + KC_LSFT, KC_Z, KC_X, KC_C, + KC_V, KC_B, KC_K, KC_M, + KC_COMM, KC_DOT, KC_SLSH, KC_RSFT + }, + { + FUNC, KC_LGUI, KC_LALT, KC_LCTL, + SYMB, KC_ENT, KC_SPC, MOVE, + KC_RCTL, KC_RALT, KC_RGUI, FUNC + } }, -/* MOVE - * ,-----------------------------------------------------------------------------------. - * | H(F7)| H(F8)| H(6) | H(5) | H(4) | H(F9)|H(F10)| Home | Up | End | H(A) | Esc | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | H(F3)| H(F4)| H(3) | H(2) | H(1) | H(F5)| H(F6)| Left | Down | Right| Caps | Del | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | H(0) | H(9) | H(8) | H(7) | H(F1)| H(F2)| Pg Dn| Pg Up|H(F11)|H(F12)| | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' +/* QWERTY + * ,-----------------------------------------------------------------------. + * |Tab | Q | W | E | R | T | Y | U | I | O | P | - | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Bksp | A | S | D | F | G | H | J | K | L | ; | ' | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Shift| Z | X | C | V | B | N | M | , | . | / |Shift| + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Func |Super| Alt |Ctrl |Symb |Enter|Space|Move |Ctrl | Alt |Super|Func | + * `-----------------------------------------------------------------------' */ -[_MOVE] = { - {H(KC_F7),H(KC_F8),H(KC_6), H(KC_5), H(KC_4), H(KC_F9),H(KC_F10),KC_HOME,KC_UP, KC_END, H(KC_A), KC_ESC }, - {H(KC_F3),H(KC_F4),H(KC_3), H(KC_2), H(KC_1), H(KC_F5),H(KC_F6),KC_LEFT, KC_DOWN, KC_RGHT, KC_CAPS, KC_DEL }, - {_______, H(KC_0), H(KC_9), H(KC_8), H(KC_7), H(KC_F1),H(KC_F2),KC_PGDN,KC_PGUP,H(KC_F11),H(KC_F12),_______}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +[_QWERTY] = { + { + KC_TAB, KC_Q, KC_W, KC_E, + KC_R, KC_T, KC_Y, KC_U, + KC_I, KC_O, KC_P, KC_MINS + }, + { + KC_BSPC, KC_A, KC_S, KC_D, + KC_F, KC_G, KC_H, KC_J, + KC_K, KC_L, KC_SCLN, KC_QUOT + }, + { + KC_LSFT, KC_Z, KC_X, KC_C, + KC_V, KC_B, KC_N, KC_M, + KC_COMM, KC_DOT, KC_SLSH, KC_RSFT + }, + { + FUNC, KC_LGUI, KC_LALT, KC_LCTL, + SYMB, KC_ENT, KC_SPC, MOVE, + KC_RCTL, KC_RALT, KC_RGUI, FUNC + } }, /* SYMB - * ,-----------------------------------------------------------------------------------. - * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | – | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Del | ! | @ | # | $ | % | ^ | & | * | ( | ) | ’ | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | ~ | ` | + | = | | | \ | [ | ] | { | } | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' + * ,-----------------------------------------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | Del | ! | @ | # | $ | % | ^ | & | * | ( | ) | | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | ~ | ` | + | = | | | \ | [ | ] | { | } | | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------' */ [_SYMB] = { - {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, ENDASH }, - {KC_DEL, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, RSQUOT }, - {_______, KC_TILD, KC_GRV, KC_PLUS, KC_EQL, KC_PIPE, KC_BSLS, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} + { + KC_ESC, KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6, KC_7, + KC_8, KC_9, KC_0, _______ + }, + { + KC_DEL, KC_EXLM, KC_AT, KC_HASH, + KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, + KC_ASTR, KC_LPRN, KC_RPRN, _______ + }, + { + _______, KC_TILD, KC_GRV, KC_PLUS, + KC_EQL, KC_PIPE, KC_BSLS, KC_LBRC, + KC_RBRC, KC_LCBR, KC_RCBR, _______ + }, + { + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + } }, -/* MORE - * ,-----------------------------------------------------------------------------------. - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | £ | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | “ | ” | ‘ | ’ | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' +/* MOVE + * ,-----------------------------------------------------------------------. + * | | | | | | | |Home | Up | End | | Esc | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | | | | | | |Left |Down |Right|Caps | Del | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | | | | | | |PgDn |PgUp | | | | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------' */ -[_MORE] = { - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, POUND, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LDQUOT, RDQUOT, LSQUOT, RSQUOT, _______}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +[_MOVE] = { + { + GC(KC_UP), GAC(KC_1), G(KC_6), G(KC_5), + G(KC_4), GAC(KC_UP), GAC(KC_RGHT), KC_HOME, + KC_UP, KC_END, C(KC_SPC), KC_ESC + }, + { + GC(KC_DOWN), GAC(KC_2), G(KC_3), G(KC_2), + G(KC_1), G(KC_F), G(KC_C), KC_LEFT, + KC_DOWN, KC_RGHT, KC_CAPS, KC_DEL + }, + { + _______, GAC(KC_3), G(KC_9), G(KC_8), + G(KC_7), GAC(KC_LEFT), GAC(KC_DOWN), KC_PGDN, + KC_PGUP, GC(KC_LEFT), GC(KC_RGHT), _______ + }, + { + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + } }, /* FUNC - * ,-----------------------------------------------------------------------------------. - * | Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | Vol+ | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | Vol- | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | F21 | F22 | F23 | F24 | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | Prev | Mute | Play | Next | | | | | - * `-----------------------------------------------------------------------------------' + * ,-----------------------------------------------------------------------. + * |Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 |VolUp| + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |VolDn| + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | F21 | F22 | F23 | F24 | | | | |Clmak|Qwrty| | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | | | |Prev |Mute |Play |Next | | | | | + * `-----------------------------------------------------------------------' */ [_FUNC] = { - {RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_VOLU}, - {KC_POWER,KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_VOLD}, - {_______, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______}, - {_______, _______, _______, _______, KC_MPRV, KC_MUTE, KC_MPLY, KC_MNXT, _______, _______, _______, _______} + { + RESET, KC_F1, KC_F2, KC_F3, + KC_F4, KC_F5, KC_F6, KC_F7, + KC_F8, KC_F9, KC_F10, KC_VOLU + }, + { + KC_POWER, KC_F11, KC_F12, KC_F13, + KC_F14, KC_F15, KC_F16, KC_F17, + KC_F18, KC_F19, KC_F20, KC_VOLD + }, + { + _______, KC_F21, KC_F22, KC_F23, + KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, COLEMAK, QWERTY, _______ + }, + { + _______, _______, _______, _______, + KC_MPRV, KC_MUTE, KC_MPLY, KC_MNXT, + _______, _______, _______, _______ + } } }; +#ifdef AUDIO_ENABLE + float colemak_song[][2] = SONG(COLEMAK_SOUND); + float qwerty_song[][2] = SONG(QWERTY_SOUND); +#endif + bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case MOVE: + case COLEMAK: if (record->event.pressed) { - layer_on(_MOVE); - update_tri_layer(_MOVE, _SYMB, _MORE); - } else { - layer_off(_MOVE); - update_tri_layer(_MOVE, _SYMB, _MORE); + #ifdef AUDIO_ENABLE + stop_all_notes(); + PLAY_SONG(colemak_song); + #endif + set_single_persistent_default_layer(_COLEMAK); + } + return false; + break; + case QWERTY: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + stop_all_notes(); + PLAY_SONG(qwerty_song); + #endif + set_single_persistent_default_layer(_QWERTY); } return false; break; case SYMB: if (record->event.pressed) { layer_on(_SYMB); - update_tri_layer(_MOVE, _SYMB, _MORE); } else { layer_off(_SYMB); - update_tri_layer(_MOVE, _SYMB, _MORE); + } + return false; + break; + case MOVE: + if (record->event.pressed) { + layer_on(_MOVE); + } else { + layer_off(_MOVE); } return false; break; diff --git a/keyboards/planck/keymaps/callum/readme.md b/keyboards/planck/keymaps/callum/readme.md index d5a689b8f..176211cd4 100644 --- a/keyboards/planck/keymaps/callum/readme.md +++ b/keyboards/planck/keymaps/callum/readme.md @@ -4,8 +4,8 @@ This is a layout for the grid planck, built with a few ideals in mind: - Consistent and minimal response times should be maintained. Keys that react differently depending on whether they are tapped or held, keys that react - differently if they are double tapped, etc. should be avoided – they - inevitably send their keycode later than a normal key – interrupting the + differently if they are double tapped, etc. should be avoided -- they + inevitably send their keycode later than a normal key -- interrupting the immediate feedback from the screen. Therefore we restrict ourselves to chording as our only means of getting more than one symbol out of a single physical key. @@ -17,70 +17,68 @@ This is a layout for the grid planck, built with a few ideals in mind: - There should be two of every modifier (one on each side), otherwise certain long key combinations become hard to make. -We have five layers. A `BASE` layer, in colemak; a `MOVE` layer, with an arrow -cluster, other movement keys, and hotkeys; a `SYMB` layer, with numbers and -symbols; a `FUNC` layer, with function keys and media keys; and a `MORE` layer, -with stuff that doesn’t fit anywhere else. The `MORE` layer is activated by -holding the Move and Symb keys simultaniously. +Keys are arranged as follows. Blank keys below may actually contain +undocumented shortcuts specific to my workflow. The base layer can be set to +colemak or qwerty (from the function layer). ``` -/* BASE - * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | F | P | G | J | L | U | Y | ; | - | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Bksp | A | R | S | T | D | H | N | E | I | O | ' | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | K | M | , | . | / | Shift| - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Func | Ctrl | Alt | Cmd | Symb | Enter| Space| Move | Cmd | Alt | Ctrl | Func | - * `-----------------------------------------------------------------------------------' +/* COLEMAK + * ,-----------------------------------------------------------------------. + * |Tab | Q | W | F | P | G | J | L | U | Y | ; | - | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Bksp | A | R | S | T | D | H | N | E | I | O | ' | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Shift| Z | X | C | V | B | K | M | , | . | / |Shift| + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |FUNC |Super| Alt |Ctrl |SYMB |Enter|Space|MOVE |Ctrl | Alt |Super|FUNC | + * `-----------------------------------------------------------------------' */ -/* MOVE - * ,-----------------------------------------------------------------------------------. - * | H(F7)| H(F8)| H(6) | H(5) | H(4) | H(F9)|H(F10)| Home | Up | End | H(A) | Esc | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | H(F3)| H(F4)| H(3) | H(2) | H(1) | H(F5)| H(F6)| Left | Down | Right| Caps | Del | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | H(0) | H(9) | H(8) | H(7) | H(F1)| H(F2)| Pg Dn| Pg Up|H(F11)|H(F12)| | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' +/* QWERTY + * ,-----------------------------------------------------------------------. + * |Tab | Q | W | E | R | T | Y | U | I | O | P | - | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Bksp | A | S | D | F | G | H | J | K | L | ; | ' | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Shift| Z | X | C | V | B | N | M | , | . | / |Shift| + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |FUNC |Super| Alt |Ctrl |SYMB |Enter|Space|MOVE |Ctrl | Alt |Super|FUNC | + * `-----------------------------------------------------------------------' */ /* SYMB - * ,-----------------------------------------------------------------------------------. - * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | – | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Del | ! | @ | # | $ | % | ^ | & | * | ( | ) | ’ | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | ~ | ` | + | = | | | \ | [ | ] | { | } | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' + * ,-----------------------------------------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | Del | ! | @ | # | $ | % | ^ | & | * | ( | ) | | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | ~ | ` | + | = | | | \ | [ | ] | { | } | | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------' */ -/* MORE - * ,-----------------------------------------------------------------------------------. - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | £ | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | “ | ” | ‘ | ’ | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' +/* MOVE + * ,-----------------------------------------------------------------------. + * | | | | | | | |Home | Up | End | | Esc | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | | | | | | |Left |Down |Right|Caps | Del | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | | | | | | |PgDn |PgUp | | | | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------' */ /* FUNC - * ,-----------------------------------------------------------------------------------. - * | Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | Vol+ | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | Vol- | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | F21 | F22 | F23 | F24 | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | Prev | Mute | Play | Next | | | | | - * `-----------------------------------------------------------------------------------' + * ,-----------------------------------------------------------------------. + * |Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 |VolUp| + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * |Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |VolDn| + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | F21 | F22 | F23 | F24 | | | | |COLMK|QWRTY| | + * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| + * | | | | |Prev |Mute |Play |Next | | | | | + * `-----------------------------------------------------------------------' */ -``` + ``` diff --git a/keyboards/planck/keymaps/callum/rules.mk b/keyboards/planck/keymaps/callum/rules.mk index 1d76966a6..8ee9a45ab 100644 --- a/keyboards/planck/keymaps/callum/rules.mk +++ b/keyboards/planck/keymaps/callum/rules.mk @@ -1,18 +1,16 @@ - - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +MOUSEKEY_ENABLE = no # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = no # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 +AUDIO_ENABLE = yes # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -- 2.39.2