diff options
| author | Erez Zukerman <ezuk@madmimi.com> | 2016-02-11 16:55:10 +0200 |
|---|---|---|
| committer | Erez Zukerman <ezuk@madmimi.com> | 2016-02-11 16:55:10 +0200 |
| commit | 9f6966f7654ca8efd1c3fbdfcbdd769ad5761259 (patch) | |
| tree | bd434d0d2454dea03f0afd2d0b306cda79bef597 /keyboard/ergodox_ez | |
| parent | 9e075e28be959a5b9343ebf5e6668c6d654600e3 (diff) | |
| download | qmk_firmware-9f6966f7654ca8efd1c3fbdfcbdd769ad5761259.tar.gz qmk_firmware-9f6966f7654ca8efd1c3fbdfcbdd769ad5761259.zip | |
More tweaks to experimental layout
Diffstat (limited to 'keyboard/ergodox_ez')
3 files changed, 19 insertions, 18 deletions
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex b/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex index a9f1942a6f..928c0ecc3f 100644 --- a/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex +++ b/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex @@ -14,7 +14,7 @@ :1000D0009C118413931293125E138413841372136E
:1000E0000000F0A12E004C002A00E1003581000044
:1000F0001E00140004001D7134004D001F001A0082
-:1001000016001B00E104015420000800070006004F
+:1001000016001B00E104C1002000080007000600E3
:1001100050002C0021001500090019004F004A0072
:10012000220017000A000500000065745000015409
:100130000000007F0000E3004F0001540000007742
@@ -29,9 +29,9 @@ :1001C000250030004E0101003E00010026002700FE
:1001D000000001000100010000000100000001001A
:1001E0000100010000000100000001003F000100CB
-:1001F0002402310200000100400001002D0026020F
-:100200000100010041002E002D0227020100010023
-:100210004200010013002000010001004300010022
+:1001F0002402310200000100400022022D022602EA
+:100200000100010041002E002D0027020100010025
+:1002100042001F0213002000010001004300010002
:100220002E02010001000100440045000100010010
:1002300001000000010001000100010001000000B8
:1002400001000100010001000100010001000100A6
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c index 3dbefe9498..20c95f1ee0 100644 --- a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c +++ b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c @@ -7,12 +7,6 @@ #define SYMB 1 // symbols #define MDIA 2 // media keys -/* About this file: This is just an experimental keymap for my own use, with some ideas I'm testing out. -* Changlog: -* Jan 19: * Made J into dual-action key (Alt when held down), to make Alt-tab more ergonomic. -* * Made ' into dual-action key (Win/Cmd when held down). -*/ - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer * @@ -30,9 +24,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-------------. ,-------------. * | App | LGui | | Alt |Ctrl/Esc| * ,------|------|------| |------+--------+------. - * | | | Home | | PgUp | | | - * | Space|Backsp|------| |------| Tab |Enter | - * | |ace | End | | PgDn | | | + * | | L1 | Home | | PgUp | | | + * | Space| Tap/ |------| |------| Tab/L1 |Enter | + * | |Toggle| End | | PgDn | | | * `--------------------' `----------------------' */ // If it accepts an argument (i.e, is a function), it doesn't need KC_. @@ -46,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT, ALT_T(KC_APP), KC_LGUI, KC_HOME, - KC_SPC,TG(SYMB),KC_END, + KC_SPC,KC_FN1,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, @@ -62,9 +56,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,--------------------------------------------------. ,--------------------------------------------------. * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | 1 | 2 | 3 | 4 | | | | | | | = | | | F12 | + * | | 1 | 2 | 3 | 4 | | | | | | % | = | @ | | F12 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | 5 | 6 | 7 | 8 | 9 |------| |------| & | - | _ | ; | + | | + * | | 5 | 6 | 7 | 8 | 9 |------| |------| & | _ | - | ; | + | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | ( | ) | [ | ] | 0 | | | | | | ( | ) | | | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' @@ -91,8 +85,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_TRNS,KC_TRNS, // right hand KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - KC_TRNS, KC_TRNS, KC_TRNS,KC_EQL, KC_TRNS, KC_TRNS, KC_F12, - KC_AMPR, KC_MINS,KC_UNDS, CM_SCLN, KC_PLUS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_PERC,KC_EQL, KC_AT, KC_TRNS, KC_F12, + KC_AMPR, KC_UNDS,KC_MINS, CM_SCLN, KC_PLUS, KC_TRNS, KC_TRNS, KC_PIPE, KC_LPRN,KC_RPRN, KC_3, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/readme.md b/keyboard/ergodox_ez/keymaps/erez_experimental/readme.md index d7332a97bf..82e1c5e4a0 100644 --- a/keyboard/ergodox_ez/keymaps/erez_experimental/readme.md +++ b/keyboard/ergodox_ez/keymaps/erez_experimental/readme.md @@ -4,6 +4,13 @@ This is my personal layout which I use to test out ideas which may or may not ma Changelog: +## Feb 11, 2016: + +* Updated ASCII legend for thumb clusters +* Made it so outer left-hand thumb key is L1 momentary toggle +* Added % and @ to L1 +* Swapped positions for _ and - on L1 + ## Feb 5, 2016: * A whole new design for the symbol layer. Specifically: |