diff --git a/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/info.json b/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/info.json index 5d3f33f2142..9185ad3b90a 100644 --- a/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/info.json +++ b/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/info.json @@ -1,8 +1,8 @@ { "rgb_matrix": { - "split_count": [41, 41], + "split_count": [47, 47], "layout": [ - {"flags": 4, "matrix": [3, 0], "x": 86, "y": 32}, + {"flags": 4, "matrix": [3, 0]}, {"flags": 4, "matrix": [2, 0], "x": 86, "y": 43}, {"flags": 4, "matrix": [6, 0], "x": 86, "y": 0}, {"flags": 4, "matrix": [5, 0], "x": 86, "y": 11}, @@ -10,7 +10,7 @@ {"flags": 4, "matrix": [3, 1], "x": 69, "y": 32}, {"flags": 4, "matrix": [2, 1], "x": 69, "y": 43}, - {"flags": 4, "matrix": [2, 1], "x": 69, "y": 43}, + {"flags": 4, "matrix": [1, 1], "x": 69, "y": 43}, {"flags": 4, "matrix": [6, 1], "x": 69, "y": 0}, {"flags": 4, "matrix": [5, 1], "x": 69, "y": 11}, {"flags": 4, "matrix": [4, 1], "x": 69, "y": 21}, @@ -31,18 +31,25 @@ {"flags": 4, "matrix": [3, 4], "x": 17, "y": 32}, {"flags": 4, "matrix": [2, 4], "x": 17, "y": 43}, - {"flags": 4, "matrix": [2, 4], "x": 17, "y": 53}, + {"flags": 4, "matrix": [1, 4], "x": 17, "y": 53}, {"flags": 4, "matrix": [6, 4], "x": 17, "y": 0}, {"flags": 4, "matrix": [5, 4], "x": 17, "y": 11}, {"flags": 4, "matrix": [4, 4], "x": 17, "y": 21}, {"flags": 4, "matrix": [3, 5], "x": 0, "y": 32}, {"flags": 4, "matrix": [2, 5], "x": 0, "y": 43}, - {"flags": 4, "matrix": [2, 5], "x": 0, "y": 53}, + {"flags": 4, "matrix": [1, 5], "x": 0, "y": 53}, {"flags": 4, "matrix": [6, 5], "x": 0, "y": 0}, {"flags": 4, "matrix": [5, 5], "x": 0, "y": 11}, {"flags": 4, "matrix": [4, 5], "x": 0, "y": 21}, + {"flags": 4, "matrix": [3, 6], "x": 0, "y": 32}, + {"flags": 4, "matrix": [2, 6], "x": 0, "y": 43}, + {"flags": 4, "matrix": [1, 6], "x": 0, "y": 53}, + {"flags": 4, "matrix": [6, 6], "x": 0, "y": 0}, + {"flags": 4, "matrix": [5, 6], "x": 0, "y": 11}, + {"flags": 4, "matrix": [4, 6], "x": 0, "y": 21}, + {"flags": 4, "matrix": [0, 3], "x": 86, "y": 53}, {"flags": 4, "matrix": [0, 2], "x": 103, "y": 53}, {"flags": 4, "matrix": [0, 1], "x": 103, "y": 64}, @@ -59,7 +66,7 @@ {"flags": 4, "matrix": [10, 1], "x": 155, "y": 32}, {"flags": 4, "matrix": [9, 1], "x": 155, "y": 43}, - {"flags": 4, "matrix": [9, 1], "x": 155, "y": 53}, + {"flags": 4, "matrix": [8, 1], "x": 155, "y": 53}, {"flags": 4, "matrix": [13, 1], "x": 155, "y": 0}, {"flags": 4, "matrix": [12, 1], "x": 155, "y": 11}, {"flags": 4, "matrix": [11, 1], "x": 155, "y": 21}, @@ -80,18 +87,25 @@ {"flags": 4, "matrix": [10, 4], "x": 207, "y": 32}, {"flags": 4, "matrix": [9, 4], "x": 207, "y": 43}, - {"flags": 4, "matrix": [9, 4], "x": 207, "y": 53}, + {"flags": 4, "matrix": [8, 4], "x": 207, "y": 53}, {"flags": 4, "matrix": [13, 4], "x": 207, "y": 0}, {"flags": 4, "matrix": [12, 4], "x": 207, "y": 11}, {"flags": 4, "matrix": [11, 4], "x": 207, "y": 21}, {"flags": 4, "matrix": [10, 5], "x": 224, "y": 32}, {"flags": 4, "matrix": [9, 5], "x": 224, "y": 43}, - {"flags": 4, "matrix": [9, 5], "x": 224, "y": 53}, + {"flags": 4, "matrix": [8, 5], "x": 224, "y": 53}, {"flags": 4, "matrix": [13, 5], "x": 224, "y": 0}, {"flags": 4, "matrix": [12, 5], "x": 224, "y": 11}, {"flags": 4, "matrix": [11, 5], "x": 224, "y": 21}, + {"flags": 4, "matrix": [10, 6], "x": 224, "y": 32}, + {"flags": 4, "matrix": [9, 6], "x": 224, "y": 43}, + {"flags": 4, "matrix": [8, 6], "x": 224, "y": 53}, + {"flags": 4, "matrix": [13, 6], "x": 224, "y": 0}, + {"flags": 4, "matrix": [12, 6], "x": 224, "y": 11}, + {"flags": 4, "matrix": [11, 6], "x": 224, "y": 21}, + {"flags": 4, "matrix": [7, 3], "x": 138, "y": 53}, {"flags": 4, "matrix": [7, 2], "x": 121, "y": 53}, {"flags": 4, "matrix": [7, 1], "x": 121, "y": 64}, @@ -101,7 +115,7 @@ ] }, "layouts": { - "LAYOUT_fun_full_bottom_row": { + "LAYOUT_fun_full_bottom_row_7_col": { "layout": [ { "matrix": [6, 5], "x": 0, "y": 0 }, { "matrix": [6, 4], "x": 1, "y": 0 }, diff --git a/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/keymaps/vial/keymap.c b/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/keymaps/vial/keymap.c index 05effb52de3..0ab2d797ce7 100644 --- a/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/keymaps/vial/keymap.c +++ b/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/keymaps/vial/keymap.c @@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_fun_full_bottom_row( + [0] = LAYOUT_fun_full_bottom_row_7_col( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, @@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HOME, KC_END, KC_ESC, KC_GRAVE, KC_CAPS, KC_APP ), - [1] = LAYOUT_fun_full_bottom_row( + [1] = LAYOUT_fun_full_bottom_row_7_col( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_END, _______, _______, @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_fun_full_bottom_row( + [2] = LAYOUT_fun_full_bottom_row_7_col( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT_fun_full_bottom_row( + [3] = LAYOUT_fun_full_bottom_row_7_col( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [4] = LAYOUT_fun_full_bottom_row( + [4] = LAYOUT_fun_full_bottom_row_7_col( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [5] = LAYOUT_fun_full_bottom_row( + [5] = LAYOUT_fun_full_bottom_row_7_col( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [6] = LAYOUT_fun_full_bottom_row( + [6] = LAYOUT_fun_full_bottom_row_7_col( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [7] = LAYOUT_fun_full_bottom_row( + [7] = LAYOUT_fun_full_bottom_row_7_col( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [8] = LAYOUT_fun_full_bottom_row( + [8] = LAYOUT_fun_full_bottom_row_7_col( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______ ), - [9] = LAYOUT_fun_full_bottom_row( + [9] = LAYOUT_fun_full_bottom_row_7_col( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/keymaps/vial/vial.json b/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/keymaps/vial/vial.json index e620b04c320..4b193b2d646 100644 --- a/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/keymaps/vial/vial.json +++ b/keyboards/cyboard/imprint/imprint_function_row_full_bottom_row_7_col/keymaps/vial/vial.json @@ -9,136 +9,148 @@ }, "layouts": { "keymap": -[ - [ - "6,5", - "6,4", - "6,3", - "6,2", - "6,1", - "6,0", - { - "x": 5.5 - }, - "13,0", - "13,1", - "13,2", - "13,3", - "13,4", - "13,5" - ], - [ - "5,5", - "5,4", - "5,3", - "5,2", - "5,1", - "5,0", - { - "x": 5.5 - }, - "12,0", - "12,1", - "12,2", - "12,3", - "12,4", - "12,5" - ], - [ - "4,5", - "4,4", - "4,3", - "4,2", - "4,1", - "4,0", - { - "x": 5.5 - }, - "11,0", - "11,1", - "11,2", - "11,3", - "11,4", - "11,5" - ], - [ - "3,5", - "3,4", - "3,3", - "3,2", - "3,1", - "3,0", - { - "x": 5.5 - }, - "10,0", - "10,1", - "10,2", - "10,3", - "10,4", - "10,5" - ], - [ - "2,5", - "2,4", - "2,3", - "2,2", - "2,1", - "2,0", - { - "x": 5.5 - }, - "9,0", - "9,1", - "9,2", - "9,3", - "9,4", - "9,5" - ], - [ - "1,5", - "1,4", - "1,3", - "1,2", - "1,1", - { - "x": 7.5 - }, - "8,1", - "8,2", - "8,3", - "8,4", - "8,5" - ], - [ - { - "y": -0.5, - "x": 5.5 - }, - "0,3", - "0,2", - "0,1", - { - "x": 0.5 - }, - "7,1", - "7,2", - "7,3" - ], - [ - { - "x": 5.5 - }, - "0,7", - "0,6", - "0,5", - { - "x": 0.5 - }, - "7,5", - "7,6", - "7,7" - ] -] + [ + [ + "6,6", + "6,5", + "6,4", + "6,3", + "6,2", + "6,1", + "6,0", + { + "x": 5.5 + }, + "13,0", + "13,1", + "13,2", + "13,3", + "13,4", + "13,5", + "13,6" + ], + [ + "5,6", + "5,5", + "5,4", + "5,3", + "5,2", + "5,1", + "5,0", + { + "x": 5.5 + }, + "12,0", + "12,1", + "12,2", + "12,3", + "12,4", + "12,5", + "12,6" + ], + [ + "4,6", + "4,5", + "4,4", + "4,3", + "4,2", + "4,1", + "4,0", + { + "x": 5.5 + }, + "11,0", + "11,1", + "11,2", + "11,3", + "11,4", + "11,5", + "11,6" + ], + [ + "3,6", + "3,5", + "3,4", + "3,3", + "3,2", + "3,1", + "3,0", + { + "x": 5.5 + }, + "10,0", + "10,1", + "10,2", + "10,3", + "10,4", + "10,5", + "10,6" + ], + [ + "2,6", + "2,5", + "2,4", + "2,3", + "2,2", + "2,1", + "2,0", + { + "x": 5.5 + }, + "9,0", + "9,1", + "9,2", + "9,3", + "9,4", + "9,5", + "9,6" + ], + [ + "1,6", + "1,5", + "1,4", + "1,3", + "1,2", + "1,1", + { + "x": 7.5 + }, + "8,1", + "8,2", + "8,3", + "8,4", + "8,5", + "8,6" + ], + [ + { + "y": -0.5, + "x": 6.5 + }, + "0,3", + "0,2", + "0,1", + { + "x": 0.5 + }, + "7,1", + "7,2", + "7,3" + ], + [ + { + "x": 6.5 + }, + "0,7", + "0,6", + "0,5", + { + "x": 0.5 + }, + "7,5", + "7,6", + "7,7" + ] + ] } }