From 17de141c9248a7a1a1814d96d1f12f36df3d6a8f Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 16 May 2023 17:00:08 +1000 Subject: Add missing layout data for a handful of boards (#20931) * Add missing layout data for a handful of boards * typo * Add missing layouts for stoutgat * Add missing layout for j80 * Replace missing layout with alias for wraith * Add missing layout for matrix/me * Add missing layout for satisfaction75/prototype * Apply suggestions from code review * Rename wt80-a layouts * Rename rosa layouts * Add missing layouts for naked48 * Add missing layouts for naked60 * Add missing layouts for uma * Remove unused and pointless `LAYOUT_stack` for buzzard * Add missing layout for keyboardio/model01 * Add missing layout for smk65 revf * Fix via keymap for h60 * Add missing layout for jabberwocky/v1 * Apply suggestions from code review * Add missing layout for m3n3van * Add missing layout for giabalanai * Add missing layouts for treadstone48/rev1 * Add missing layouts for squiggle * Update keyboards/marksard/treadstone48/rev1/info.json --- keyboards/hineybush/h60/info.json | 106 ++++----- keyboards/hineybush/h60/keymaps/via/keymap.c | 35 ++- keyboards/hineybush/h660s/info.json | 308 ++++++++++++++------------- 3 files changed, 224 insertions(+), 225 deletions(-) (limited to 'keyboards/hineybush') diff --git a/keyboards/hineybush/h60/info.json b/keyboards/hineybush/h60/info.json index bab66ef591..3069b4a4b3 100644 --- a/keyboards/hineybush/h60/info.json +++ b/keyboards/hineybush/h60/info.json @@ -388,56 +388,62 @@ {"matrix": [0, 12], "x": 12, "y": 0}, {"matrix": [0, 13], "x": 13, "y": 0}, {"matrix": [1, 13], "x": 14, "y": 0}, - {"matrix": [1, 0], "x": 15, "y": 0}, - {"matrix": [1, 1], "x": 16, "y": 0}, - {"matrix": [1, 2], "x": 17, "y": 0}, - {"matrix": [1, 3], "x": 18, "y": 0}, - {"matrix": [1, 4], "x": 19, "y": 0}, - {"matrix": [1, 5], "x": 20, "y": 0}, - {"matrix": [1, 6], "x": 21, "y": 0}, - {"matrix": [1, 7], "x": 22, "y": 0}, - {"matrix": [1, 8], "x": 23, "y": 0}, - {"matrix": [1, 9], "x": 24, "y": 0}, - {"matrix": [1, 10], "x": 25, "y": 0}, - {"matrix": [1, 11], "x": 26, "y": 0}, - {"matrix": [1, 12], "x": 27, "y": 0}, - {"matrix": [2, 13], "x": 28, "y": 0}, - {"matrix": [2, 0], "x": 29, "y": 0}, - {"matrix": [2, 1], "x": 30, "y": 0}, - {"matrix": [2, 2], "x": 31, "y": 0}, - {"matrix": [2, 3], "x": 32, "y": 0}, - {"matrix": [2, 4], "x": 33, "y": 0}, - {"matrix": [2, 5], "x": 34, "y": 0}, - {"matrix": [2, 6], "x": 35, "y": 0}, - {"matrix": [2, 7], "x": 36, "y": 0}, - {"matrix": [2, 8], "x": 37, "y": 0}, - {"matrix": [2, 9], "x": 38, "y": 0}, - {"matrix": [2, 10], "x": 39, "y": 0}, - {"matrix": [2, 11], "x": 40, "y": 0}, - {"matrix": [2, 12], "x": 41, "y": 0}, - {"matrix": [3, 0], "x": 42, "y": 0}, - {"matrix": [3, 1], "x": 43, "y": 0}, - {"matrix": [3, 2], "x": 44, "y": 0}, - {"matrix": [3, 3], "x": 45, "y": 0}, - {"matrix": [3, 4], "x": 46, "y": 0}, - {"matrix": [3, 5], "x": 47, "y": 0}, - {"matrix": [3, 6], "x": 48, "y": 0}, - {"matrix": [3, 7], "x": 49, "y": 0}, - {"matrix": [3, 8], "x": 50, "y": 0}, - {"matrix": [3, 9], "x": 51, "y": 0}, - {"matrix": [3, 10], "x": 52, "y": 0}, - {"matrix": [3, 11], "x": 53, "y": 0}, - {"matrix": [3, 12], "x": 54, "y": 0}, - {"matrix": [4, 0], "x": 55, "y": 0}, - {"matrix": [4, 1], "x": 56, "y": 0}, - {"matrix": [4, 2], "x": 57, "y": 0}, - {"matrix": [4, 3], "x": 58, "y": 0}, - {"matrix": [4, 6], "x": 59, "y": 0}, - {"matrix": [4, 8], "x": 60, "y": 0}, - {"matrix": [4, 9], "x": 61, "y": 0}, - {"matrix": [4, 10], "x": 62, "y": 0}, - {"matrix": [4, 11], "x": 63, "y": 0}, - {"matrix": [4, 12], "x": 64, "y": 0} + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [4, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 12], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 13], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.5}, + {"matrix": [4, 8], "x": 8, "y": 4, "w": 2}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/hineybush/h60/keymaps/via/keymap.c b/keyboards/hineybush/h60/keymaps/via/keymap.c index f5093ca61b..4a50278432 100644 --- a/keyboards/hineybush/h60/keymaps/via/keymap.c +++ b/keyboards/hineybush/h60/keymaps/via/keymap.c @@ -4,29 +4,18 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_TRNS, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, - KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_SPC, KC_TRNS, KC_RALT, MO(1), KC_RGUI, KC_RCTL), - LAYOUT_all( - KC_TRNS, BL_TOGG, BL_DOWN, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, + KC_LCTL, KC_LGUI, KC_LALT, _______, KC_SPC, _______, KC_RALT, MO(1), KC_RGUI, KC_RCTL + ), LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + _______, BL_TOGG, BL_DOWN, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______ + ) }; diff --git a/keyboards/hineybush/h660s/info.json b/keyboards/hineybush/h660s/info.json index c6f8275add..be6e28b261 100644 --- a/keyboards/hineybush/h660s/info.json +++ b/keyboards/hineybush/h660s/info.json @@ -40,7 +40,7 @@ {"matrix": [0, 12], "x": 12, "y": 0}, {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 14], "x": 15.75, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, @@ -57,7 +57,7 @@ {"matrix": [1, 12], "x": 12.5, "y": 1}, {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 14], "x": 15.75, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.75, "y": 2}, @@ -84,21 +84,21 @@ {"matrix": [3, 9], "x": 9.25, "y": 3}, {"matrix": [3, 10], "x": 10.25, "y": 3}, {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, - {"matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"matrix": [3, 14], "x": 14.75, "y": 3.25}, {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, - - {"matrix": [4, 12], "x": 14.25, "y": 4.25}, - {"matrix": [4, 13], "x": 15.25, "y": 4.25}, - {"matrix": [4, 14], "x": 16.25, "y": 4.25} + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13.75, "y": 4.25}, + {"matrix": [4, 13], "x": 14.75, "y": 4.25}, + {"matrix": [4, 14], "x": 15.75, "y": 4.25} ] }, "LAYOUT_66_ansi_split_bs": { @@ -119,7 +119,7 @@ {"matrix": [0, 13], "x": 13, "y": 0}, {"matrix": [1, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 14], "x": 15.75, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, @@ -136,7 +136,7 @@ {"matrix": [1, 12], "x": 12.5, "y": 1}, {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 14], "x": 15.75, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.75, "y": 2}, @@ -163,21 +163,21 @@ {"matrix": [3, 9], "x": 9.25, "y": 3}, {"matrix": [3, 10], "x": 10.25, "y": 3}, {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, - {"matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"matrix": [3, 14], "x": 14.75, "y": 3.25}, {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, - - {"matrix": [4, 12], "x": 14.25, "y": 4.25}, - {"matrix": [4, 13], "x": 15.25, "y": 4.25}, - {"matrix": [4, 14], "x": 16.25, "y": 4.25} + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13.75, "y": 4.25}, + {"matrix": [4, 13], "x": 14.75, "y": 4.25}, + {"matrix": [4, 14], "x": 15.75, "y": 4.25} ] }, "LAYOUT_66_ansi_rwkl": { @@ -197,7 +197,7 @@ {"matrix": [0, 12], "x": 12, "y": 0}, {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 14], "x": 15.75, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, @@ -214,7 +214,7 @@ {"matrix": [1, 12], "x": 12.5, "y": 1}, {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 14], "x": 15.75, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.75, "y": 2}, @@ -241,20 +241,20 @@ {"matrix": [3, 9], "x": 9.25, "y": 3}, {"matrix": [3, 10], "x": 10.25, "y": 3}, {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, - {"matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"matrix": [3, 14], "x": 14.75, "y": 3.25}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4}, - {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 7}, - {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, - {"matrix": [4, 12], "x": 14.25, "y": 4.25}, - {"matrix": [4, 13], "x": 15.25, "y": 4.25}, - {"matrix": [4, 14], "x": 16.25, "y": 4.25} + {"matrix": [4, 12], "x": 13.75, "y": 4.25}, + {"matrix": [4, 13], "x": 14.75, "y": 4.25}, + {"matrix": [4, 14], "x": 15.75, "y": 4.25} ] }, "LAYOUT_66_ansi_rwkl_split_bs": { @@ -275,7 +275,7 @@ {"matrix": [0, 13], "x": 13, "y": 0}, {"matrix": [1, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 14], "x": 15.75, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, @@ -292,7 +292,7 @@ {"matrix": [1, 12], "x": 12.5, "y": 1}, {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 14], "x": 15.75, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.75, "y": 2}, @@ -319,20 +319,20 @@ {"matrix": [3, 9], "x": 9.25, "y": 3}, {"matrix": [3, 10], "x": 10.25, "y": 3}, {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, - {"matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"matrix": [3, 14], "x": 14.75, "y": 3.25}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4}, - {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 7}, - {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, - {"matrix": [4, 12], "x": 14.25, "y": 4.25}, - {"matrix": [4, 13], "x": 15.25, "y": 4.25}, - {"matrix": [4, 14], "x": 16.25, "y": 4.25} + {"matrix": [4, 12], "x": 13.75, "y": 4.25}, + {"matrix": [4, 13], "x": 14.75, "y": 4.25}, + {"matrix": [4, 14], "x": 15.75, "y": 4.25} ] }, "LAYOUT_66_iso": { @@ -352,7 +352,7 @@ {"matrix": [0, 12], "x": 12, "y": 0}, {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 14], "x": 15.75, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, @@ -368,7 +368,7 @@ {"matrix": [1, 11], "x": 11.5, "y": 1}, {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 14], "x": 15.75, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.75, "y": 2}, @@ -397,9 +397,9 @@ {"matrix": [3, 9], "x": 9.25, "y": 3}, {"matrix": [3, 10], "x": 10.25, "y": 3}, {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, - {"matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"matrix": [3, 14], "x": 14.75, "y": 3.25}, {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, @@ -409,9 +409,9 @@ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [4, 12], "x": 14.25, "y": 4.25}, - {"matrix": [4, 13], "x": 15.25, "y": 4.25}, - {"matrix": [4, 14], "x": 16.25, "y": 4.25} + {"matrix": [4, 12], "x": 13.75, "y": 4.25}, + {"matrix": [4, 13], "x": 14.75, "y": 4.25}, + {"matrix": [4, 14], "x": 15.75, "y": 4.25} ] }, "LAYOUT_66_iso_split_bs": { @@ -432,7 +432,7 @@ {"matrix": [0, 13], "x": 13, "y": 0}, {"matrix": [1, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 14], "x": 15.75, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, @@ -448,7 +448,7 @@ {"matrix": [1, 11], "x": 11.5, "y": 1}, {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 14], "x": 15.75, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.75, "y": 2}, @@ -477,9 +477,9 @@ {"matrix": [3, 9], "x": 9.25, "y": 3}, {"matrix": [3, 10], "x": 10.25, "y": 3}, {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, - {"matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"matrix": [3, 14], "x": 14.75, "y": 3.25}, {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, @@ -489,9 +489,9 @@ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [4, 12], "x": 14.25, "y": 4.25}, - {"matrix": [4, 13], "x": 15.25, "y": 4.25}, - {"matrix": [4, 14], "x": 16.25, "y": 4.25} + {"matrix": [4, 12], "x": 13.75, "y": 4.25}, + {"matrix": [4, 13], "x": 14.75, "y": 4.25}, + {"matrix": [4, 14], "x": 15.75, "y": 4.25} ] }, "LAYOUT_66_iso_rwkl": { @@ -511,7 +511,7 @@ {"matrix": [0, 12], "x": 12, "y": 0}, {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 14], "x": 15.75, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, @@ -527,7 +527,7 @@ {"matrix": [1, 11], "x": 11.5, "y": 1}, {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 14], "x": 15.75, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.75, "y": 2}, @@ -556,20 +556,20 @@ {"matrix": [3, 9], "x": 9.25, "y": 3}, {"matrix": [3, 10], "x": 10.25, "y": 3}, {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, - {"matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"matrix": [3, 14], "x": 14.75, "y": 3.25}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4}, - {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 7}, - {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, - {"matrix": [4, 12], "x": 14.25, "y": 4.25}, - {"matrix": [4, 13], "x": 15.25, "y": 4.25}, - {"matrix": [4, 14], "x": 16.25, "y": 4.25} + {"matrix": [4, 12], "x": 13.75, "y": 4.25}, + {"matrix": [4, 13], "x": 14.75, "y": 4.25}, + {"matrix": [4, 14], "x": 15.75, "y": 4.25} ] }, "LAYOUT_66_iso_rwkl_split_bs": { @@ -590,7 +590,7 @@ {"matrix": [0, 13], "x": 13, "y": 0}, {"matrix": [1, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 14], "x": 15.75, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, @@ -606,7 +606,7 @@ {"matrix": [1, 11], "x": 11.5, "y": 1}, {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 14], "x": 15.75, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"matrix": [2, 1], "x": 1.75, "y": 2}, @@ -635,20 +635,20 @@ {"matrix": [3, 9], "x": 9.25, "y": 3}, {"matrix": [3, 10], "x": 10.25, "y": 3}, {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, - {"matrix": [3, 14], "x": 15.25, "y": 3.25}, + {"matrix": [3, 14], "x": 14.75, "y": 3.25}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4}, - {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 7}, - {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, - {"matrix": [4, 12], "x": 14.25, "y": 4.25}, - {"matrix": [4, 13], "x": 15.25, "y": 4.25}, - {"matrix": [4, 14], "x": 16.25, "y": 4.25} + {"matrix": [4, 12], "x": 13.75, "y": 4.25}, + {"matrix": [4, 13], "x": 14.75, "y": 4.25}, + {"matrix": [4, 14], "x": 15.75, "y": 4.25} ] }, "LAYOUT_all": { @@ -668,64 +668,68 @@ {"matrix": [0, 12], "x": 12, "y": 0}, {"matrix": [0, 13], "x": 13, "y": 0}, {"matrix": [1, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 15, "y": 0}, - - {"matrix": [1, 0], "x": 16, "y": 0}, - {"matrix": [1, 1], "x": 17, "y": 0}, - {"matrix": [1, 2], "x": 18, "y": 0}, - {"matrix": [1, 3], "x": 19, "y": 0}, - {"matrix": [1, 4], "x": 20, "y": 0}, - {"matrix": [1, 5], "x": 21, "y": 0}, - {"matrix": [1, 6], "x": 22, "y": 0}, - {"matrix": [1, 7], "x": 23, "y": 0}, - {"matrix": [1, 8], "x": 24, "y": 0}, - {"matrix": [1, 9], "x": 25, "y": 0}, - {"matrix": [1, 10], "x": 26, "y": 0}, - {"matrix": [1, 11], "x": 27, "y": 0}, - {"matrix": [1, 12], "x": 28, "y": 0}, - {"matrix": [2, 13], "x": 29, "y": 0}, - {"matrix": [1, 14], "x": 30, "y": 0}, - - {"matrix": [2, 0], "x": 31, "y": 0}, - {"matrix": [2, 1], "x": 32, "y": 0}, - {"matrix": [2, 2], "x": 33, "y": 0}, - {"matrix": [2, 3], "x": 34, "y": 0}, - {"matrix": [2, 4], "x": 35, "y": 0}, - {"matrix": [2, 5], "x": 36, "y": 0}, - {"matrix": [2, 6], "x": 37, "y": 0}, - {"matrix": [2, 7], "x": 38, "y": 0}, - {"matrix": [2, 8], "x": 39, "y": 0}, - {"matrix": [2, 9], "x": 40, "y": 0}, - {"matrix": [2, 10], "x": 41, "y": 0}, - {"matrix": [2, 11], "x": 42, "y": 0}, - {"matrix": [2, 12], "x": 43, "y": 0}, - {"matrix": [3, 13], "x": 44, "y": 0}, - - {"matrix": [3, 0], "x": 45, "y": 0}, - {"matrix": [3, 1], "x": 46, "y": 0}, - {"matrix": [3, 2], "x": 47, "y": 0}, - {"matrix": [3, 3], "x": 48, "y": 0}, - {"matrix": [3, 4], "x": 49, "y": 0}, - {"matrix": [3, 5], "x": 50, "y": 0}, - {"matrix": [3, 6], "x": 51, "y": 0}, - {"matrix": [3, 7], "x": 52, "y": 0}, - {"matrix": [3, 8], "x": 53, "y": 0}, - {"matrix": [3, 9], "x": 54, "y": 0}, - {"matrix": [3, 10], "x": 55, "y": 0}, - {"matrix": [3, 11], "x": 56, "y": 0}, - {"matrix": [3, 12], "x": 57, "y": 0}, - {"matrix": [3, 14], "x": 58, "y": 0}, - - {"matrix": [4, 0], "x": 59, "y": 0}, - {"matrix": [4, 1], "x": 60, "y": 0}, - {"matrix": [4, 2], "x": 61, "y": 0}, - {"matrix": [4, 7], "x": 62, "y": 0}, - {"matrix": [4, 9], "x": 63, "y": 0}, - {"matrix": [4, 10], "x": 64, "y": 0}, - {"matrix": [4, 11], "x": 65, "y": 0}, - {"matrix": [4, 12], "x": 66, "y": 0}, - {"matrix": [4, 13], "x": 67, "y": 0}, - {"matrix": [4, 14], "x": 68, "y": 0} + + {"matrix": [0, 14], "x": 15.75, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15.75, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, + + {"matrix": [3, 14], "x": 14.75, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13.75, "y": 4.25}, + {"matrix": [4, 13], "x": 14.75, "y": 4.25}, + {"matrix": [4, 14], "x": 15.75, "y": 4.25} ] } } -- cgit v1.2.3