diff options
| author | xyverz <xyverz@gmail.com> | 2017-01-09 06:47:08 +0100 |
|---|---|---|
| committer | xyverz <xyverz@gmail.com> | 2017-01-09 06:47:08 +0100 |
| commit | 99521a448296902d15c597f4d2e170766c4afadb (patch) | |
| tree | 8daa16747393c2cef6b897fbb88e74ef427df76e /keyboards/ergodox/keymaps/default | |
| parent | 79343f1c6cde28c454eac0a577d0d7dbf3aa2f17 (diff) | |
| parent | 176b93d08eb5cc0c65a6d571fc2c1fec5f575854 (diff) | |
| download | qmk_firmware-99521a448296902d15c597f4d2e170766c4afadb.tar.gz qmk_firmware-99521a448296902d15c597f4d2e170766c4afadb.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/ergodox/keymaps/default')
| -rw-r--r-- | keyboards/ergodox/keymaps/default/default_firmware_v1.2-2.png | bin | 0 -> 257921 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/default/keymap.c | 12 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/default/readme.md | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/keyboards/ergodox/keymaps/default/default_firmware_v1.2-2.png b/keyboards/ergodox/keymaps/default/default_firmware_v1.2-2.png Binary files differnew file mode 100644 index 000000000..e3c321cc0 --- /dev/null +++ b/keyboards/ergodox/keymaps/default/default_firmware_v1.2-2.png diff --git a/keyboards/ergodox/keymaps/default/keymap.c b/keyboards/ergodox/keymaps/default/keymap.c index 4eff28085..4477cab31 100644 --- a/keyboards/ergodox/keymaps/default/keymap.c +++ b/keyboards/ergodox/keymaps/default/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | BkSp | A | S | D | F | G |------| |------| H |J/Alt | K | L |; / L2|' / Cmd | + * | BkSp | A | S | D | F | G |------| |------| H | J | K | L |; / L2|' / Cmd | * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' @@ -49,11 +49,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HOME, KC_SPC,KC_BSPC,KC_END, // right hand - KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_H, ALT_T(KC_J), KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), - MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, - KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, + KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), + MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, + KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, KC_LALT, CTL_T(KC_ESC), KC_PGUP, KC_PGDN,KC_TAB, KC_ENT diff --git a/keyboards/ergodox/keymaps/default/readme.md b/keyboards/ergodox/keymaps/default/readme.md index f68138ed6..979ce0f5b 100644 --- a/keyboards/ergodox/keymaps/default/readme.md +++ b/keyboards/ergodox/keymaps/default/readme.md @@ -2,6 +2,9 @@ ## Changelog +* Dec 2016: + * Added LED keys + * Refreshed layout graphic, comes from http://configure.ergodox-ez.com now. * Sep 22, 2016: * Created a new key in layer 1 (bottom-corner key) that resets the EEPROM. * Feb 2, 2016 (V1.1): @@ -9,4 +12,4 @@ This is what we ship with out of the factory. :) The image says it all: - + |
