From 93b583620bfc89583115f18b1df2bb433b2cc3a4 Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Thu, 9 Nov 2017 23:45:50 +0200 Subject: [PATCH 01/15] first verion of skug --- keyboards/ergodox_ez/keymaps/skug/keymap.c | 271 ++++++++++++++++++++ keyboards/ergodox_ez/keymaps/skug/readme.md | 36 +++ 2 files changed, 307 insertions(+) create mode 100644 keyboards/ergodox_ez/keymaps/skug/keymap.c create mode 100644 keyboards/ergodox_ez/keymaps/skug/readme.md diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c new file mode 100644 index 000000000000..2b113e299bd0 --- /dev/null +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -0,0 +1,271 @@ +/* Copyright 2017 Andreas Lindhé + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H +#include "debug.h" +#include "action_layer.h" +#include "version.h" +#include "keymap_swedish.h" + +#define _______ KC_TRNS + +#define BASE 0 // default layer +#define SYMB 1 // symbols +#define MDIA 2 // media keys +#define ARRW 3 // arrow + soon mouse +enum custom_keycodes { + PLACEHOLDER = SAFE_RANGE, // can always be here + EPRM, + VRSN, + RGB_SLD +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | ½ | ! | " | # | # | % | LEFT | | RIGHT| & | / | ( | ) | = | ? | + * | § | 1 | 2 @ | 3 £ | 4 $ | 5 | | | | 6 | 7 { | 8 [ | 9 ] | 0 } | + \ | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Å | + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | Ctrl | A | S | D | F | G |------| |------| H | J | K | L |Ö / L2|Ä / Cmd | + * | | | | | | | Hyper| | Meh | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | Left |Z/Ctrl| X | C | V | B | | | | N | M | ; | : |_/Ctrl| RShift | + * | Shift | | | | | | | | | | | , | . |- | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | '/L1 | ` |Alt | Left | Right| | Up | Down | ^ | * | ~L1 | + * | | ' | | | | | | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,---------------. + * | Esc | LGui | | PgUp |Ctrl/Esc| + * ,------|------|------| |------+--------+------. + * | <>| | Del | Home | | PgDn | | | + * |------|------|------| |------|--------|------| + * | Space| Bksp | End | | AltGr| Meta | Enter| + * `--------------------' `----------------------' + */ +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* +[BASE] = KEYMAP_80( // layer 0 : default + // left hand + NO_HALF, KC_1, KC_2, KC_3, KC_4, KC_5, LALT(KC_TAB), + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), + MO(ARRW), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), + LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_LEFT, KC_RGHT, + KC_ESC, KC_LGUI, + KC_SPC, KC_BSPC, KC_HOME, + NO_LESS, KC_DEL, KC_END, + // right hand + NO_PLUS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, + KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), GUI_T(NO_AE), + MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSFT, + KC_UP, KC_DOWN, NO_CIRC, NO_ASTR, KC_FN1, + KC_PGUP, CTL_T(KC_ESC), + KC_PGDN,KC_BSPC, KC_ENT, + NO_ALGR,KC_RGUI, KC_RGUI +), + +/* Keymap 1: Symbol Layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | . | 0 | = | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * |Animat| | |Toggle|Solid | + * ,------|------|------| |------+------+------. + * |Bright|Bright| | | |Hue- |Hue+ | + * |ness- |ness+ |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// SYMBOLS +[SYMB] = KEYMAP_80( + // left hand + VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, + _______,KC_EXLM,NO_AT, NO_LCBR,NO_RCBR,NO_PIPE,_______, + _______,KC_HASH,NO_DLR, NO_LPRN,NO_RPRN,NO_GRV, + _______,KC_PERC,NO_CIRC,NO_LBRC,NO_RBRC,NO_TILD,_______, + EPRM,_______,_______,_______,_______, + RGB_MOD,_______, + _______,_______,_______, + RGB_VAD,RGB_VAI,_______, + // right hand + _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + _______, KC_UP, KC_7, KC_8, KC_9, NO_ASTR, KC_F12, + KC_DOWN, KC_4, KC_5, KC_6, NO_PLUS, _______, + _______, NO_AMPR, KC_1, KC_2, KC_3, NO_MINS, _______, + _______,KC_DOT, KC_0, NO_EQL, _______, + RGB_TOG, RGB_SLD, + _______, _______, _______, + _______, RGB_HUD, RGB_HUI +), + +/* Keymap 2: Media and mouse keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | MsUp | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | Prev | Next | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | |Brwser| + * | | |------| |------| |Back | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// MEDIA AND MOUSE +[MDIA] = KEYMAP_80( + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, KC_MS_U, _______, _______, _______, + _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, KC_BTN1, KC_BTN2, + _______, _______, + _______, _______, _______, + _______, _______, _______, + // right hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, KC_MPRV, KC_MNXT, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, + _______, _______, + _______, _______, _______, + _______, _______, KC_WBAK +), + // Ducky Style arrows +[ARRW] = KEYMAP_80( + _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP , _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, _______, _______, + _______, _______, _______, + // right hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, _______, _______, + _______, _______, _______ +), +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + } + break; + case 1: + if (record->event.pressed) { // For resetting EEPROM + eeconfig_init(); + } + break; + } + return MACRO_NONE; +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + // dynamically generate these. + case EPRM: + if (record->event.pressed) { + eeconfig_init(); + } + return false; + break; + case VRSN: + if (record->event.pressed) { + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + } + return false; + break; + case RGB_SLD: + if (record->event.pressed) { + #ifdef RGBLIGHT_ENABLE + rgblight_mode(1); + #endif + } + return false; + break; + } + return true; +} + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + + uint8_t layer = biton32(layer_state); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + switch (layer) { + // TODO: Make this relevant to the ErgoDox EZ. + case 1: + ergodox_right_led_1_on(); + break; + case 2: + ergodox_right_led_2_on(); + break; + case 3: + ergodox_right_led_3_on(); + default: + // none + break; + } + +}; diff --git a/keyboards/ergodox_ez/keymaps/skug/readme.md b/keyboards/ergodox_ez/keymaps/skug/readme.md new file mode 100644 index 000000000000..b5b859bce694 --- /dev/null +++ b/keyboards/ergodox_ez/keymaps/skug/readme.md @@ -0,0 +1,36 @@ +# Swedish (sv_SE) Qwerty layout for ErgoDox EZ, based on the Default configuration + +*NOTE:* it might still be desirable to set the software layout to sv_SE in your +OS. + +Remind me and I'll provide a picture of the layout. + +I have tried making this as close of a match I could between the [default +ErgoDox EZ configuration](https://ergodox-ez.com/pages/our-firmware) and a +standard Swedish Qwerty layout. + +## Notable differences from default: + +* There are three special character buttons (acute accent, circumflex/tilde and + apostrophe/asterisk) that don't have any buttons to map to naturally. I've put + these at other places: + + * Acute accent (´) can be found in the lower left corner, conveniently + placed to reach for making an é. + + * Apostrophe (') was put in the lower left corner, close to acute accent. + + * Circumflex (^) and asterisk (*) was placed in the lower right corner. + + * Tilde (~) and diaeresis (¨) I couldn't find a good place for, so I left + those out. I could only get the buttons to produce a single one of the + characters. How can I get it to work properly? + +* The Alt button on right thumb was exchanged for AltGr (RAlt). + +* I changed the backslash in the numpad (layer 1) for a minus. Thought it was + more sensible. + +* I didn't find a good place for the "<>|" button, so that one was left out. + That is a problem that really needs to be resolved. Pipe can be found on layer + one, however. From 3e40a96d3a48a8a8dc359b93539ec1e103e9c8de Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Mon, 13 Nov 2017 08:33:10 +0200 Subject: [PATCH 02/15] zudvp layer added and new thumb cluster --- keyboards/ergodox_ez/keymaps/skug/keymap.c | 88 ++++++++++++++++------ 1 file changed, 67 insertions(+), 21 deletions(-) diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c index 2b113e299bd0..b94dbc7d5639 100644 --- a/keyboards/ergodox_ez/keymaps/skug/keymap.c +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -23,9 +23,11 @@ #define _______ KC_TRNS #define BASE 0 // default layer -#define SYMB 1 // symbols -#define MDIA 2 // media keys -#define ARRW 3 // arrow + soon mouse +#define ZUDVP 1 +#define SYMB 2 // symbols +#define MDIA 3 // media keys +#define ARRW 4 // arrow + soon mouse + enum custom_keycodes { PLACEHOLDER = SAFE_RANGE, // can always be here EPRM, @@ -43,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Å | * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | Ctrl | A | S | D | F | G |------| |------| H | J | K | L |Ö / L2|Ä / Cmd | + * | Ctrl | A | S | D | F | G |------| |------| H | J | K | L |Ö / L2| Ä | * | | | | | | | Hyper| | Meh | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | Left |Z/Ctrl| X | C | V | B | | | | N | M | ; | : |_/Ctrl| RShift | @@ -60,29 +62,70 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Space| Bksp | End | | AltGr| Meta | Enter| * `--------------------' `----------------------' */ -// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// If it accepts an argument (i.e, is a function), it doesn't need KC_ // Otherwise, it needs KC_* [BASE] = KEYMAP_80( // layer 0 : default // left hand - NO_HALF, KC_1, KC_2, KC_3, KC_4, KC_5, LALT(KC_TAB), + NO_HALF, KC_1, KC_2, KC_3, KC_4, KC_5, KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), MO(ARRW), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), - LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_LEFT, KC_RGHT, - KC_ESC, KC_LGUI, - KC_SPC, KC_BSPC, KC_HOME, - NO_LESS, KC_DEL, KC_END, - // right hand - NO_PLUS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_DEL, KC_SPC, + NO_LESS, KC_END, + KC_LEFT, KC_RIGHT, KC_PGDN, + CTL_T(KC_ESC),ALT_T(KC_ENT),KC_LGUI, // right hand + TO(ZUDVP), KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS, TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, - KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), GUI_T(NO_AE), + KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), NO_AE, MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSFT, - KC_UP, KC_DOWN, NO_CIRC, NO_ASTR, KC_FN1, - KC_PGUP, CTL_T(KC_ESC), - KC_PGDN,KC_BSPC, KC_ENT, - NO_ALGR,KC_RGUI, KC_RGUI + KC_SPC, KC_BSPC, NO_CIRC, NO_ASTR, KC_FN1, + KC_HOME, NO_ALGR, + KC_PGUP, KC_UP, KC_DOWN, + KC_LGUI,ALT_T(KC_ENT), CTL_T(KC_ESC) +), +/* Keymap 1: Zudvp + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | Del | :; | ,< | .> | P | Y | L1 | | L1 | F | G | C | R | L | / | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | BkSp | A | O | E | U | I |------| |------| D | H | T | N | S/L2 | - | + * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| + * | LShift | '"/L1| Q | J | K | X | | | | B | M | W | V |Z/Ctrl| RShift | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |Grv/L1| '" |AltShf|BKSPC | SPC | | SPC | Del | [ | ] | ~L1 | + * `----------------------------------' `----------------------------------' + * ,-------------. ,---------------. + * | App | LGui | | Alt |Ctrl/Esc| + * ,------|------|------| |------+--------+------. + * | | | Home | | PgUp | | | + * |LCtrl | LAlt |------| |------| LAlt |LCtrl | + * |/Esc |/Enter| End | | PgDn | /Enter |/Esc | + * `--------------------' `----------------------' + */ +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* +[ZUDVP] = KEYMAP_80( // layer 0 : default + // left hand + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TO(BASE), + KC_DEL, KC_COLN, KC_COMM, KC_DOT, KC_P, KC_Y, TG(SYMB), + KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, + KC_RSFT, LT(SYMB,KC_QUOT), KC_Q, KC_J, KC_K, KC_X, ALL_T(KC_NO), + LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_BSPC, KC_SPC, + ALT_T(KC_APP), KC_END, + _______, _______, KC_PGDN, + CTL_T(KC_ESC),ALT_T(KC_ENT),KC_LGUI, + // right hand + TO(BASE), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + TG(SYMB), KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, + KC_D, KC_H, KC_T, KC_N, LT(MDIA, KC_S), KC_MINS, + MEH_T(KC_NO),KC_B, KC_M, KC_W, KC_V, LT(SYMB,KC_Z), KC_LSFT, + KC_SPC, KC_DELETE,KC_LBRC,KC_RBRC, KC_FN1, + KC_HOME, CTL_T(KC_ESC), + KC_PGUP, _______, _______, + KC_LGUI,ALT_T(KC_ENT), CTL_T(KC_ESC) ), - /* Keymap 1: Symbol Layer * * ,--------------------------------------------------. ,--------------------------------------------------. @@ -187,6 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), + }; const uint16_t PROGMEM fn_actions[] = { @@ -254,18 +298,20 @@ void matrix_scan_user(void) { ergodox_right_led_2_off(); ergodox_right_led_3_off(); switch (layer) { - // TODO: Make this relevant to the ErgoDox EZ. + // Binary: lsb at bottom case 1: - ergodox_right_led_1_on(); + ergodox_right_led_3_on(); break; case 2: ergodox_right_led_2_on(); break; case 3: + ergodox_right_led_2_on(); ergodox_right_led_3_on(); + case 4: + ergodox_right_led_1_on(); default: // none break; } - }; From 493aae7e007762e235a05cbd8f1f0911150fb0db Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Tue, 14 Nov 2017 08:19:08 +0200 Subject: [PATCH 03/15] move del to arrw cluster and switch places of algr and no_circ --- keyboards/ergodox_ez/keymaps/skug/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c index b94dbc7d5639..2e08a7edc82c 100644 --- a/keyboards/ergodox_ez/keymaps/skug/keymap.c +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), MO(ARRW), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), - LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_DEL, KC_SPC, + LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_BSPC, KC_SPC, NO_LESS, KC_END, KC_LEFT, KC_RIGHT, KC_PGDN, CTL_T(KC_ESC),ALT_T(KC_ENT),KC_LGUI, // right hand @@ -78,8 +78,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), NO_AE, MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSFT, - KC_SPC, KC_BSPC, NO_CIRC, NO_ASTR, KC_FN1, - KC_HOME, NO_ALGR, + KC_SPC, KC_BSPC, NO_ALGR, NO_ASTR, KC_FN1, + KC_HOME, NO_CIRC, KC_PGUP, KC_UP, KC_DOWN, KC_LGUI,ALT_T(KC_ENT), CTL_T(KC_ESC) ), @@ -216,7 +216,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_UP , _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, + _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 574c5366e666241f12415720bbcc65dde2ba95ae Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Thu, 9 Nov 2017 23:45:50 +0200 Subject: [PATCH 04/15] first verion of skug --- keyboards/ergodox_ez/keymaps/skug/keymap.c | 271 ++++++++++++++++++++ keyboards/ergodox_ez/keymaps/skug/readme.md | 36 +++ 2 files changed, 307 insertions(+) create mode 100644 keyboards/ergodox_ez/keymaps/skug/keymap.c create mode 100644 keyboards/ergodox_ez/keymaps/skug/readme.md diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c new file mode 100644 index 000000000000..2b113e299bd0 --- /dev/null +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -0,0 +1,271 @@ +/* Copyright 2017 Andreas Lindhé + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H +#include "debug.h" +#include "action_layer.h" +#include "version.h" +#include "keymap_swedish.h" + +#define _______ KC_TRNS + +#define BASE 0 // default layer +#define SYMB 1 // symbols +#define MDIA 2 // media keys +#define ARRW 3 // arrow + soon mouse +enum custom_keycodes { + PLACEHOLDER = SAFE_RANGE, // can always be here + EPRM, + VRSN, + RGB_SLD +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | ½ | ! | " | # | # | % | LEFT | | RIGHT| & | / | ( | ) | = | ? | + * | § | 1 | 2 @ | 3 £ | 4 $ | 5 | | | | 6 | 7 { | 8 [ | 9 ] | 0 } | + \ | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Å | + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | Ctrl | A | S | D | F | G |------| |------| H | J | K | L |Ö / L2|Ä / Cmd | + * | | | | | | | Hyper| | Meh | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | Left |Z/Ctrl| X | C | V | B | | | | N | M | ; | : |_/Ctrl| RShift | + * | Shift | | | | | | | | | | | , | . |- | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | '/L1 | ` |Alt | Left | Right| | Up | Down | ^ | * | ~L1 | + * | | ' | | | | | | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,---------------. + * | Esc | LGui | | PgUp |Ctrl/Esc| + * ,------|------|------| |------+--------+------. + * | <>| | Del | Home | | PgDn | | | + * |------|------|------| |------|--------|------| + * | Space| Bksp | End | | AltGr| Meta | Enter| + * `--------------------' `----------------------' + */ +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* +[BASE] = KEYMAP_80( // layer 0 : default + // left hand + NO_HALF, KC_1, KC_2, KC_3, KC_4, KC_5, LALT(KC_TAB), + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), + MO(ARRW), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), + LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_LEFT, KC_RGHT, + KC_ESC, KC_LGUI, + KC_SPC, KC_BSPC, KC_HOME, + NO_LESS, KC_DEL, KC_END, + // right hand + NO_PLUS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, + KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), GUI_T(NO_AE), + MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSFT, + KC_UP, KC_DOWN, NO_CIRC, NO_ASTR, KC_FN1, + KC_PGUP, CTL_T(KC_ESC), + KC_PGDN,KC_BSPC, KC_ENT, + NO_ALGR,KC_RGUI, KC_RGUI +), + +/* Keymap 1: Symbol Layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | . | 0 | = | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * |Animat| | |Toggle|Solid | + * ,------|------|------| |------+------+------. + * |Bright|Bright| | | |Hue- |Hue+ | + * |ness- |ness+ |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// SYMBOLS +[SYMB] = KEYMAP_80( + // left hand + VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, + _______,KC_EXLM,NO_AT, NO_LCBR,NO_RCBR,NO_PIPE,_______, + _______,KC_HASH,NO_DLR, NO_LPRN,NO_RPRN,NO_GRV, + _______,KC_PERC,NO_CIRC,NO_LBRC,NO_RBRC,NO_TILD,_______, + EPRM,_______,_______,_______,_______, + RGB_MOD,_______, + _______,_______,_______, + RGB_VAD,RGB_VAI,_______, + // right hand + _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + _______, KC_UP, KC_7, KC_8, KC_9, NO_ASTR, KC_F12, + KC_DOWN, KC_4, KC_5, KC_6, NO_PLUS, _______, + _______, NO_AMPR, KC_1, KC_2, KC_3, NO_MINS, _______, + _______,KC_DOT, KC_0, NO_EQL, _______, + RGB_TOG, RGB_SLD, + _______, _______, _______, + _______, RGB_HUD, RGB_HUI +), + +/* Keymap 2: Media and mouse keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | MsUp | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | Prev | Next | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | |Brwser| + * | | |------| |------| |Back | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// MEDIA AND MOUSE +[MDIA] = KEYMAP_80( + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, KC_MS_U, _______, _______, _______, + _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, KC_BTN1, KC_BTN2, + _______, _______, + _______, _______, _______, + _______, _______, _______, + // right hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, KC_MPRV, KC_MNXT, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, + _______, _______, + _______, _______, _______, + _______, _______, KC_WBAK +), + // Ducky Style arrows +[ARRW] = KEYMAP_80( + _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP , _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, _______, _______, + _______, _______, _______, + // right hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, _______, _______, + _______, _______, _______ +), +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + } + break; + case 1: + if (record->event.pressed) { // For resetting EEPROM + eeconfig_init(); + } + break; + } + return MACRO_NONE; +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + // dynamically generate these. + case EPRM: + if (record->event.pressed) { + eeconfig_init(); + } + return false; + break; + case VRSN: + if (record->event.pressed) { + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + } + return false; + break; + case RGB_SLD: + if (record->event.pressed) { + #ifdef RGBLIGHT_ENABLE + rgblight_mode(1); + #endif + } + return false; + break; + } + return true; +} + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + + uint8_t layer = biton32(layer_state); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + switch (layer) { + // TODO: Make this relevant to the ErgoDox EZ. + case 1: + ergodox_right_led_1_on(); + break; + case 2: + ergodox_right_led_2_on(); + break; + case 3: + ergodox_right_led_3_on(); + default: + // none + break; + } + +}; diff --git a/keyboards/ergodox_ez/keymaps/skug/readme.md b/keyboards/ergodox_ez/keymaps/skug/readme.md new file mode 100644 index 000000000000..b5b859bce694 --- /dev/null +++ b/keyboards/ergodox_ez/keymaps/skug/readme.md @@ -0,0 +1,36 @@ +# Swedish (sv_SE) Qwerty layout for ErgoDox EZ, based on the Default configuration + +*NOTE:* it might still be desirable to set the software layout to sv_SE in your +OS. + +Remind me and I'll provide a picture of the layout. + +I have tried making this as close of a match I could between the [default +ErgoDox EZ configuration](https://ergodox-ez.com/pages/our-firmware) and a +standard Swedish Qwerty layout. + +## Notable differences from default: + +* There are three special character buttons (acute accent, circumflex/tilde and + apostrophe/asterisk) that don't have any buttons to map to naturally. I've put + these at other places: + + * Acute accent (´) can be found in the lower left corner, conveniently + placed to reach for making an é. + + * Apostrophe (') was put in the lower left corner, close to acute accent. + + * Circumflex (^) and asterisk (*) was placed in the lower right corner. + + * Tilde (~) and diaeresis (¨) I couldn't find a good place for, so I left + those out. I could only get the buttons to produce a single one of the + characters. How can I get it to work properly? + +* The Alt button on right thumb was exchanged for AltGr (RAlt). + +* I changed the backslash in the numpad (layer 1) for a minus. Thought it was + more sensible. + +* I didn't find a good place for the "<>|" button, so that one was left out. + That is a problem that really needs to be resolved. Pipe can be found on layer + one, however. From 99ac97d2da83b6170386a29a50d2f46484cab239 Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Mon, 13 Nov 2017 08:33:10 +0200 Subject: [PATCH 05/15] zudvp layer added and new thumb cluster --- keyboards/ergodox_ez/keymaps/skug/keymap.c | 88 ++++++++++++++++------ 1 file changed, 67 insertions(+), 21 deletions(-) diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c index 2b113e299bd0..b94dbc7d5639 100644 --- a/keyboards/ergodox_ez/keymaps/skug/keymap.c +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -23,9 +23,11 @@ #define _______ KC_TRNS #define BASE 0 // default layer -#define SYMB 1 // symbols -#define MDIA 2 // media keys -#define ARRW 3 // arrow + soon mouse +#define ZUDVP 1 +#define SYMB 2 // symbols +#define MDIA 3 // media keys +#define ARRW 4 // arrow + soon mouse + enum custom_keycodes { PLACEHOLDER = SAFE_RANGE, // can always be here EPRM, @@ -43,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Å | * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | Ctrl | A | S | D | F | G |------| |------| H | J | K | L |Ö / L2|Ä / Cmd | + * | Ctrl | A | S | D | F | G |------| |------| H | J | K | L |Ö / L2| Ä | * | | | | | | | Hyper| | Meh | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | Left |Z/Ctrl| X | C | V | B | | | | N | M | ; | : |_/Ctrl| RShift | @@ -60,29 +62,70 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Space| Bksp | End | | AltGr| Meta | Enter| * `--------------------' `----------------------' */ -// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// If it accepts an argument (i.e, is a function), it doesn't need KC_ // Otherwise, it needs KC_* [BASE] = KEYMAP_80( // layer 0 : default // left hand - NO_HALF, KC_1, KC_2, KC_3, KC_4, KC_5, LALT(KC_TAB), + NO_HALF, KC_1, KC_2, KC_3, KC_4, KC_5, KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), MO(ARRW), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), - LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_LEFT, KC_RGHT, - KC_ESC, KC_LGUI, - KC_SPC, KC_BSPC, KC_HOME, - NO_LESS, KC_DEL, KC_END, - // right hand - NO_PLUS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_DEL, KC_SPC, + NO_LESS, KC_END, + KC_LEFT, KC_RIGHT, KC_PGDN, + CTL_T(KC_ESC),ALT_T(KC_ENT),KC_LGUI, // right hand + TO(ZUDVP), KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS, TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, - KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), GUI_T(NO_AE), + KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), NO_AE, MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSFT, - KC_UP, KC_DOWN, NO_CIRC, NO_ASTR, KC_FN1, - KC_PGUP, CTL_T(KC_ESC), - KC_PGDN,KC_BSPC, KC_ENT, - NO_ALGR,KC_RGUI, KC_RGUI + KC_SPC, KC_BSPC, NO_CIRC, NO_ASTR, KC_FN1, + KC_HOME, NO_ALGR, + KC_PGUP, KC_UP, KC_DOWN, + KC_LGUI,ALT_T(KC_ENT), CTL_T(KC_ESC) +), +/* Keymap 1: Zudvp + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | Del | :; | ,< | .> | P | Y | L1 | | L1 | F | G | C | R | L | / | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | BkSp | A | O | E | U | I |------| |------| D | H | T | N | S/L2 | - | + * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| + * | LShift | '"/L1| Q | J | K | X | | | | B | M | W | V |Z/Ctrl| RShift | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |Grv/L1| '" |AltShf|BKSPC | SPC | | SPC | Del | [ | ] | ~L1 | + * `----------------------------------' `----------------------------------' + * ,-------------. ,---------------. + * | App | LGui | | Alt |Ctrl/Esc| + * ,------|------|------| |------+--------+------. + * | | | Home | | PgUp | | | + * |LCtrl | LAlt |------| |------| LAlt |LCtrl | + * |/Esc |/Enter| End | | PgDn | /Enter |/Esc | + * `--------------------' `----------------------' + */ +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* +[ZUDVP] = KEYMAP_80( // layer 0 : default + // left hand + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TO(BASE), + KC_DEL, KC_COLN, KC_COMM, KC_DOT, KC_P, KC_Y, TG(SYMB), + KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, + KC_RSFT, LT(SYMB,KC_QUOT), KC_Q, KC_J, KC_K, KC_X, ALL_T(KC_NO), + LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_BSPC, KC_SPC, + ALT_T(KC_APP), KC_END, + _______, _______, KC_PGDN, + CTL_T(KC_ESC),ALT_T(KC_ENT),KC_LGUI, + // right hand + TO(BASE), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + TG(SYMB), KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, + KC_D, KC_H, KC_T, KC_N, LT(MDIA, KC_S), KC_MINS, + MEH_T(KC_NO),KC_B, KC_M, KC_W, KC_V, LT(SYMB,KC_Z), KC_LSFT, + KC_SPC, KC_DELETE,KC_LBRC,KC_RBRC, KC_FN1, + KC_HOME, CTL_T(KC_ESC), + KC_PGUP, _______, _______, + KC_LGUI,ALT_T(KC_ENT), CTL_T(KC_ESC) ), - /* Keymap 1: Symbol Layer * * ,--------------------------------------------------. ,--------------------------------------------------. @@ -187,6 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), + }; const uint16_t PROGMEM fn_actions[] = { @@ -254,18 +298,20 @@ void matrix_scan_user(void) { ergodox_right_led_2_off(); ergodox_right_led_3_off(); switch (layer) { - // TODO: Make this relevant to the ErgoDox EZ. + // Binary: lsb at bottom case 1: - ergodox_right_led_1_on(); + ergodox_right_led_3_on(); break; case 2: ergodox_right_led_2_on(); break; case 3: + ergodox_right_led_2_on(); ergodox_right_led_3_on(); + case 4: + ergodox_right_led_1_on(); default: // none break; } - }; From 555bd59760b94d3da031da4da6043d1a4da050f7 Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Tue, 14 Nov 2017 08:19:08 +0200 Subject: [PATCH 06/15] move del to arrw cluster and switch places of algr and no_circ --- keyboards/ergodox_ez/keymaps/skug/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c index b94dbc7d5639..2e08a7edc82c 100644 --- a/keyboards/ergodox_ez/keymaps/skug/keymap.c +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), MO(ARRW), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), - LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_DEL, KC_SPC, + LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_BSPC, KC_SPC, NO_LESS, KC_END, KC_LEFT, KC_RIGHT, KC_PGDN, CTL_T(KC_ESC),ALT_T(KC_ENT),KC_LGUI, // right hand @@ -78,8 +78,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), NO_AE, MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSFT, - KC_SPC, KC_BSPC, NO_CIRC, NO_ASTR, KC_FN1, - KC_HOME, NO_ALGR, + KC_SPC, KC_BSPC, NO_ALGR, NO_ASTR, KC_FN1, + KC_HOME, NO_CIRC, KC_PGUP, KC_UP, KC_DOWN, KC_LGUI,ALT_T(KC_ENT), CTL_T(KC_ESC) ), @@ -216,7 +216,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_UP , _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, + _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 6c8da8a424ac9e31e691b1b4d9868c6070367cbb Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Sat, 27 Jan 2018 02:06:14 +0200 Subject: [PATCH 07/15] rework layouts --- keyboards/ergodox_ez/keymaps/skug/config.h | 12 ++ keyboards/ergodox_ez/keymaps/skug/keymap.c | 149 ++++++++------------- 2 files changed, 66 insertions(+), 95 deletions(-) create mode 100644 keyboards/ergodox_ez/keymaps/skug/config.h diff --git a/keyboards/ergodox_ez/keymaps/skug/config.h b/keyboards/ergodox_ez/keymaps/skug/config.h new file mode 100644 index 000000000000..6bdacc491dd8 --- /dev/null +++ b/keyboards/ergodox_ez/keymaps/skug/config.h @@ -0,0 +1,12 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// Override SpaceCadet Settings +#undef LSPO_KEY +#undef RSPC_KEY +#define LSPO_KEY KC_8 // Nordic Left SpaceCadet +#define RSPC_KEY KC_9 // Nordic Right SpaceCadet + +#endif diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c index 2e08a7edc82c..821fb65327fa 100644 --- a/keyboards/ergodox_ez/keymaps/skug/keymap.c +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -14,19 +14,23 @@ * along with this program. If not, see . */ + + + + #include QMK_KEYBOARD_H #include "debug.h" #include "action_layer.h" #include "version.h" #include "keymap_swedish.h" +#include "song_list.h" #define _______ KC_TRNS #define BASE 0 // default layer -#define ZUDVP 1 -#define SYMB 2 // symbols -#define MDIA 3 // media keys -#define ARRW 4 // arrow + soon mouse +#define SYMB 1 // symbols +#define MDIA 2 // media keys +#define ARRW 3 // arrow + soon mouse enum custom_keycodes { PLACEHOLDER = SAFE_RANGE, // can always be here @@ -39,27 +43,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ½ | ! | " | # | # | % | LEFT | | RIGHT| & | / | ( | ) | = | ? | + * | ½ | ! | " | # | # | % | Ins | | L1 | & | / | ( | ) | = | ? | * | § | 1 | 2 @ | 3 £ | 4 $ | 5 | | | | 6 | 7 { | 8 [ | 9 ] | 0 } | + \ | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Å | - * | | | | | | | | | | | | | | | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | Ctrl | A | S | D | F | G |------| |------| H | J | K | L |Ö / L2| Ä | - * | | | | | | | Hyper| | Meh | | | | | | | + * | Tab/ | Q | W | E | R | T | L2 | | L2 | Y | U | I | O | P | Å | + * | L4 | | | | | | | | | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | Left |Z/Ctrl| X | C | V | B | | | | N | M | ; | : |_/Ctrl| RShift | - * | Shift | | | | | | | | | | | , | . |- | | + * | Ctrl | A | S | D | F | G |------| |------| H | J | K | L |Ö / L3| Ä | + * | | | | | | | Hypr/| | Meh/ | | | | | | | + * |--------+------+------+------+------+------| Esc | | Ent |------+------+------+------+------+--------| + * | LShift/|Z/Ctrl| X | C | V | B | | | | N | M | ; | : |_/Ctrl| RShift/| + * | ( | | | | | | | | | | | , | . |- | ) | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | '/L1 | ` |Alt | Left | Right| | Up | Down | ^ | * | ~L1 | + * | '/L2 | ` |Alt | Left | Right| | Spc | Bksp | AltGr| * | ~L2 | * | | ' | | | | | | | | | | * `----------------------------------' `----------------------------------' * ,-------------. ,---------------. - * | Esc | LGui | | PgUp |Ctrl/Esc| + * | <>| | End | | Home | ^ | * ,------|------|------| |------+--------+------. - * | <>| | Del | Home | | PgDn | | | + * | Left | Right| PgDn | | PgUp | Up | Down | * |------|------|------| |------|--------|------| - * | Space| Bksp | End | | AltGr| Meta | Enter| + * | Ctrl/| Alt/ | | | | Alt/ | Ctrl/| + * | Enter| Esc | Lgui | | Lgui | Esc | Enter| * `--------------------' `----------------------' */ // If it accepts an argument (i.e, is a function), it doesn't need KC_ @@ -68,65 +73,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // left hand NO_HALF, KC_1, KC_2, KC_3, KC_4, KC_5, KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), - MO(ARRW), KC_A, KC_S, KC_D, KC_F, KC_G, - KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), + MO(ARRW), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSPO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_ESC), LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_BSPC, KC_SPC, - NO_LESS, KC_END, - KC_LEFT, KC_RIGHT, KC_PGDN, - CTL_T(KC_ESC),ALT_T(KC_ENT),KC_LGUI, // right hand - TO(ZUDVP), KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS, - TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, - KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), NO_AE, - MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSFT, - KC_SPC, KC_BSPC, NO_ALGR, NO_ASTR, KC_FN1, - KC_HOME, NO_CIRC, - KC_PGUP, KC_UP, KC_DOWN, - KC_LGUI,ALT_T(KC_ENT), CTL_T(KC_ESC) -), -/* Keymap 1: Zudvp - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | Del | :; | ,< | .> | P | Y | L1 | | L1 | F | G | C | R | L | / | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | BkSp | A | O | E | U | I |------| |------| D | H | T | N | S/L2 | - | - * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| - * | LShift | '"/L1| Q | J | K | X | | | | B | M | W | V |Z/Ctrl| RShift | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |Grv/L1| '" |AltShf|BKSPC | SPC | | SPC | Del | [ | ] | ~L1 | - * `----------------------------------' `----------------------------------' - * ,-------------. ,---------------. - * | App | LGui | | Alt |Ctrl/Esc| - * ,------|------|------| |------+--------+------. - * | | | Home | | PgUp | | | - * |LCtrl | LAlt |------| |------| LAlt |LCtrl | - * |/Esc |/Enter| End | | PgDn | /Enter |/Esc | - * `--------------------' `----------------------' - */ -// If it accepts an argument (i.e, is a function), it doesn't need KC_. -// Otherwise, it needs KC_* -[ZUDVP] = KEYMAP_80( // layer 0 : default - // left hand - KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TO(BASE), - KC_DEL, KC_COLN, KC_COMM, KC_DOT, KC_P, KC_Y, TG(SYMB), - KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, - KC_RSFT, LT(SYMB,KC_QUOT), KC_Q, KC_J, KC_K, KC_X, ALL_T(KC_NO), - LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_BSPC, KC_SPC, - ALT_T(KC_APP), KC_END, - _______, _______, KC_PGDN, - CTL_T(KC_ESC),ALT_T(KC_ENT),KC_LGUI, - // right hand - TO(BASE), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, - TG(SYMB), KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, - KC_D, KC_H, KC_T, KC_N, LT(MDIA, KC_S), KC_MINS, - MEH_T(KC_NO),KC_B, KC_M, KC_W, KC_V, LT(SYMB,KC_Z), KC_LSFT, - KC_SPC, KC_DELETE,KC_LBRC,KC_RBRC, KC_FN1, - KC_HOME, CTL_T(KC_ESC), - KC_PGUP, _______, _______, - KC_LGUI,ALT_T(KC_ENT), CTL_T(KC_ESC) + NO_LESS, KC_END, + KC_LEFT, KC_RIGHT, KC_PGDN, + CTL_T(KC_ENT), ALT_T(KC_ESC), KC_LGUI, // right hand + TO(ARRW), KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS, + TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, + KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), NO_AE, + MEH_T(KC_ENT), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSPC, + KC_SPC, KC_BSPC, NO_ALGR, NO_ASTR, KC_FN1, + KC_HOME, NO_CIRC, + KC_PGUP, KC_UP, KC_DOWN, + KC_LGUI, ALT_T(KC_ESC), CTL_T(KC_ENT) ), -/* Keymap 1: Symbol Layer +/* Keymap: Symbol Layer * * ,--------------------------------------------------. ,--------------------------------------------------. * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | @@ -135,20 +97,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | | | | | | | | . | 0 | = | | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. * |Animat| | |Toggle|Solid | * ,------|------|------| |------+------+------. - * |Bright|Bright| | | |Hue- |Hue+ | - * |ness- |ness+ |------| |------| | | * | | | | | | | | + * |------|------|------| |------|------|------| + * |BNess-|Bness+| | | |Hue- |Hue+ | * `--------------------' `--------------------' */ // SYMBOLS -[SYMB] = KEYMAP_80( +[SYMB] = KEYMAP_80( // left hand VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______,KC_EXLM,NO_AT, NO_LCBR,NO_RCBR,NO_PIPE,_______, @@ -169,14 +131,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_HUD, RGB_HUI ), -/* Keymap 2: Media and mouse keys +/* Keymap: Media and mouse keys * * ,--------------------------------------------------. ,--------------------------------------------------. * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | MsUp | | | | | | | | | | | | + * | | | MsUp | | | | | | | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * | |MsLeft|MsDown|MsRght| | |------| |------| | | | | | Play | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | | | | | | | | | | Prev | Next | | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' @@ -185,16 +147,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-------------. ,-------------. * | | | | | | * ,------|------|------| |------+------+------. - * | | | | | | |Brwser| - * | | |------| |------| |Back | * | | | | | | | | + * | |------|------| |------|------|------| + * | | | | | | |BrBck | * `--------------------' `--------------------' */ // MEDIA AND MOUSE [MDIA] = KEYMAP_80( _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, KC_MS_U, _______, _______, _______, - _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, + _______, _______, KC_MS_U, _______, _______, _______, _______, + _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, @@ -210,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, KC_WBAK ), - // Ducky Style arrows + // Keymap: Ducky Style arrows [ARRW] = KEYMAP_80( _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP , _______, _______, _______, _______, @@ -221,11 +183,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, // right hand - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, + TO(BASE), _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ @@ -300,16 +262,13 @@ void matrix_scan_user(void) { switch (layer) { // Binary: lsb at bottom case 1: - ergodox_right_led_3_on(); + ergodox_right_led_3_on(); break; case 2: ergodox_right_led_2_on(); break; case 3: - ergodox_right_led_2_on(); - ergodox_right_led_3_on(); - case 4: - ergodox_right_led_1_on(); + ergodox_board_led_on(); default: // none break; From 09fb5b60d66f0692cc5ad80d565ff257143e4158 Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Fri, 16 Feb 2018 14:30:25 +0200 Subject: [PATCH 08/15] =?UTF-8?q?Adds=20SYMB=20layer=20toggle=20to=20'?= =?UTF-8?q?=C3=A4'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #2 Also moves ctrl away from '-' and 'z' to the outer bottom corners and removes redundant SYMB layer binds from there --- keyboards/ergodox_ez/keymaps/skug/keymap.c | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c index 821fb65327fa..9b6e12474266 100644 --- a/keyboards/ergodox_ez/keymaps/skug/keymap.c +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -46,17 +46,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | ½ | ! | " | # | # | % | Ins | | L1 | & | / | ( | ) | = | ? | * | § | 1 | 2 @ | 3 £ | 4 $ | 5 | | | | 6 | 7 { | 8 [ | 9 ] | 0 } | + \ | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | Tab/ | Q | W | E | R | T | L2 | | L2 | Y | U | I | O | P | Å | - * | L4 | | | | | | | | | | | | | | | + * | Tab | Q | W | E | R | T | L2 | | L2 | Y | U | I | O | P | Å | + * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | Ctrl | A | S | D | F | G |------| |------| H | J | K | L |Ö / L3| Ä | + * | L4 | A | S | D | F | G |------| |------| H | J | K | L |Ö / L3| Ä/L2 | * | | | | | | | Hypr/| | Meh/ | | | | | | | * |--------+------+------+------+------+------| Esc | | Ent |------+------+------+------+------+--------| - * | LShift/|Z/Ctrl| X | C | V | B | | | | N | M | ; | : |_/Ctrl| RShift/| - * | ( | | | | | | | | | | | , | . |- | ) | + * | LShift/| Z | X | C | V | B | | | | N | M | ; | : | _ | RShift/| + * | ( | | | | | | | | | | | , | . | - | ) | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | '/L2 | ` |Alt | Left | Right| | Spc | Bksp | AltGr| * | ~L2 | - * | | ' | | | | | | | | | | + * | '/ | ` |Alt | Left | Right| | Spc | Bksp | AltGr| * | ~/ | + * | Ctrl | ' | | | | | | | | | Ctrl | * `----------------------------------' `----------------------------------' * ,-------------. ,---------------. * | <>| | End | | Home | ^ | @@ -75,15 +75,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), MO(ARRW), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_ESC), - LT(SYMB,NO_APOS), NO_ACUT, KC_LALT, KC_BSPC, KC_SPC, + CTL_T(NO_APOS), NO_ACUT, KC_LALT, KC_BSPC, KC_SPC, NO_LESS, KC_END, KC_LEFT, KC_RIGHT, KC_PGDN, - CTL_T(KC_ENT), ALT_T(KC_ESC), KC_LGUI, // right hand + CTL_T(KC_ENT), ALT_T(KC_ESC), KC_LGUI, + + // right hand TO(ARRW), KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS, TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA, - KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), NO_AE, - MEH_T(KC_ENT), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSPC, - KC_SPC, KC_BSPC, NO_ALGR, NO_ASTR, KC_FN1, + KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), LT(SYMB, NO_AE), + MEH_T(KC_ENT), KC_N, KC_M, KC_COMM, KC_DOT, NO_MINS, KC_RSPC, + KC_SPC, KC_BSPC, NO_ALGR, NO_ASTR, CTL_T(NO_TILD), KC_HOME, NO_CIRC, KC_PGUP, KC_UP, KC_DOWN, KC_LGUI, ALT_T(KC_ESC), CTL_T(KC_ENT) @@ -97,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | - | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | | | | | | | | . | 0 | = | | * `----------------------------------' `----------------------------------' From c7618ac79bfff0074ae698217c7ef31f287790b2 Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Fri, 16 Feb 2018 14:33:08 +0200 Subject: [PATCH 09/15] Adds mouse movement to right hand on ARRW layer Closes #3 --- keyboards/ergodox_ez/keymaps/skug/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c index 9b6e12474266..7a8812fa9e55 100644 --- a/keyboards/ergodox_ez/keymaps/skug/keymap.c +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -186,10 +186,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, // right hand TO(BASE), _______, _______, _______, _______, _______, _______, + _______, _______, KC_BTN4, KC_MS_U, KC_BTN5, _______, _______, + _______, KC_MC_L, KC_MC_D, KC_MC_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, + KC_BTN1, KC_BTN3, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ From 0edb2586f53f11e376ca5480ae45982e38c2c2b5 Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Fri, 16 Feb 2018 14:54:21 +0200 Subject: [PATCH 10/15] Fix typoed keycodes --- keyboards/ergodox_ez/keymaps/skug/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c index 7a8812fa9e55..1e3b0a579757 100644 --- a/keyboards/ergodox_ez/keymaps/skug/keymap.c +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand TO(BASE), _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN4, KC_MS_U, KC_BTN5, _______, _______, - _______, KC_MC_L, KC_MC_D, KC_MC_R, _______, _______, + _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, _______, _______, _______, _______, From 195e2c69da111c48c8086ab471415c64e1cd410f Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Sun, 19 Aug 2018 09:53:56 +0300 Subject: [PATCH 11/15] planck qwerty nordic --- keyboards/planck/keymaps/skug/config.h | 49 ++++ keyboards/planck/keymaps/skug/keymap.c | 347 ++++++++++++++++++++++++ keyboards/planck/keymaps/skug/readme.md | 2 + keyboards/planck/keymaps/skug/rules.mk | 1 + 4 files changed, 399 insertions(+) create mode 100644 keyboards/planck/keymaps/skug/config.h create mode 100644 keyboards/planck/keymaps/skug/keymap.c create mode 100644 keyboards/planck/keymaps/skug/readme.md create mode 100644 keyboards/planck/keymaps/skug/rules.mk diff --git a/keyboards/planck/keymaps/skug/config.h b/keyboards/planck/keymaps/skug/config.h new file mode 100644 index 000000000000..b8f91dca5b8c --- /dev/null +++ b/keyboards/planck/keymaps/skug/config.h @@ -0,0 +1,49 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "config_common.h" + +// Override SpaceCadet Settings +#undef LSPO_KEY +#undef RSPC_KEY +#define LSPO_KEY KC_8 // Nordic Left SpaceCadet +#define RSPC_KEY KC_9 // Nordic Right SpaceCadet + +#ifdef AUDIO_ENABLE + #define STARTUP_SONG SONG(COIN_SOUND) + // #define STARTUP_SONG SONG(NO_SOUND) + + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ + SONG(COLEMAK_SOUND), \ + SONG(DVORAK_SOUND) \ + } +#endif + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ + +#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 2 + +// Most tactile encoders have detents every 4 stages +#define ENCODER_RESOLUTION 4 + +#endif diff --git a/keyboards/planck/keymaps/skug/keymap.c b/keyboards/planck/keymaps/skug/keymap.c new file mode 100644 index 000000000000..509d7a760f22 --- /dev/null +++ b/keyboards/planck/keymaps/skug/keymap.c @@ -0,0 +1,347 @@ +/* Copyright 2015-2017 Jack Humbert + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "planck.h" +#include "action_layer.h" +#include "keymap_swedish.h" +#include "muse.h" + +extern keymap_config_t keymap_config; + +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +enum planck_layers { + _DEFAULT, + _LOWER, + _RAISE, + _UTILITY, + _ADJUST +}; + +enum planck_keycodes { + DEFAULT = SAFE_RANGE, + LOWER, + RAISE, + UTILITY, + BACKLIT, + S1, S2, S3, S4, S5, S6, S7, S8, S9 +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) +#define UTILITY MO(_UTILITY) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Å | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Fn | A | S | D | F | G | H | J | K | L | Ö | Ä | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | - |Shift | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | Super| Alt |Lower | Esc | Ret | Space| Bspc |Raise |AltGr | * | ¨ | + * `-----------------------------------------------------------------------------------' + */ +[_DEFAULT] = LAYOUT_planck_grid( + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , NO_AA , + UTILITY , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , NO_OSLH, LT(_RAISE, NO_AE), + KC_LSPO , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , NO_MINS, KC_RSPC , + CTL_T(NO_APOS), KC_LALT, KC_LGUI, LOWER , KC_ESC , KC_ENT , KC_SPC , KC_BSPC, RAISE , NO_ALGR, NO_ASTR, CTL_T(NO_TILD) +), + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | | | | | | { | } | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | Home | End | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = LAYOUT_planck_grid( + KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, _______, + KC_LSPO, NO_LESS, _______, _______, _______, NO_TILD, _______, _______, _______, KC_HOME, KC_END , KC_RSPC, + _______, _______, _______, _______, _______, _______, _______, _______, _______, NO_ALGR, _______, _______ +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | + | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | | | | | | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | |Pg Up |Pg Dn | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = LAYOUT_planck_grid( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PLUS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, + KC_LSPO, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_RSPC, + _______, _______, _______, _______, _______, _______, _______, _______, _______, NO_ALGR, _______, _______ +), + +/* Utility layer + * ,-----------------------------------------------------------------------------------. + * | | | up | | | | | | | | | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | left | down | right| | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | Del | | | | | | | + * `-----------------------------------------------------------------------------------' + */ + +[_UTILITY] = LAYOUT_planck_grid( + _______, _______, KC_UP , _______, _______, _______, _______, _______, S1 , S2 , S3 , _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, S4 , S5 , S6 , _______, + _______, _______, _______, _______, _______, _______, _______, _______, S7 , S8 , S9 , _______, + _______, _______, _______, _______, _______, _______, _______, KC_DEL , _______, _______, _______, _______ +), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty| | |Utilit| | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = LAYOUT_planck_grid( + _______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , + _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, DEFAULT, XXXXXXX, XXXXXXX, UTILITY, _______, + _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +) + + +}; + +#ifdef AUDIO_ENABLE + float plover_song[][2] = SONG(PLOVER_SOUND); + float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND); + float s1[][2] = SONG(NUMBER_ONE); + float s2[][2] = SONG(ZELDA_PUZZLE); + float s3[][2] = SONG(ZELDA_TREASURE); + float s4[][2] = SONG(OVERWATCH_THEME); + float s5[][2] = SONG(IMPERIAL_MARCH); + float s6[][2] = SONG(E1M1_DOOM); + float s7[][2] = SONG(COIN_SOUND); + float s8[][2] = SONG(ONE_UP_SOUND); + float s9[][2] = SONG(SONIC_RING); +#endif + +uint32_t layer_state_set_user(uint32_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case DEFAULT: + if (record->event.pressed) { + print("qerty\n"); + set_single_persistent_default_layer(_DEFAULT); + } + return false; + break; + case BACKLIT: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + #ifdef KEYBOARD_planck_rev5 + PORTE &= ~(1<<6); + #endif + } else { + unregister_code(KC_RSFT); + #ifdef KEYBOARD_planck_rev5 + PORTE |= (1<<6); + #endif + } + return false; + break; + case S1: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(s1); + #endif //AUDIO_ENABLE + } + return false; + break; + case S2: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(s2); + #endif //AUDIO_ENABLE + } + return false; + break; + case S3: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(s3); + #endif //AUDIO_ENABLE + } + return false; + break; + case S4: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(s4); + #endif //AUDIO_ENABLE + } + return false; + break; + case S5: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(s5); + #endif //AUDIO_ENABLE + } + return false; + break; + case S6: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(s6); + #endif //AUDIO_ENABLE + } + return false; + break; + case S7: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(s7); + #endif //AUDIO_ENABLE + } + return false; + break; + case S8: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(s8); + #endif //AUDIO_ENABLE + } + return false; + break; + case S9: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(s9); + #endif //AUDIO_ENABLE + } + return false; + break; + } + return true; +} + +bool muse_mode = false; +uint8_t last_muse_note = 0; +uint16_t muse_counter = 0; +uint8_t muse_offset = 70; +uint16_t muse_tempo = 50; + +void encoder_update(bool clockwise) { + if (muse_mode) { + if (IS_LAYER_ON(_RAISE)) { + if (clockwise) { + muse_offset++; + } else { + muse_offset--; + } + } else { + if (clockwise) { + muse_tempo+=1; + } else { + muse_tempo-=1; + } + } + } else { + if (clockwise) { + register_code(KC_PGDN); + unregister_code(KC_PGDN); + } else { + register_code(KC_PGUP); + unregister_code(KC_PGUP); + } + } +} + +void dip_update(uint8_t index, bool active) { + switch (index) { + case 0: + if (active) { + #ifdef AUDIO_ENABLE + PLAY_SONG(plover_song); + #endif + layer_on(_ADJUST); + } else { + #ifdef AUDIO_ENABLE + PLAY_SONG(plover_gb_song); + #endif + layer_off(_ADJUST); + } + break; + case 1: + if (active) { + muse_mode = true; + } else { + muse_mode = false; + #ifdef AUDIO_ENABLE + stop_all_notes(); + #endif + } + } +} + +void matrix_scan_user(void) { + #ifdef AUDIO_ENABLE + if (muse_mode) { + if (muse_counter == 0) { + uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()]; + if (muse_note != last_muse_note) { + stop_note(compute_freq_for_midi_note(last_muse_note)); + play_note(compute_freq_for_midi_note(muse_note), 0xF); + last_muse_note = muse_note; + } + } + muse_counter = (muse_counter + 1) % muse_tempo; + } + #endif +} + +bool music_mask_user(uint16_t keycode) { + switch (keycode) { + case RAISE: + case LOWER: + return false; + default: + return true; + } +} diff --git a/keyboards/planck/keymaps/skug/readme.md b/keyboards/planck/keymaps/skug/readme.md new file mode 100644 index 000000000000..de9680b49851 --- /dev/null +++ b/keyboards/planck/keymaps/skug/readme.md @@ -0,0 +1,2 @@ +# The Default Planck Layout + diff --git a/keyboards/planck/keymaps/skug/rules.mk b/keyboards/planck/keymaps/skug/rules.mk new file mode 100644 index 000000000000..dcf16bef3994 --- /dev/null +++ b/keyboards/planck/keymaps/skug/rules.mk @@ -0,0 +1 @@ +SRC += muse.c From a56c51580453ebaa94594816df1ff30339969ada Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Sun, 19 Aug 2018 10:10:59 +0300 Subject: [PATCH 12/15] Update README.md --- keyboards/ergodox_ez/keymaps/skug/keymap.c | 2 +- keyboards/ergodox_ez/keymaps/skug/readme.md | 34 +-------------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c index 1e3b0a579757..e317d883b4c0 100644 --- a/keyboards/ergodox_ez/keymaps/skug/keymap.c +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2017 Andreas Lindhé +/* Copyright 2018 Andreas Lindhé, Christoffer Holmberg * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/ergodox_ez/keymaps/skug/readme.md b/keyboards/ergodox_ez/keymaps/skug/readme.md index b5b859bce694..5c155619c051 100644 --- a/keyboards/ergodox_ez/keymaps/skug/readme.md +++ b/keyboards/ergodox_ez/keymaps/skug/readme.md @@ -1,36 +1,4 @@ -# Swedish (sv_SE) Qwerty layout for ErgoDox EZ, based on the Default configuration +# Nordic Qwerty layout for ErgoDox EZ, based on Andreas Lindhe's version *NOTE:* it might still be desirable to set the software layout to sv_SE in your OS. - -Remind me and I'll provide a picture of the layout. - -I have tried making this as close of a match I could between the [default -ErgoDox EZ configuration](https://ergodox-ez.com/pages/our-firmware) and a -standard Swedish Qwerty layout. - -## Notable differences from default: - -* There are three special character buttons (acute accent, circumflex/tilde and - apostrophe/asterisk) that don't have any buttons to map to naturally. I've put - these at other places: - - * Acute accent (´) can be found in the lower left corner, conveniently - placed to reach for making an é. - - * Apostrophe (') was put in the lower left corner, close to acute accent. - - * Circumflex (^) and asterisk (*) was placed in the lower right corner. - - * Tilde (~) and diaeresis (¨) I couldn't find a good place for, so I left - those out. I could only get the buttons to produce a single one of the - characters. How can I get it to work properly? - -* The Alt button on right thumb was exchanged for AltGr (RAlt). - -* I changed the backslash in the numpad (layer 1) for a minus. Thought it was - more sensible. - -* I didn't find a good place for the "<>|" button, so that one was left out. - That is a problem that really needs to be resolved. Pipe can be found on layer - one, however. From 36c9a6c5dcab9896fa9813a1e6728bba26435925 Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Sun, 19 Aug 2018 10:15:04 +0300 Subject: [PATCH 13/15] Update README.md --- keyboards/planck/keymaps/skug/readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/planck/keymaps/skug/readme.md b/keyboards/planck/keymaps/skug/readme.md index de9680b49851..259b52f86f45 100644 --- a/keyboards/planck/keymaps/skug/readme.md +++ b/keyboards/planck/keymaps/skug/readme.md @@ -1,2 +1,3 @@ -# The Default Planck Layout +# Nordic Planck +TODO: Add layout image From 65468b5f7629abe653c15191d3fb7f6a83c2d27d Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Mon, 20 Aug 2018 10:01:28 +0300 Subject: [PATCH 14/15] Implemented changes to planck layout requested by drashna --- keyboards/planck/keymaps/skug/config.h | 14 +- keyboards/planck/keymaps/skug/keymap.c | 243 ++++++++++++------------- 2 files changed, 119 insertions(+), 138 deletions(-) diff --git a/keyboards/planck/keymaps/skug/config.h b/keyboards/planck/keymaps/skug/config.h index b8f91dca5b8c..0a1d8d2892c8 100644 --- a/keyboards/planck/keymaps/skug/config.h +++ b/keyboards/planck/keymaps/skug/config.h @@ -1,23 +1,13 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "config_common.h" - -// Override SpaceCadet Settings -#undef LSPO_KEY -#undef RSPC_KEY -#define LSPO_KEY KC_8 // Nordic Left SpaceCadet -#define RSPC_KEY KC_9 // Nordic Right SpaceCadet +#pragma once #ifdef AUDIO_ENABLE - #define STARTUP_SONG SONG(COIN_SOUND) + #define STARTUP_SONG SONG(PLANCK_SOUND) // #define STARTUP_SONG SONG(NO_SOUND) #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ SONG(COLEMAK_SOUND), \ SONG(DVORAK_SOUND) \ } -#endif /* * MIDI options diff --git a/keyboards/planck/keymaps/skug/keymap.c b/keyboards/planck/keymaps/skug/keymap.c index 509d7a760f22..00b2ab21ce09 100644 --- a/keyboards/planck/keymaps/skug/keymap.c +++ b/keyboards/planck/keymaps/skug/keymap.c @@ -14,126 +14,158 @@ * along with this program. If not, see . */ -#include "planck.h" -#include "action_layer.h" -#include "keymap_swedish.h" +#include QMK_KEYBOARD_H #include "muse.h" extern keymap_config_t keymap_config; -#define _______ KC_TRNS -#define XXXXXXX KC_NO - enum planck_layers { - _DEFAULT, + _QWERTY, + _COLEMAK, + _DVORAK, _LOWER, _RAISE, - _UTILITY, + _PLOVER, _ADJUST }; enum planck_keycodes { - DEFAULT = SAFE_RANGE, - LOWER, - RAISE, - UTILITY, + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + PLOVER, BACKLIT, - S1, S2, S3, S4, S5, S6, S7, S8, S9 + EXT_PLV }; #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) -#define UTILITY MO(_UTILITY) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | E | R | T | Y | U | I | O | P | Å | + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = LAYOUT_planck_grid( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_ESC, 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_ENT , + BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT +), + +/* Colemak + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | R | S | T | D | H | N | E | I | O | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_COLEMAK] = LAYOUT_planck_grid( + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, + KC_ESC, 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_ENT , + BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT +), + +/* Dvorak + * ,-----------------------------------------------------------------------------------. + * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Fn | A | S | D | F | G | H | J | K | L | Ö | Ä | + * | Esc | A | O | E | U | I | D | H | T | N | S | / | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | - |Shift | + * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Super| Alt |Lower | Esc | Ret | Space| Bspc |Raise |AltGr | * | ¨ | + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ -[_DEFAULT] = LAYOUT_planck_grid( - KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , NO_AA , - UTILITY , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , NO_OSLH, LT(_RAISE, NO_AE), - KC_LSPO , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , NO_MINS, KC_RSPC , - CTL_T(NO_APOS), KC_LALT, KC_LGUI, LOWER , KC_ESC , KC_ENT , KC_SPC , KC_BSPC, RAISE , NO_ALGR, NO_ASTR, CTL_T(NO_TILD) +[_DVORAK] = LAYOUT_planck_grid( + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, + KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, + KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , + BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Lower * ,-----------------------------------------------------------------------------------. - * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | | { | } | | + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | Home | End | | + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | Home | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | Vol- | Vol+ | Play | + * | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' */ [_LOWER] = LAYOUT_planck_grid( - KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, _______, - KC_LSPO, NO_LESS, _______, _______, _______, NO_TILD, _______, _______, _______, KC_HOME, KC_END , KC_RSPC, - _______, _______, _______, _______, _______, _______, _______, _______, _______, NO_ALGR, _______, _______ + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), /* Raise * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | + | + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | | [ | ] | \ | + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | |Pg Up |Pg Dn | | + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / |Pg Up |Pg Dn | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | Vol- | Vol+ | Play | + * | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_planck_grid( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PLUS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, - KC_LSPO, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_RSPC, - _______, _______, _______, _______, _______, _______, _______, _______, _______, NO_ALGR, _______, _______ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), -/* Utility layer +/* Plover layer (http://opensteno.org) * ,-----------------------------------------------------------------------------------. - * | | | up | | | | | | | | | | + * | # | # | # | # | # | # | # | # | # | # | # | # | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | left | down | right| | | | | | | | | + * | | S | T | P | H | * | * | F | P | L | T | D | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | + * | | S | K | W | R | * | * | R | B | G | S | Z | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Del | | | | | | | + * | Exit | | | A | O | | E | U | | | | * `-----------------------------------------------------------------------------------' */ -[_UTILITY] = LAYOUT_planck_grid( - _______, _______, KC_UP , _______, _______, _______, _______, _______, S1 , S2 , S3 , _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, S4 , S5 , S6 , _______, - _______, _______, _______, _______, _______, _______, _______, _______, S7 , S8 , S9 , _______, - _______, _______, _______, _______, _______, _______, _______, KC_DEL , _______, _______, _______, _______ +[_PLOVER] = LAYOUT_planck_grid( + KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , + XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, + XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX ), /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. * | | Reset| | | | | | | | | | Del | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty| | |Utilit| | + * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| | * |------+------+------+------+------+------|------+------+------+------+------+------| * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | + * | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_planck_grid( _______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , - _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, DEFAULT, XXXXXXX, XXXXXXX, UTILITY, _______, + _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______, _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) @@ -144,15 +176,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef AUDIO_ENABLE float plover_song[][2] = SONG(PLOVER_SOUND); float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND); - float s1[][2] = SONG(NUMBER_ONE); - float s2[][2] = SONG(ZELDA_PUZZLE); - float s3[][2] = SONG(ZELDA_TREASURE); - float s4[][2] = SONG(OVERWATCH_THEME); - float s5[][2] = SONG(IMPERIAL_MARCH); - float s6[][2] = SONG(E1M1_DOOM); - float s7[][2] = SONG(COIN_SOUND); - float s8[][2] = SONG(ONE_UP_SOUND); - float s9[][2] = SONG(SONIC_RING); #endif uint32_t layer_state_set_user(uint32_t state) { @@ -161,10 +184,22 @@ uint32_t layer_state_set_user(uint32_t state) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case DEFAULT: + case QWERTY: if (record->event.pressed) { - print("qerty\n"); - set_single_persistent_default_layer(_DEFAULT); + print("mode just switched to qwerty and this is a huge string\n"); + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_DVORAK); } return false; break; @@ -185,75 +220,31 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case S1: + case PLOVER: if (record->event.pressed) { #ifdef AUDIO_ENABLE - PLAY_SONG(s1); - #endif //AUDIO_ENABLE - } - return false; - break; - case S2: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(s2); - #endif //AUDIO_ENABLE - } - return false; - break; - case S3: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(s3); - #endif //AUDIO_ENABLE - } - return false; - break; - case S4: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(s4); - #endif //AUDIO_ENABLE - } - return false; - break; - case S5: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(s5); - #endif //AUDIO_ENABLE - } - return false; - break; - case S6: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(s6); - #endif //AUDIO_ENABLE - } - return false; - break; - case S7: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(s7); - #endif //AUDIO_ENABLE - } - return false; - break; - case S8: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(s8); - #endif //AUDIO_ENABLE + stop_all_notes(); + PLAY_SONG(plover_song); + #endif + layer_off(_RAISE); + layer_off(_LOWER); + layer_off(_ADJUST); + layer_on(_PLOVER); + if (!eeconfig_is_enabled()) { + eeconfig_init(); + } + keymap_config.raw = eeconfig_read_keymap(); + keymap_config.nkro = 1; + eeconfig_update_keymap(keymap_config.raw); } return false; break; - case S9: + case EXT_PLV: if (record->event.pressed) { #ifdef AUDIO_ENABLE - PLAY_SONG(s9); - #endif //AUDIO_ENABLE + PLAY_SONG(plover_gb_song); + #endif + layer_off(_PLOVER); } return false; break; From 6521436e5d1dc7b1f3476edffd54638fcae1e574 Mon Sep 17 00:00:00 2001 From: Christoffer Holmberg Date: Mon, 20 Aug 2018 10:04:03 +0300 Subject: [PATCH 15/15] Implemented changes to ergodox layout requested by drashna NOTE: `version.h` is still required. --- keyboards/ergodox_ez/keymaps/skug/config.h | 8 +------- keyboards/ergodox_ez/keymaps/skug/keymap.c | 11 ++++------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/keyboards/ergodox_ez/keymaps/skug/config.h b/keyboards/ergodox_ez/keymaps/skug/config.h index 6bdacc491dd8..d972813920d5 100644 --- a/keyboards/ergodox_ez/keymaps/skug/config.h +++ b/keyboards/ergodox_ez/keymaps/skug/config.h @@ -1,12 +1,6 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#pragma once -#include "../../config.h" - -// Override SpaceCadet Settings #undef LSPO_KEY #undef RSPC_KEY #define LSPO_KEY KC_8 // Nordic Left SpaceCadet #define RSPC_KEY KC_9 // Nordic Right SpaceCadet - -#endif diff --git a/keyboards/ergodox_ez/keymaps/skug/keymap.c b/keyboards/ergodox_ez/keymaps/skug/keymap.c index e317d883b4c0..0d2ec1dd9f20 100644 --- a/keyboards/ergodox_ez/keymaps/skug/keymap.c +++ b/keyboards/ergodox_ez/keymaps/skug/keymap.c @@ -19,11 +19,8 @@ #include QMK_KEYBOARD_H -#include "debug.h" -#include "action_layer.h" #include "version.h" #include "keymap_swedish.h" -#include "song_list.h" #define _______ KC_TRNS @@ -69,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ // If it accepts an argument (i.e, is a function), it doesn't need KC_ // Otherwise, it needs KC_* -[BASE] = KEYMAP_80( // layer 0 : default +[BASE] = LAYOUT_ergodox_80( // layer 0 : default // left hand NO_HALF, KC_1, KC_2, KC_3, KC_4, KC_5, KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), @@ -112,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------' `--------------------' */ // SYMBOLS -[SYMB] = KEYMAP_80( +[SYMB] = LAYOUT_ergodox_80( // left hand VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______,KC_EXLM,NO_AT, NO_LCBR,NO_RCBR,NO_PIPE,_______, @@ -155,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------' `--------------------' */ // MEDIA AND MOUSE -[MDIA] = KEYMAP_80( +[MDIA] = LAYOUT_ergodox_80( _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, @@ -175,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_WBAK ), // Keymap: Ducky Style arrows -[ARRW] = KEYMAP_80( +[ARRW] = LAYOUT_ergodox_80( _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP , _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,