From b97b577d894b1a812c79a5deccd638f4c9fe66b0 Mon Sep 17 00:00:00 2001 From: Erik Trinkle Date: Tue, 14 Nov 2023 10:55:11 -0500 Subject: [PATCH] create single_arc_3x5 version --- .../cyboard/dactyl/single_arc_3x5/info.json | 134 +++++++----------- .../single_arc_3x5/keymaps/vial/keymap.c | 100 ++++++------- .../single_arc_3x5/keymaps/vial/vial.json | 29 +--- 3 files changed, 106 insertions(+), 157 deletions(-) diff --git a/keyboards/cyboard/dactyl/single_arc_3x5/info.json b/keyboards/cyboard/dactyl/single_arc_3x5/info.json index 07b43e478dd..6901806af77 100644 --- a/keyboards/cyboard/dactyl/single_arc_3x5/info.json +++ b/keyboards/cyboard/dactyl/single_arc_3x5/info.json @@ -1,6 +1,6 @@ { "rgb_matrix": { - "split_count": [25, 25], + "split_count": [18, 18], "layout": [ {"flags": 4, "matrix": [3, 0], "x": 86, "y": 32}, {"flags": 4, "matrix": [2, 0], "x": 86, "y": 43}, @@ -12,124 +12,92 @@ {"flags": 4, "matrix": [3, 2], "x": 52, "y": 32}, {"flags": 4, "matrix": [2, 2], "x": 52, "y": 43}, - {"flags": 4, "matrix": [1, 2], "x": 52, "y": 53}, {"flags": 4, "matrix": [4, 2], "x": 52, "y": 21}, {"flags": 4, "matrix": [3, 3], "x": 34, "y": 32}, {"flags": 4, "matrix": [2, 3], "x": 34, "y": 43}, - {"flags": 4, "matrix": [1, 3], "x": 34, "y": 53}, {"flags": 4, "matrix": [4, 3], "x": 34, "y": 21}, {"flags": 4, "matrix": [3, 4], "x": 17, "y": 32}, {"flags": 4, "matrix": [2, 4], "x": 17, "y": 43}, - {"flags": 4, "matrix": [1, 4], "x": 17, "y": 53}, {"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": [1, 5], "x": 0, "y": 53}, - {"flags": 4, "matrix": [4, 5], "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}, + {"flags": 4, "matrix": [0, 2], "x": 93, "y": 53}, + {"flags": 4, "matrix": [0, 1], "x": 93, "y": 64}, - {"flags": 4, "matrix": [10, 0], "x": 138, "y": 32}, - {"flags": 4, "matrix": [9, 0], "x": 138, "y": 43}, - {"flags": 4, "matrix": [11, 0], "x": 138, "y": 21}, + {"flags": 4, "matrix": [10, 0], "x": 128, "y": 32}, + {"flags": 4, "matrix": [9, 0], "x": 128, "y": 43}, + {"flags": 4, "matrix": [11, 0], "x": 128, "y": 21}, - {"flags": 4, "matrix": [10, 1], "x": 155, "y": 32}, - {"flags": 4, "matrix": [9, 1], "x": 155, "y": 43}, - {"flags": 4, "matrix": [11, 1], "x": 155, "y": 21}, + {"flags": 4, "matrix": [10, 1], "x": 145, "y": 32}, + {"flags": 4, "matrix": [9, 1], "x": 145, "y": 43}, + {"flags": 4, "matrix": [11, 1], "x": 145, "y": 21}, {"flags": 4, "matrix": [10, 2], "x": 172, "y": 32}, {"flags": 4, "matrix": [9, 2], "x": 172, "y": 43}, - {"flags": 4, "matrix": [8, 2], "x": 172, "y": 53}, {"flags": 4, "matrix": [11, 2], "x": 172, "y": 21}, {"flags": 4, "matrix": [10, 3], "x": 190, "y": 32}, {"flags": 4, "matrix": [9, 3], "x": 190, "y": 43}, - {"flags": 4, "matrix": [8, 3], "x": 190, "y": 53}, {"flags": 4, "matrix": [11, 3], "x": 190, "y": 21}, {"flags": 4, "matrix": [10, 4], "x": 207, "y": 32}, {"flags": 4, "matrix": [9, 4], "x": 207, "y": 43}, - {"flags": 4, "matrix": [8, 4], "x": 207, "y": 53}, {"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": [8, 5], "x": 224, "y": 53}, - {"flags": 4, "matrix": [11, 5], "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} + {"flags": 4, "matrix": [7, 3], "x": 128, "y": 53}, + {"flags": 4, "matrix": [7, 2], "x": 111, "y": 53}, + {"flags": 4, "matrix": [7, 1], "x": 111, "y": 64} ] }, "layouts": { - "LAYOUT_single_arc_let": { + "LAYOUT_single_arc_3x5": { "layout": [ - { "matrix": [4, 5], "x": 0, "y": 0 }, - { "matrix": [4, 4], "x": 1, "y": 0 }, - { "matrix": [4, 3], "x": 2, "y": 0 }, - { "matrix": [4, 2], "x": 3, "y": 0 }, - { "matrix": [4, 1], "x": 4, "y": 0 }, - { "matrix": [4, 0], "x": 5, "y": 0 }, - - { "matrix": [11, 0], "x": 10.5, "y": 0 }, - { "matrix": [11, 1], "x": 11.5, "y": 0 }, - { "matrix": [11, 2], "x": 12.5, "y": 0 }, - { "matrix": [11, 3], "x": 13.5, "y": 0 }, - { "matrix": [11, 4], "x": 14.5, "y": 0 }, - { "matrix": [11, 5], "x": 15.5, "y": 0 }, - - { "matrix": [3, 5], "x": 0, "y": 1 }, - { "matrix": [3, 4], "x": 1, "y": 1 }, - { "matrix": [3, 3], "x": 2, "y": 1 }, - { "matrix": [3, 2], "x": 3, "y": 1 }, - { "matrix": [3, 1], "x": 4, "y": 1 }, - { "matrix": [3, 0], "x": 5, "y": 1 }, - - { "matrix": [10, 0], "x": 10.5, "y": 1 }, - { "matrix": [10, 1], "x": 11.5, "y": 1 }, - { "matrix": [10, 2], "x": 12.5, "y": 1 }, - { "matrix": [10, 3], "x": 13.5, "y": 1 }, - { "matrix": [10, 4], "x": 14.5, "y": 1 }, - { "matrix": [10, 5], "x": 15.5, "y": 1 }, - - { "matrix": [2, 5], "x": 0, "y": 2 }, - { "matrix": [2, 4], "x": 1, "y": 2 }, - { "matrix": [2, 3], "x": 2, "y": 2 }, - { "matrix": [2, 2], "x": 3, "y": 2 }, - { "matrix": [2, 1], "x": 4, "y": 2 }, - { "matrix": [2, 0], "x": 5, "y": 2 }, - - { "matrix": [9, 0], "x": 10.5, "y": 2 }, - { "matrix": [9, 1], "x": 11.5, "y": 2 }, - { "matrix": [9, 2], "x": 12.5, "y": 2 }, - { "matrix": [9, 3], "x": 13.5, "y": 2 }, - { "matrix": [9, 4], "x": 14.5, "y": 2 }, - { "matrix": [9, 5], "x": 15.5, "y": 2 }, - - { "matrix": [1, 5], "x": 0, "y": 3 }, - { "matrix": [1, 4], "x": 1, "y": 3 }, - { "matrix": [1, 3], "x": 2, "y": 3 }, - { "matrix": [1, 2], "x": 3, "y": 3 }, + { "matrix": [4, 4], "x": 0, "y": 0 }, + { "matrix": [4, 3], "x": 1, "y": 0 }, + { "matrix": [4, 2], "x": 2, "y": 0 }, + { "matrix": [4, 1], "x": 3, "y": 0 }, + { "matrix": [4, 0], "x": 4, "y": 0 }, + + { "matrix": [11, 0], "x": 9.5, "y": 0 }, + { "matrix": [11, 1], "x": 10.5, "y": 0 }, + { "matrix": [11, 2], "x": 11.5, "y": 0 }, + { "matrix": [11, 3], "x": 12.5, "y": 0 }, + { "matrix": [11, 4], "x": 13.5, "y": 0 }, + + { "matrix": [3, 4], "x": 0, "y": 1 }, + { "matrix": [3, 3], "x": 1, "y": 1 }, + { "matrix": [3, 2], "x": 2, "y": 1 }, + { "matrix": [3, 1], "x": 3, "y": 1 }, + { "matrix": [3, 0], "x": 4, "y": 1 }, + + { "matrix": [10, 0], "x": 9.5, "y": 1 }, + { "matrix": [10, 1], "x": 10.5, "y": 1 }, + { "matrix": [10, 2], "x": 11.5, "y": 1 }, + { "matrix": [10, 3], "x": 12.5, "y": 1 }, + { "matrix": [10, 4], "x": 13.5, "y": 1 }, + + { "matrix": [2, 4], "x": 0, "y": 2 }, + { "matrix": [2, 3], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 1], "x": 3, "y": 2 }, + { "matrix": [2, 0], "x": 4, "y": 2 }, + + { "matrix": [9, 0], "x": 9.5, "y": 2 }, + { "matrix": [9, 1], "x": 10.5, "y": 2 }, + { "matrix": [9, 2], "x": 11.5, "y": 2 }, + { "matrix": [9, 3], "x": 12.5, "y": 2 }, + { "matrix": [9, 4], "x": 13.5, "y": 2 }, { "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": 3.5 }, - { "matrix": [7, 1], "x": 9, "y": 3.5 }, - { "matrix": [7, 2], "x": 10, "y": 3.5 }, - { "matrix": [7, 3], "x": 11, "y": 3.5 }, - - { "matrix": [8, 2], "x": 12.5, "y": 3 }, - { "matrix": [8, 3], "x": 13.5, "y": 3 }, - { "matrix": [8, 4], "x": 14.5, "y": 3 }, - { "matrix": [8, 5], "x": 15.5, "y": 3 } + { "matrix": [7, 1], "x": 8, "y": 3.5 }, + { "matrix": [7, 2], "x": 9, "y": 3.5 }, + { "matrix": [7, 3], "x": 10, "y": 3.5 } ] } } diff --git a/keyboards/cyboard/dactyl/single_arc_3x5/keymaps/vial/keymap.c b/keyboards/cyboard/dactyl/single_arc_3x5/keymaps/vial/keymap.c index 102969c6094..ae1eb6d24eb 100644 --- a/keyboards/cyboard/dactyl/single_arc_3x5/keymaps/vial/keymap.c +++ b/keyboards/cyboard/dactyl/single_arc_3x5/keymaps/vial/keymap.c @@ -6,73 +6,73 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_single_arc_let( - 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_UP, KC_DOWN, KC_LGUI, KC_LALT, KC_LGUI, KC_ENT, KC_DEL, KC_BSPC, KC_SPC, MO(1), KC_LBRC, KC_RBRC, KC_LEFT, KC_RIGHT + [0] = LAYOUT_single_arc_3x5( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LGUI, KC_ENT, KC_DEL, KC_BSPC, KC_SPC, MO(1) ), - [1] = LAYOUT_single_arc_let( - _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_END, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [1] = LAYOUT_single_arc_3x5( + _______, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_END, _______, + _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_single_arc_let( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [2] = LAYOUT_single_arc_3x5( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT_single_arc_let( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [3] = LAYOUT_single_arc_3x5( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), - [4] = LAYOUT_single_arc_let( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [4] = LAYOUT_single_arc_3x5( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), - [5] = LAYOUT_single_arc_let( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [5] = LAYOUT_single_arc_3x5( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), - [6] = LAYOUT_single_arc_let( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [6] = LAYOUT_single_arc_3x5( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), - [7] = LAYOUT_single_arc_let( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [7] = LAYOUT_single_arc_3x5( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), - [8] = LAYOUT_single_arc_let( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [8] = LAYOUT_single_arc_3x5( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), - [9] = LAYOUT_single_arc_let( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + [9] = LAYOUT_single_arc_3x5( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/cyboard/dactyl/single_arc_3x5/keymaps/vial/vial.json b/keyboards/cyboard/dactyl/single_arc_3x5/keymaps/vial/vial.json index fadac9c1200..d6e451208c3 100644 --- a/keyboards/cyboard/dactyl/single_arc_3x5/keymaps/vial/vial.json +++ b/keyboards/cyboard/dactyl/single_arc_3x5/keymaps/vial/vial.json @@ -11,7 +11,6 @@ "keymap": [ [ - "4,5", "4,4", "4,3", "4,2", @@ -24,11 +23,9 @@ "11,1", "11,2", "11,3", - "11,4", - "11,5" + "11,4" ], [ - "3,5", "3,4", "3,3", "3,2", @@ -41,11 +38,9 @@ "10,1", "10,2", "10,3", - "10,4", - "10,5" + "10,4" ], [ - "2,5", "2,4", "2,3", "2,2", @@ -58,26 +53,12 @@ "9,1", "9,2", "9,3", - "9,4", - "9,5" + "9,4" ], [ - "1,5", - "1,4", - "1,3", - "1,2", { - "x": 7 - }, - "8,2", - "8,3", - "8,4", - "8,5" - ], - [ - { - "y": -0.75, - "x": 4.25 + "y": 0.25, + "x": 3.25 }, "0,3", "0,2",