diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c index 62ebc5c3..9f16bc86 100644 --- a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c @@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |-----------+------+------+------+------+------| F18 | | F19 |------+------+------+------+------+-----------| * | LShift | Z | X | C | V | B | Hyper| | Hyper| N | M | , | . | / | RShift | * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' - * | FN | No |LCtrl | LAlt | LGui | | RGui | RAlt | RCtrl| No | KPAD | + * | FN | KPAD |LCtrl | LAlt | LGui | | RGui | RAlt | RCtrl| KPAD | FN | * `-----------------------------------' `-----------------------------------' * ,-------------. ,-------------. * | Left | Right| | Down | Up | @@ -84,23 +84,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * (this is used to issue the Esc key to the Tmux application) */ [BASE]=KEYMAP(//left half - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MEH_T(KC_F16), - CTL_T(KC_BSLS), KC_A, KC_S, KC_D, KC_F, KC_G, - KC_FN2, KC_Z, KC_X, KC_C, KC_V, KC_B, ALL_T(KC_F18), - KC_FN1, KC_NO, KC_LCTRL, KC_LALT, KC_LGUI, - KC_LEFT, KC_RIGHT, - KC_HOME, - KC_BSPC, KC_DELT, KC_END, - //right half - M(MACRO_TMUX_ESC), KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, - MEH_T(KC_F17), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, - KC_H, KC_J, KC_K, KC_L, KC_SCLN, CTL_T(KC_QUOT), - ALL_T(KC_F19), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_FN2, - KC_RGUI, ALT_T(KC_LBRC), CTL_T(KC_RBRC), KC_NO, TG(KEYPAD), - KC_DOWN, KC_UP, - KC_PGUP, - KC_PGDN, KC_ENT, KC_SPC), + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MEH_T(KC_F16), + CTL_T(KC_BSLS), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_FN2, KC_Z, KC_X, KC_C, KC_V, KC_B, ALL_T(KC_F18), + KC_FN1, TG(KEYPAD), KC_LCTRL, KC_LALT, KC_LGUI, + KC_LEFT, KC_RIGHT, + KC_HOME, + KC_BSPC, KC_DELT, KC_END, + //right half + M(MACRO_TMUX_ESC), KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, + MEH_T(KC_F17), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, CTL_T(KC_QUOT), + ALL_T(KC_F19), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_FN2, + KC_RGUI, ALT_T(KC_LBRC), CTL_T(KC_RBRC), TG(KEYPAD), KC_FN1, + KC_DOWN, KC_UP, + KC_PGUP, + KC_PGDN, KC_ENT, KC_SPC), /* Keymap 1: KeyPad Layer * @@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_NO, KC_MS_WH_UP, KC_MS_U, KC_MS_WH_DOWN, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, KC_NO, KC_MS_WH_LEFT, KC_NO, KC_MS_WH_RIGHT, KC_NO, KC_NO, - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, @@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_RPRN, KC_MS_BTN2, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, KC_NO, KC_MS_BTN3, KC_KP_ENTER, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_EQUAL, KC_NO, KC_NO, - KC_KP_0, KC_KP_DOT, KC_KP_COMMA, KC_NO, KC_TRNS, + KC_KP_0, KC_KP_DOT, KC_KP_COMMA, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO), @@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_NO, KC_MUTE, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, - KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)}; diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx.hex b/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx.hex index 89e9ffcc..abfe837a 100644 --- a/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx.hex +++ b/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx.hex @@ -17,7 +17,7 @@ :100100009213A013A713AE13B81302290001E00144 :1001100004020402E00129000000F4A200223500DC :100120002B003171C200C10000001E001400040049 -:100130001D0000004D001F001A0016001B00E0000B +:100130001D0001544D001F001A0016001B00E000B6 :100140004C002000080007000600E2002A00210001 :10015000150009001900E3004A00220017000A00F8 :1001600005000000500029006B7700006D7F000043 @@ -25,9 +25,9 @@ :100180001C000B00110000005200240018000D009C :100190001000E7004B0025000C000E0036002F7405 :1001A0002C00260012000F003700307128002700B5 -:1001B00013003300380000004E002E002D00347173 -:1001C000C200015400000000000000000000010017 -:1001D000000000000000000000000000000000001F +:1001B00013003300380001544E002E002D0034711E +:1001C000C200C100000000000000000000000100AB +:1001D000000000000000000000000100000000001E :1001E000F900F200FB00000000000000F000F10048 :1001F0000000000000000000FA00F300FC00000016 :1002000000000000000000000000000000000000EE @@ -35,7 +35,7 @@ :100220005800000000009C005F005C0059000000C6 :100230000000540060005D005A006200000055009C :1002400061005E005B00630000002302570056005F -:100250006700850000002602270200000000000061 +:100250006700850000002602270200000000010060 :100260000000F400F500F6000000010000000000AE :1002700000003900E100010000003A00AD00B000CC :100280000000000000003B00BC00AC0000000100CA @@ -47,7 +47,7 @@ :1002E0000000010000004300000052000000010077 :1002F0000000440000004F00000001000000450025 :1003000000000000000000000000A900AA00A800F2 -:10031000E5000000000016034500720067006F0052 +:10031000E5000100000016034500720067006F0051 :1003200044006F007800200045005A0000001603CA :100330004500720067006F0044006F0078002000E5 :1003400045005A0000000403090409026D0004017D