diff options
| author | coderkun <olli@coderkun.de> | 2016-01-15 20:19:45 +0100 |
|---|---|---|
| committer | coderkun <olli@coderkun.de> | 2016-01-15 20:19:45 +0100 |
| commit | bd9aebc84a8b14d861244775e339a9bd36c69d22 (patch) | |
| tree | 30d273684775c2c4dcc254f4e5eb8c1cf4bf6548 /keyboard/ergodox_ez/keymaps/keymap_osx_de.c | |
| parent | 57bf227f6de9eac4dd3ae8f83fa75545de3b1d4e (diff) | |
merge upstream
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/keymap_osx_de.c')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/keymap_osx_de.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/keyboard/ergodox_ez/keymaps/keymap_osx_de.c b/keyboard/ergodox_ez/keymaps/keymap_osx_de.c index 0a0ae75fcb..91f2c33f31 100644 --- a/keyboard/ergodox_ez/keymaps/keymap_osx_de.c +++ b/keyboard/ergodox_ez/keymaps/keymap_osx_de.c @@ -1,6 +1,3 @@ -// Netable differences vs. the default firmware for the ErgoDox EZ: -// 1. The Cmd key is now on the right side, making Cmd+Space easier. -// 2. The media keys work on OSX (But not on Windows). #include "ergodox_ez.h" #include "debug.h" #include "action_layer.h" @@ -18,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 |Lctrl | |Rctrl | 6 | 7 | 8 | 9 | 0 | ß | + * | ESC | 1 | 2 | 3 | 4 | 5 |CMD-V | |CMD-C | 6 | 7 | 8 | 9 | 0 | ß | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | TAB | Q | W | E | R | T | CMD | | CMD | Z | U | I | O | P | ü | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -28,28 +25,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * |</L1| ^° |AltShf| Left | Right| | Up | Down | CMD-SHIFT | + | #/L1 | * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | L1 | LGui | | Alt |Ctrl/Esc| + * ,-------------. ,---------------. + * | MDIA | Meh | | Hyper| NUM | * ,------|------|------| |------+--------+------. * | | | Home | | PgUp | | | - * | Space|Backsp|------| |------| Enter | Space| - * | |ace | End | | PgDn | | | + * | Back-| Del |------| |------| Enter | Space| + * | Space| | End | | PgDn | | | * `--------------------' `----------------------' */ // If it accepts an argument (i.e, is a function), it doesn't need KC_. // Otherwise, it needs KC_* [BASE] = KEYMAP( // layer 0 : default // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LCTL, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LGUI(KC_V), KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LGUI, TG(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_LALT, LT(SYMB,KC_GRV), DE_LESS, LALT(KC_LSFT), KC_LEFT,KC_RGHT, - TG(2), MEH_T(KC_NO), + TG(2), MEH_T(LSFT(DE_ACUT)), KC_HOME, - KC_SPC,KC_BSPC,KC_END, + KC_BSPC,KC_DEL,KC_END, // right hand - KC_RCTL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + LGUI(KC_C), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_RGUI, KC_Y, KC_U, KC_I, KC_O, KC_P, DE_UE, KC_H, KC_J, KC_K, KC_L, KC_SCLN,LT(MDIA,DE_AE), KC_RALT,KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, @@ -126,7 +123,7 @@ KEYMAP( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, @@ -231,7 +228,7 @@ void * matrix_scan_user(void) { case 4: ergodox_right_led_1_on(); ergodox_right_led_3_on(); - ergodox_board_led_on(); + //ergodox_board_led_on(); break; default: // none |