From f958b2e83203e4e0ba1814d7c5936e20a337f0a8 Mon Sep 17 00:00:00 2001 From: Stephan Bösebeck Date: Sun, 24 Jan 2016 21:54:31 +0100 Subject: typo fix --- keyboard/ergodox_ez/keymaps/osx_de/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c index 69acd9b95..d18eba6ff 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI, KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G, KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT, - LT(SYMB,KC_GRV), DE_LESS, LALT(KC_LSFT), KC_LEFT,KC_RGHT, + LT(SYMB,DE_LESS), DE_CIRC, LALT(KC_LSFT), KC_LEFT,KC_RGHT, M(M_MEH_SH_ACUT), TG(2), KC_HOME, KC_BSPC,KC_DEL, KC_END, -- cgit v1.2.3 From 4beb0115ffe6ec177d91f63c10a06a5770991af0 Mon Sep 17 00:00:00 2001 From: Stephan Bösebeck Date: Thu, 28 Jan 2016 14:56:55 +0100 Subject: playing a bit with cursor keys --- keyboard/ergodox_ez/keymaps/osx_de/keymap.c | 99 ++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 23 deletions(-) diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c index d18eba6ff..01e8cd239 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c @@ -6,13 +6,23 @@ #define BASE 0 // default layer #define SYMB 1 // symbols #define MDIA 2 // media keys -#define CRSR 3 // media keys +#define SMLY 3 // media keys #define NUMB 4 // number keys #define M_CTRL_CMDV 1 #define M_CTRL_CMDC 2 #define M_MEH_SH_ACUT 3 +#define SM_SMILE 4 +#define SM_SMIRK 5 +#define SM_FROWN 6 +#define SM_CRY 7 +#define SM_KISS 8 +#define SM_HEART 9 +#define SM_LAUGH 10 +#define SM_SAD 11 + + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer * @@ -43,16 +53,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI, KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G, KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT, - LT(SYMB,DE_LESS), DE_CIRC, LALT(KC_LSFT), KC_LEFT,KC_RGHT, + LT(SYMB,DE_LESS), DE_CIRC, DE_PLUS, LALT(KC_LSFT), LGUI(KC_LSFT), M(M_MEH_SH_ACUT), TG(2), KC_HOME, - KC_BSPC,KC_DEL, KC_END, + KC_BSPC,KC_DEL, LT(SMLY,KC_END), // right hand M(M_CTRL_CMDC), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS, KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UE, DE_H, DE_J, DE_K, DE_L, DE_OE, ALT_T(DE_AE), KC_RALT, DE_N, DE_M, DE_COMM,DE_DOT, CTL_T(DE_MINS), KC_RSFT, - KC_UP, KC_DOWN,LGUI(KC_LSFT),DE_PLUS, LT(SYMB,DE_HASH), + KC_LEFT, KC_DOWN,KC_UP,KC_RIGHT, LT(SYMB,DE_HASH), TG(4), ALL_T(DE_ACUT), KC_PGUP, KC_PGDN,KC_ENT, KC_SPC @@ -140,20 +150,20 @@ KEYMAP( KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK ), -// ADNW-KOY layer -/* Keymap 3: ADNW-Koy layer - * ADNW-Koy is a special layout designed to be ergonomic. Was created using software to determine the most ergonomic way to type German and English texts. +/* Keymap 3: Smiley layer + * making it easier to type smileys... tipp: on osx you can easily replace those smileys with the UTF-8 character using + * keyboard short commands... * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | | | | | - | + * | | | | | | | | | :-) | ;-) | :-D | | | | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | K | . | O | , | Y | | | | V | G | C | L | ß | Z | + * | | | | | | | | | | :-{ | :-( | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | H | A | E | I | U |------| |------| D | T | R | N | S | F/L2 | + * | | | | | | |------| |------| <3 | :-* | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | |X/Ctrl| Q | Ä | Ü | Ö | | | | B | P | W | M |J/Ctrl| RShift | + * | | | | | | | | | | | | | | | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |event.pressed) { + return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END); + } + break; + + case SM_SMIRK: + if (record->event.pressed) { + return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END); + } + break; + case SM_CRY: + if (record->event.pressed) { + return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END); + } + break; + + case SM_SAD: + if (record->event.pressed) { + return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END); + } + break; + + case SM_HEART: + if (record->event.pressed) { + return MACRO(T(GRV),T(3),END); + } + break; + case SM_LAUGH: + if (record->event.pressed) { + return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(D),U(LSFT),END); + } + break; + case SM_KISS: + if (record->event.pressed) { + return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(RBRC),U(LSFT),END); + } + break; + case SM_FROWN: + if (record->event.pressed) { + return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LALT),T(8),U(LALT),END); + } + break; } return MACRO_NONE; }; -- cgit v1.2.3 From 2776251ffcac65b4caa92c04c51e269aae05e1c0 Mon Sep 17 00:00:00 2001 From: Stephan Bösebeck Date: Thu, 28 Jan 2016 15:37:52 +0100 Subject: playing more with cursor keys --- keyboard/ergodox_ez/keymaps/osx_de/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c index 01e8cd239..52d4fb30f 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UE, DE_H, DE_J, DE_K, DE_L, DE_OE, ALT_T(DE_AE), KC_RALT, DE_N, DE_M, DE_COMM,DE_DOT, CTL_T(DE_MINS), KC_RSFT, - KC_LEFT, KC_DOWN,KC_UP,KC_RIGHT, LT(SYMB,DE_HASH), + KC_LEFT, KC_UP,KC_DOWN,KC_RIGHT, LT(SYMB,DE_HASH), TG(4), ALL_T(DE_ACUT), KC_PGUP, KC_PGDN,KC_ENT, KC_SPC -- cgit v1.2.3 From f1533745175165f5967b6882c2e0099b5c0f5586 Mon Sep 17 00:00:00 2001 From: Stephan Bösebeck Date: Thu, 28 Jan 2016 15:58:19 +0100 Subject: added new macros --- keyboard/ergodox_ez/keymaps/osx_de/keymap.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c index 52d4fb30f..0661d7c60 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c @@ -12,6 +12,8 @@ #define M_CTRL_CMDV 1 #define M_CTRL_CMDC 2 #define M_MEH_SH_ACUT 3 +#define M_DE_PLUS_CTRLALT 12 +#define M_DE_CIRC_CTRLCMD 13 #define SM_SMILE 4 #define SM_SMIRK 5 @@ -53,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI, KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G, KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT, - LT(SYMB,DE_LESS), DE_CIRC, DE_PLUS, LALT(KC_LSFT), LGUI(KC_LSFT), + LT(SYMB,DE_LESS), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), LALT(KC_LSFT), LGUI(KC_LSFT), M(M_MEH_SH_ACUT), TG(2), KC_HOME, KC_BSPC,KC_DEL, LT(SMLY,KC_END), @@ -267,6 +269,30 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } } break; + case M_DE_CIRC_CTRLCMD: + if (record->event.pressed) { + start = timer_read(); + return MACRO(D(LCTRL),D(LGUI),END); + } else { + if (timer_elapsed(start) > 150){ + return MACRO(U(LCTRL),U(LGUI),END); + } else { + return MACRO(U(LCTRL),U(LGUI),T(NUBS),END); + } + } + break; + case M_DE_PLUS_CTRLALT: + if (record->event.pressed) { + start = timer_read(); + return MACRO(D(LCTRL),D(LALT),END); + } else { + if (timer_elapsed(start) > 150){ + return MACRO(U(LCTRL),U(LALT),END); + } else { + return MACRO(U(LCTRL),U(LALT),T(RBRC),END); + } + } + break; case SM_SMILE: if (record->event.pressed) { return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END); -- cgit v1.2.3 From 7b989a962ec7b9b2f4b1ab809521a24780e4f575 Mon Sep 17 00:00:00 2001 From: Stephan Bösebeck Date: Fri, 29 Jan 2016 23:31:58 +0100 Subject: added a egoshooter layer --- keyboard/ergodox_ez/keymaps/osx_de/keymap.c | 62 +++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c index 0661d7c60..f76444a18 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c @@ -8,12 +8,14 @@ #define MDIA 2 // media keys #define SMLY 3 // media keys #define NUMB 4 // number keys +#define EGOS 5 // Egoshooter layer #define M_CTRL_CMDV 1 #define M_CTRL_CMDC 2 #define M_MEH_SH_ACUT 3 #define M_DE_PLUS_CTRLALT 12 #define M_DE_CIRC_CTRLCMD 13 +#define M_TOGGLE_5 14 #define SM_SMILE 4 #define SM_SMIRK 5 @@ -72,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 1: Symbol Layer * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * | | F1 | F2 | F3 | F4 | F5 | | | L5 | F6 | F7 | F8 | F9 | F10 | F11 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | < | > | ! | ? | | | | | \ | [ | ] | | | # | F12 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -102,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS,KC_DEL,KC_TRNS, // right hand - KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + M(M_TOGGLE_5), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), LALT(KC_7), DE_HASH, KC_F12, DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), KC_TRNS, KC_TRNS, DE_AMPR, KC_GRV, LSFT(KC_GRV), DE_DQOT, DE_QUOT, DE_QST, @@ -114,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 2: Media and mouse keys * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | Mute | | | | | | Play | + * | | | | | | | | | Mute | | | | | | EGOS | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | | Lclk | MsUp | Rclk | WlUp | | | | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -214,6 +216,47 @@ KEYMAP( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), + +/* Keymap 3: Egoshooter layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | L5 | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | SHIFT | | | | | |------| |------| | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | CTRL | | | | | | | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | F1 | F2 | | | | + * ,------|------|------| |------+--------+------. + * | | | F3 | | | | | + * | SPACE| CTRL|------| |------| | | + * | | | F4 | | | | | + * `--------------------' `----------------------' + */ +KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, + KC_LSFT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_F1, KC_F2, + KC_F3, + KC_SPC, KC_LCTL, KC_F4, + // right hand + M(M_TOGGLE_5), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS +), }; const uint16_t PROGMEM fn_actions[] = { @@ -336,7 +379,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LALT),T(8),U(LALT),END); } break; - } + case M_TOGGLE_5: + if (record->event.pressed){ + layer_state ^= (1<<5); + layer_state &= (1<<5); + } + break; + } return MACRO_NONE; }; @@ -370,6 +419,11 @@ void * matrix_scan_user(void) { ergodox_right_led_3_on(); //ergodox_board_led_on(); break; + case 5: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); + break; default: // none break; -- cgit v1.2.3 From bf64046a044987ebcccfa286a88dc8a981d5508b Mon Sep 17 00:00:00 2001 From: Stephan Bösebeck Date: Fri, 29 Jan 2016 23:43:56 +0100 Subject: fixed some copy paste errors --- keyboard/ergodox_ez/keymaps/osx_de/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c index f76444a18..0298cb702 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c @@ -240,8 +240,8 @@ KEYMAP( */ KEYMAP( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, - KC_LSFT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, -- cgit v1.2.3 From 602090a4300e9e206eee0080c55b83fe3b2acabe Mon Sep 17 00:00:00 2001 From: Stephan Bösebeck Date: Sun, 31 Jan 2016 00:21:34 +0100 Subject: some fixes in readme --- keyboard/ergodox_ez/keymaps/osx_de/readme.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboard/ergodox_ez/keymaps/osx_de/readme.md b/keyboard/ergodox_ez/keymaps/osx_de/readme.md index 6b17d75d5..44d7a334e 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de/readme.md +++ b/keyboard/ergodox_ez/keymaps/osx_de/readme.md @@ -4,13 +4,14 @@ Dies ist nur ein kleiner Tweak der bestehenden firmware für das ErgoDox-EZ-Keyb - Die Umlaute sollten an einigermassen sinnvollen Plätzen liegen - der Umstieg sollte dadurch erleichtert werden, dass einige Tasten an ihren "normalen" Platz zurückgewandert sind. Z.B. ESC, Tab,... -- die Leertaste lässt sich jetzt mit beiden Daumen bedienen +- die Leertaste ist jetzt auf der rechten seite, neben Enter. Dafür hat der linke Daumen nun Backspace und Delete. - die CMD- und Alt-Tasten sind in der Mitte einfach erreichbar. -- es gibt eine neue Layer für die Nutzung der Cursortasten, dort sind sie etwas einfacher angeordnet und sind z.B. auch für Spiele nutzbar +- es gibt eine neue Layer die für Spiele genutzt werden kann (egosooter wie Counter Strike). Dort liegen die wichtigsten Tasten auf der linken Seite, im Daumenblock z.B. space und ctrl sowie die F-Tasten 1-4. Diese Layer ist über die Symbollayer erreichbar. - Die Symbollayer wurde dahingehend angepasst, dass die klammern, etc nun auf beiden hälften der Tastatur zu finden sind - der Zehnerblock wurde in eine eigene Layer umgezogen - die Meh und Hyper-Tasten wurden in die Daumenblöcke umgezogen + ------------------------------ # ErgoDox EZ for OSX -- cgit v1.2.3