From 98d80dbe2c39061104c97474042c02b0c4a67671 Mon Sep 17 00:00:00 2001 From: Nikolai Grigoriev <2364632+ngrigoriev@users.noreply.github.com> Date: Tue, 20 Aug 2024 11:53:46 -0400 Subject: [PATCH] rearrange the layout to match the physical look instead of the matrix --- .../dactyl_manuform/5x7_2_6/keyboard.json | 56 ++++----- .../5x7_2_6/keymaps/default/keymap.c | 106 ++++++------------ 2 files changed, 62 insertions(+), 100 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json index aede6fba453..07c36ac18d1 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keyboard.json @@ -48,34 +48,6 @@ {"label": "KC_4", "matrix": [0, 4], "x": 4.5, "y": 0}, {"label": "KC_5", "matrix": [0, 5], "x": 5.5, "y": 0}, {"label": "KC_NO", "matrix": [0, 6], "x": 6.5, "y": 0}, - {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5}, - {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1.5}, - {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1}, - {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1}, - {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1}, - {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1}, - {"label": "KC_NO", "matrix": [1, 6], "x": 6.5, "y": 1}, - {"label": "KC_LCTL", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, - {"label": "KC_A", "matrix": [2, 1], "x": 1.5, "y": 2.5}, - {"label": "KC_S", "matrix": [2, 2], "x": 2.5, "y": 2}, - {"label": "KC_D", "matrix": [2, 3], "x": 3.5, "y": 2}, - {"label": "KC_F", "matrix": [2, 4], "x": 4.5, "y": 2}, - {"label": "KC_G", "matrix": [2, 5], "x": 5.5, "y": 2}, - {"label": "KC_NO", "matrix": [2, 6], "x": 6.5, "y": 2}, - {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5}, - {"label": "KC_Z", "matrix": [3, 1], "x": 1.5, "y": 3.5}, - {"label": "KC_X", "matrix": [3, 2], "x": 2.5, "y": 3}, - {"label": "KC_C", "matrix": [3, 3], "x": 3.5, "y": 3}, - {"label": "KC_V", "matrix": [3, 4], "x": 4.5, "y": 3}, - {"label": "KC_B", "matrix": [3, 5], "x": 5.5, "y": 3}, - {"label": "KC_PGUP", "matrix": [4, 2], "x": 2.5, "y": 4}, - {"label": "KC_PGDN", "matrix": [4, 3], "x": 3.5, "y": 4}, - {"label": "KC_LCTL", "matrix": [4, 4], "x": 5, "y": 5, "h": 1.5, "r": 30}, - {"label": "KC_ESC", "matrix": [4, 5], "x": 6, "y": 5, "h": 1.5, "r": 30}, - {"label": "KC_UP", "matrix": [5, 5], "x": 7.5, "y": 6.5, "r": 45}, - {"label": "KC_DOWN", "matrix": [5, 3], "x": 8, "y": 7.5, "r": 45}, - {"label": "KC_LCMD", "matrix": [5, 4], "x": 6.5, "y": 7, "r": 45}, - {"label": "KC_LALT", "matrix": [5, 2], "x": 7, "y": 8, "r": 45}, {"label": "KC_EQL", "matrix": [6, 0], "x": 12, "y": 0}, {"label": "KC_6", "matrix": [6, 1], "x": 13, "y": 0}, {"label": "KC_7", "matrix": [6, 2], "x": 14, "y": 0}, @@ -83,6 +55,13 @@ {"label": "KC_9", "matrix": [6, 4], "x": 16, "y": 0}, {"label": "KC_0", "matrix": [6, 5], "x": 17, "y": 0.5}, {"label": "KC_BSPC", "matrix": [6, 6], "x": 18, "y": 0.5, "w": 1.5}, + {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5}, + {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "KC_NO", "matrix": [1, 6], "x": 6.5, "y": 1}, {"label": "KC_MINUS", "matrix": [7, 0], "x": 12, "y": 1}, {"label": "KC_Y", "matrix": [7, 1], "x": 13, "y": 1}, {"label": "KC_U", "matrix": [7, 2], "x": 14, "y": 1}, @@ -90,6 +69,13 @@ {"label": "KC_O", "matrix": [7, 4], "x": 16, "y": 1}, {"label": "KC_P", "matrix": [7, 5], "x": 17, "y": 1.5}, {"label": "KC_BSLS", "matrix": [7, 6], "x": 18, "y": 1.5, "w": 1.5}, + {"label": "KC_LCTL", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "KC_A", "matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"label": "KC_S", "matrix": [2, 2], "x": 2.5, "y": 2}, + {"label": "KC_D", "matrix": [2, 3], "x": 3.5, "y": 2}, + {"label": "KC_F", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "KC_G", "matrix": [2, 5], "x": 5.5, "y": 2}, + {"label": "KC_NO", "matrix": [2, 6], "x": 6.5, "y": 2}, {"label": "KC_DEL", "matrix": [8, 0], "x": 12, "y": 2}, {"label": "KC_H", "matrix": [8, 1], "x": 13, "y": 2}, {"label": "KC_J", "matrix": [8, 2], "x": 14, "y": 2}, @@ -97,18 +83,32 @@ {"label": "KC_L", "matrix": [8, 4], "x": 16, "y": 2}, {"label": "KC_SCLN", "matrix": [8, 5], "x": 17, "y": 2.5}, {"label": "KC_RSFT", "matrix": [8, 6], "x": 18, "y": 2.5, "w": 1.5}, + {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5}, + {"label": "KC_Z", "matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"label": "KC_X", "matrix": [3, 2], "x": 2.5, "y": 3}, + {"label": "KC_C", "matrix": [3, 3], "x": 3.5, "y": 3}, + {"label": "KC_V", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "KC_B", "matrix": [3, 5], "x": 5.5, "y": 3}, {"label": "KC_N", "matrix": [9, 1], "x": 13, "y": 3}, {"label": "KC_M", "matrix": [9, 2], "x": 14, "y": 3}, {"label": "KC_COMM", "matrix": [9, 3], "x": 15, "y": 3}, {"label": "KC_DOT", "matrix": [9, 4], "x": 16, "y": 3}, {"label": "KC_SLSH", "matrix": [9, 5], "x": 17, "y": 3.5}, {"label": "KC_RSFT", "matrix": [9, 6], "x": 18, "y": 3.5, "w": 1.5}, + {"label": "KC_PGUP", "matrix": [4, 2], "x": 2.5, "y": 4}, + {"label": "KC_PGDN", "matrix": [4, 3], "x": 3.5, "y": 4}, {"label": "KC_LBRC", "matrix": [10, 3], "x": 15, "y": 4}, {"label": "KC_RBRC", "matrix": [10, 4], "x": 16, "y": 4}, + {"label": "KC_LCTL", "matrix": [4, 4], "x": 5, "y": 5, "h": 1.5, "r": 30}, + {"label": "KC_ESC", "matrix": [4, 5], "x": 6, "y": 5, "h": 1.5, "r": 30}, {"label": "KC_ENTER", "matrix": [10, 1], "x": 12.5, "y": 5, "h": 1.5, "r": -30}, {"label": "KC_SPC", "matrix": [10, 2], "x": 13.5, "y": 5, "h": 1.5, "r": -30}, + {"label": "KC_UP", "matrix": [5, 5], "x": 7.5, "y": 6.5, "r": 45}, + {"label": "KC_DOWN", "matrix": [5, 3], "x": 8, "y": 7.5, "r": 45}, {"label": "KC_LEFT", "matrix": [11, 3], "x": 10.5, "y": 7.5, "r": -45}, {"label": "KC_RIGHT", "matrix": [11, 1], "x": 11, "y": 6.5, "r": -45}, + {"label": "KC_LCMD", "matrix": [5, 4], "x": 6.5, "y": 7, "r": 45}, + {"label": "KC_LALT", "matrix": [5, 2], "x": 7, "y": 8, "r": 45}, {"label": "KC_RCTL", "matrix": [11, 4], "x": 11.5, "y": 8, "r": -45}, {"label": "KC_RALT", "matrix": [11, 2], "x": 12, "y": 7, "r": -45} ] diff --git a/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c index 52358ced57b..5ad2f77badf 100644 --- a/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/5x7_2_6/keymaps/default/keymap.c @@ -1,3 +1,5 @@ +/* vim: noai:ts=4:sw=4:nowrap +*/ /* Copyright 2012 Jun Wako Nikolai Grigoriev @ngrigoriev @@ -26,87 +28,47 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_5x7_2_6( - // left hand - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, MO(_MAGIC), - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(_NUMPAD), - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, _______, - OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_PGUP, KC_PGDN, - KC_LCTL, LT(_FN, KC_ESC), - KC_UP, KC_DOWN, - KC_LCMD, KC_LALT, - // right hand - KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - KC_MINUS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), - KC_LBRC, KC_RBRC, - KC_ENTER, KC_SPC, - KC_LEFT, KC_RIGHT, - KC_RCTL, KC_RALT + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, MO(_MAGIC), KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(_NUMPAD), KC_MINUS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, _______, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), + KC_PGUP, KC_PGDN, KC_LBRC, KC_RBRC, + KC_LCTL, LT(_FN, KC_ESC), KC_ENTER,KC_SPC, + KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, + KC_LCMD, KC_LALT, KC_RCTL, KC_RALT ), [_FN] = LAYOUT_5x7_2_6( - // left hand - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, MO(_MAGIC), - _______, _______, _______, KC_UP, _______, _______, _______, - _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, - _______, _______, _______, _______, _______, _______, - KC_MPRV, KC_MNXT, - _______, _______, - _______, _______, - _______, _______, - // right hand - _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - _______, _______, _______, _______, _______, _______, KC_F12, - _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, - KC_DEL, _______, - _______, _______, - _______, _______ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, MO(_MAGIC), _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F12, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_MPRV, KC_MNXT, _______, _______, + _______, _______, KC_DEL, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ ), [_NUMPAD] = LAYOUT_5x7_2_6( - // left hand - _______, _______, _______, _______, _______, _______, MO(_MAGIC), - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, - _______, _______, - _______, _______, - _______, _______, - // right hand - _______, _______, KC_NUM, _______, KC_PMNS, KC_PPLS, _______, - _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, - _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, - _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, - KC_P0, KC_PDOT, - _______, KC_PENT, - _______, _______, - _______, _______ + _______, _______, _______, _______, _______, _______, MO(_MAGIC), _______, _______, KC_NUM, _______, KC_PMNS, KC_PPLS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_P4, KC_P5, KC_P6, KC_PAST, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, + _______, _______, KC_P0, KC_PDOT, + _______, _______, _______, KC_PENT, + _______, _______, _______, _______, + _______, _______, _______, _______ ), [_MAGIC] = LAYOUT_5x7_2_6( - // left hand - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, - _______, _______, - _______, _______, - _______, _______, - // right hand - CG_SWAP, _______, _______, _______, _______, _______, QK_REBOOT, - CG_NORM, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, QK_BOOTLOADER, - _______, _______, _______, _______, _______, _______, - _______, _______, - _______, _______, - _______, _______, - _______, _______ + _______, _______, _______, _______, _______, _______, _______, CG_SWAP, _______, _______, _______, _______, _______, QK_REBOOT, + _______, _______, _______, _______, _______, _______, _______, CG_NORM, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOTLOADER, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ ) };