diff options
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/keymap_default_osx.png | bin | 185123 -> 0 bytes | |||
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/keymap_osx_de_andw_koy.c | 31 |
2 files changed, 17 insertions, 14 deletions
diff --git a/keyboard/ergodox_ez/keymaps/keymap_default_osx.png b/keyboard/ergodox_ez/keymaps/keymap_default_osx.png Binary files differdeleted file mode 100644 index f8f6eb9a72..0000000000 --- a/keyboard/ergodox_ez/keymaps/keymap_default_osx.png +++ /dev/null diff --git a/keyboard/ergodox_ez/keymaps/keymap_osx_de_andw_koy.c b/keyboard/ergodox_ez/keymaps/keymap_osx_de_andw_koy.c index 2eba57f367..d32e01ddc4 100644 --- a/keyboard/ergodox_ez/keymaps/keymap_osx_de_andw_koy.c +++ b/keyboard/ergodox_ez/keymaps/keymap_osx_de_andw_koy.c @@ -1,3 +1,6 @@ +// 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" @@ -6,7 +9,7 @@ #define BASE 0 // default layer #define SYMB 1 // symbols #define MDIA 2 // media keys -#define CRSR 3 // media keys +#define ANDW 3 // media keys #define NUMB 4 // number keys @@ -15,7 +18,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 | ü | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -25,28 +28,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, @@ -123,7 +126,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, @@ -179,7 +182,7 @@ KEYMAP( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), -//number pad + 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, @@ -203,7 +206,7 @@ KEYMAP( const uint16_t PROGMEM fn_actions[] = { [1] = ACTION_LAYER_TAP_TOGGLE(SYMB), // FN1 - Momentary Layer 1 (Symbols) - [2] = ACTION_LAYER_TAP_TOGGLE(CRSR) // FN2 - Momentary Layer 2 (Cursors) + [2] = ACTION_LAYER_TAP_TOGGLE(ANDW) // FN2 - Momentary Layer 2 (ANDW) }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) @@ -249,7 +252,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 |
