diff --git a/keyboards/cyboard/imprint/dual_arcs_number_row/info.json b/keyboards/cyboard/imprint/dual_arcs_number_row/info.json index 7042b7eca0f..5ec2e35f293 100644 --- a/keyboards/cyboard/imprint/dual_arcs_number_row/info.json +++ b/keyboards/cyboard/imprint/dual_arcs_number_row/info.json @@ -1,6 +1,6 @@ { "rgb_matrix": { - "split_count": [32, 32], + "split_count": [31, 31], "layout": [ {"flags": 4, "matrix": [3, 0], "x": 86, "y": 32}, {"flags": 4, "matrix": [2, 0], "x": 86, "y": 43}, @@ -39,7 +39,6 @@ {"flags": 4, "matrix": [0, 1], "x": 103, "y": 64}, {"flags": 4, "matrix": [0, 7], "x": 69, "y": 53}, {"flags": 4, "matrix": [0, 6], "x": 69, "y": 64}, - {"flags": 4, "matrix": [0, 5], "x": 86, "y": 64}, {"flags": 4, "matrix": [10, 0], "x": 138, "y": 32}, @@ -78,12 +77,11 @@ {"flags": 4, "matrix": [7, 2], "x": 121, "y": 53}, {"flags": 4, "matrix": [7, 1], "x": 121, "y": 64}, {"flags": 4, "matrix": [7, 7], "x": 138, "y": 64}, - {"flags": 4, "matrix": [7, 6], "x": 155, "y": 64}, - {"flags": 4, "matrix": [7, 5], "x": 155, "y": 53} + {"flags": 4, "matrix": [7, 6], "x": 155, "y": 64} ] }, "layouts": { - "LAYOUT_num": { + "LAYOUT_dual_arcs_num": { "layout": [ { "matrix": [5, 5], "x": 0, "y": 0 }, { "matrix": [5, 4], "x": 1, "y": 0 }, @@ -91,64 +89,75 @@ { "matrix": [5, 2], "x": 3, "y": 0 }, { "matrix": [5, 1], "x": 4, "y": 0 }, { "matrix": [5, 0], "x": 5, "y": 0 }, + { "matrix": [12, 0], "x": 11.5, "y": 0 }, { "matrix": [12, 1], "x": 12.5, "y": 0 }, { "matrix": [12, 2], "x": 13.5, "y": 0 }, { "matrix": [12, 3], "x": 14.5, "y": 0 }, { "matrix": [12, 4], "x": 15.5, "y": 0 }, { "matrix": [12, 5], "x": 16.5, "y": 0 }, + { "matrix": [4, 5], "x": 0, "y": 1 }, { "matrix": [4, 4], "x": 1, "y": 1 }, { "matrix": [4, 3], "x": 2, "y": 1 }, { "matrix": [4, 2], "x": 3, "y": 1 }, { "matrix": [4, 1], "x": 4, "y": 1 }, { "matrix": [4, 0], "x": 5, "y": 1 }, + { "matrix": [11, 0], "x": 10.5, "y": 1 }, { "matrix": [11, 1], "x": 11.5, "y": 1 }, { "matrix": [11, 2], "x": 12.5, "y": 1 }, { "matrix": [11, 3], "x": 13.5, "y": 1 }, { "matrix": [11, 4], "x": 14.5, "y": 1 }, { "matrix": [11, 5], "x": 15.5, "y": 1 }, + { "matrix": [3, 5], "x": 0, "y": 2 }, { "matrix": [3, 4], "x": 1, "y": 2 }, { "matrix": [3, 3], "x": 2, "y": 2 }, { "matrix": [3, 2], "x": 3, "y": 2 }, { "matrix": [3, 1], "x": 4, "y": 2 }, { "matrix": [3, 0], "x": 5, "y": 2 }, + { "matrix": [10, 0], "x": 10.5, "y": 2 }, { "matrix": [10, 1], "x": 11.5, "y": 2 }, { "matrix": [10, 2], "x": 12.5, "y": 2 }, { "matrix": [10, 3], "x": 13.5, "y": 2 }, { "matrix": [10, 4], "x": 14.5, "y": 2 }, { "matrix": [10, 5], "x": 15.5, "y": 2 }, + { "matrix": [2, 5], "x": 0, "y": 3 }, { "matrix": [2, 4], "x": 1, "y": 3 }, { "matrix": [2, 3], "x": 2, "y": 3 }, { "matrix": [2, 2], "x": 3, "y": 3 }, { "matrix": [2, 1], "x": 4, "y": 3 }, { "matrix": [2, 0], "x": 5, "y": 3 }, + { "matrix": [9, 0], "x": 10.5, "y": 3 }, { "matrix": [9, 1], "x": 11.5, "y": 3 }, { "matrix": [9, 2], "x": 12.5, "y": 3 }, { "matrix": [9, 3], "x": 13.5, "y": 3 }, { "matrix": [9, 4], "x": 14.5, "y": 3 }, { "matrix": [9, 5], "x": 15.5, "y": 3 }, + { "matrix": [1, 3], "x": 2, "y": 3 }, { "matrix": [1, 2], "x": 3, "y": 3 }, - { "matrix": [0, 7], "x": 4.5, "y": 3.5 }, - { "matrix": [0, 3], "x": 5.5, "y": 3.5 }, - { "matrix": [0, 2], "x": 6.5, "y": 4 }, - { "matrix": [7, 2], "x": 10, "y": 4 }, - { "matrix": [7, 3], "x": 11, "y": 3.5 }, - { "matrix": [7, 7], "x": 12, "y": 3.5 }, + + { "matrix": [0, 3], "x": 4.5, "y": 3.5 }, + { "matrix": [0, 2], "x": 5.5, "y": 3.5 }, + { "matrix": [0, 1], "x": 6.5, "y": 4 }, + + { "matrix": [7, 1], "x": 10, "y": 4 }, + { "matrix": [7, 2], "x": 11, "y": 3.5 }, + { "matrix": [7, 3], "x": 12, "y": 3.5 }, + { "matrix": [8, 2], "x": 13.5, "y": 3 }, { "matrix": [8, 3], "x": 14.5, "y": 3 }, - { "matrix": [0, 6], "x": 6.5, "y": 5 }, - { "matrix": [0, 5], "x": 7.5, "y": 5 }, - { "matrix": [0, 1], "x": 7.5, "y": 4 }, - { "matrix": [7, 1], "x": 9, "y": 4 }, - { "matrix": [7, 5], "x": 9, "y": 5 }, - { "matrix": [7, 6], "x": 10, "y": 5 } + + { "matrix": [0, 7], "x": 6.5, "y": 5 }, + { "matrix": [0, 6], "x": 7.5, "y": 5 }, + + { "matrix": [7, 6], "x": 9, "y": 5 }, + { "matrix": [7, 7], "x": 10, "y": 5 } ] } } diff --git a/keyboards/cyboard/imprint/dual_arcs_number_row/keymaps/vial/keymap.c b/keyboards/cyboard/imprint/dual_arcs_number_row/keymaps/vial/keymap.c index 4ef95212f01..1e0853e9205 100644 --- a/keyboards/cyboard/imprint/dual_arcs_number_row/keymaps/vial/keymap.c +++ b/keyboards/cyboard/imprint/dual_arcs_number_row/keymaps/vial/keymap.c @@ -6,93 +6,93 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_num( + [0] = LAYOUT_dual_arcs_num( 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, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 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_LGUI, KC_LALT, KC_LGUI, KC_ENT, KC_DEL, KC_BSPC, KC_SPC, MO(1), KC_LBRC, KC_RBRC, - KC_HOME, KC_END, KC_ESC, KC_GRAVE, KC_CAPS, KC_APP + KC_HOME, KC_END, KC_CAPS, KC_APP ), - [1] = LAYOUT_num( + [1] = LAYOUT_dual_arcs_num( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______ ), - [2] = LAYOUT_num( + [2] = LAYOUT_dual_arcs_num( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______ ), - [3] = LAYOUT_num( + [3] = LAYOUT_dual_arcs_num( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______ ), - [4] = LAYOUT_num( + [4] = LAYOUT_dual_arcs_num( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______ ), - [5] = LAYOUT_num( + [5] = LAYOUT_dual_arcs_num( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______ ), - [6] = LAYOUT_num( + [6] = LAYOUT_dual_arcs_num( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______ ), - [7] = LAYOUT_num( + [7] = LAYOUT_dual_arcs_num( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______ ), - [8] = LAYOUT_num( + [8] = LAYOUT_dual_arcs_num( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______ ), - [9] = LAYOUT_num( + [9] = LAYOUT_dual_arcs_num( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______ ) }; diff --git a/keyboards/cyboard/imprint/dual_arcs_number_row/keymaps/vial/vial.json b/keyboards/cyboard/imprint/dual_arcs_number_row/keymaps/vial/vial.json index bf723b99db0..9c951096726 100644 --- a/keyboards/cyboard/imprint/dual_arcs_number_row/keymaps/vial/vial.json +++ b/keyboards/cyboard/imprint/dual_arcs_number_row/keymaps/vial/vial.json @@ -107,15 +107,13 @@ ], [ { - "x": 5.5 + "x": 6.5 }, "0,7", "0,6", - "0,5", { "x": 0.5 }, - "7,5", "7,6", "7,7" ]