Skip to content

Commit

Permalink
move dual arcs number row into a new format that will allow simpler c…
Browse files Browse the repository at this point in the history 
…hanges in the RGB matrix between variants.
  • Loading branch information
@RealET
RealET committed Oct 3, 2023
1 parent 8a19bfe commit 29cdc74
Show file tree
Hide file tree
Showing 10 changed files with 209 additions and 98 deletions.
1 change: 0 additions & 1 deletion keyboards/cyboard/dactyl/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#ifdef RGB_MATRIX_ENABLE
# define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
# define SPLIT_TRANSPORT_MIRROR
# define RGB_MATRIX_LED_COUNT 112
# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default mode, if none has been set
# define RGB_MATRIX_DEFAULT_HUE 33 // Sets the default hue value, if none has been set
# define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
Expand Down
10 changes: 10 additions & 0 deletions keyboards/cyboard/dactyl/dual_arcs_number_row/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/* Copyright 2023 Cyboard LLC (@Cyboard-DigitalTailor)
* SPDX-License-Identifier: GPL-2.0-or-later
*/

#pragma once

/* RGB settings */
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_LED_COUNT 66
#endif
172 changes: 172 additions & 0 deletions keyboards/cyboard/dactyl/dual_arcs_number_row/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
{
"rgb_matrix": {
"split_count": [33, 33],
"layout": [
{"flags": 4, "matrix": [3, 0], "x": 86, "y": 32},
{"flags": 4, "matrix": [2, 0], "x": 86, "y": 43},
{"flags": 4, "matrix": [5, 0], "x": 86, "y": 11},
{"flags": 4, "matrix": [4, 0], "x": 86, "y": 21},

{"flags": 4, "matrix": [3, 1], "x": 69, "y": 32},
{"flags": 4, "matrix": [2, 1], "x": 69, "y": 43},
{"flags": 4, "matrix": [5, 1], "x": 69, "y": 11},
{"flags": 4, "matrix": [4, 1], "x": 69, "y": 21},

{"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": [5, 2], "x": 52, "y": 11},
{"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": [5, 3], "x": 34, "y": 11},
{"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": [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": [1, 5], "x": 0, "y": 53},
{"flags": 4, "matrix": [5, 5], "x": 0, "y": 11},
{"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, 7], "x": 69, "y": 53},
{"flags": 4, "matrix": [0, 6], "x": 69, "y": 64},


{"flags": 4, "matrix": [10, 0], "x": 138, "y": 32},
{"flags": 4, "matrix": [9, 0], "x": 138, "y": 43},
{"flags": 4, "matrix": [12, 0], "x": 138, "y": 11},
{"flags": 4, "matrix": [11, 0], "x": 138, "y": 21},

{"flags": 4, "matrix": [10, 1], "x": 155, "y": 32},
{"flags": 4, "matrix": [9, 1], "x": 155, "y": 43},
{"flags": 4, "matrix": [12, 1], "x": 155, "y": 11},
{"flags": 4, "matrix": [11, 1], "x": 155, "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": [12, 2], "x": 172, "y": 11},
{"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": [12, 3], "x": 190, "y": 11},
{"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": [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": [8, 5], "x": 224, "y": 53},
{"flags": 4, "matrix": [12, 5], "x": 224, "y": 11},
{"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, 7], "x": 138, "y": 64},
{"flags": 4, "matrix": [7, 6], "x": 155, "y": 64}
]
},
"layouts": {
"LAYOUT_dual_arcs_num": {
"layout": [
{ "matrix": [5, 5], "x": 0, "y": 0 },
{ "matrix": [5, 4], "x": 1, "y": 0 },
{ "matrix": [5, 3], "x": 2, "y": 0 },
{ "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": 10.5, "y": 0 },
{ "matrix": [12, 1], "x": 11.5, "y": 0 },
{ "matrix": [12, 2], "x": 12.5, "y": 0 },
{ "matrix": [12, 3], "x": 13.5, "y": 0 },
{ "matrix": [12, 4], "x": 14.5, "y": 0 },
{ "matrix": [12, 5], "x": 15.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, 5], "x": 0, "y": 4 },
{ "matrix": [1, 4], "x": 1, "y": 4 },
{ "matrix": [1, 3], "x": 2, "y": 4 },
{ "matrix": [1, 2], "x": 3, "y": 4 },

{ "matrix": [0, 3], "x": 4.5, "y": 4.5 },
{ "matrix": [0, 2], "x": 5.5, "y": 4.5 },
{ "matrix": [0, 1], "x": 6.5, "y": 4.5 },

{ "matrix": [7, 1], "x": 9, "y": 4.5 },
{ "matrix": [7, 2], "x": 10, "y": 4.5 },
{ "matrix": [7, 3], "x": 11, "y": 4.5 },

{ "matrix": [8, 2], "x": 12.5, "y": 4 },
{ "matrix": [8, 3], "x": 13.5, "y": 4 },
{ "matrix": [8, 4], "x": 14.5, "y": 4 },
{ "matrix": [8, 5], "x": 15.5, "y": 4 },

{ "matrix": [0, 7], "x": 5.5, "y": 5.5 },
{ "matrix": [0, 6], "x": 6.5, "y": 5.5 },

{ "matrix": [7, 6], "x": 9, "y": 5.5 },
{ "matrix": [7, 7], "x": 10, "y": 5.5 }
]
}
}
}
26 changes: 26 additions & 0 deletions keyboards/cyboard/dactyl/dual_arcs_number_row/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* Copyright 2023 Cyboard LLC (@Cyboard-DigitalTailor)
* SPDX-License-Identifier: GPL-2.0-or-later
*/

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[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_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,
KC_GRAVE, KC_ESC, KC_CAPS, KC_APP
),

[1] = LAYOUT_dual_arcs_num(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_END, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______
)
};
0 ...tyl/keymaps/dual_arcs_number_row/config.h → ...ual_arcs_number_row/keymaps/vial/config.h
View file
File renamed without changes.
0 ...tyl/keymaps/dual_arcs_number_row/keymap.c → ...ual_arcs_number_row/keymaps/vial/keymap.c
View file
File renamed without changes.
0 ...tyl/keymaps/dual_arcs_number_row/rules.mk → ...ual_arcs_number_row/keymaps/vial/rules.mk
View file
File renamed without changes.
0 ...yl/keymaps/dual_arcs_number_row/vial.json → ...al_arcs_number_row/keymaps/vial/vial.json
View file
File renamed without changes.
1 change: 1 addition & 0 deletions keyboards/cyboard/dactyl/dual_arcs_number_row/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

97 changes: 0 additions & 97 deletions keyboards/cyboard/dactyl/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,104 +29,7 @@
},
"rgb_matrix": {
"driver": "WS2812",
"split_count": [56, 56],
"max_brightness": 120,
"layout": [
{"flags": 4, "matrix": [3, 0], "x": 86, "y": 32},
{"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},
{"flags": 4, "matrix": [4, 0], "x": 86, "y": 21},

{"flags": 4, "matrix": [3, 1], "x": 69, "y": 32},
{"flags": 4, "matrix": [2, 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},

{"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": [6, 2], "x": 52, "y": 0},
{"flags": 4, "matrix": [5, 2], "x": 52, "y": 11},
{"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": [6, 3], "x": 34, "y": 0},
{"flags": 4, "matrix": [5, 3], "x": 34, "y": 11},
{"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": [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": [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": [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, 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},
{"flags": 4, "matrix": [9, 0], "x": 138, "y": 43},
{"flags": 4, "matrix": [13, 0], "x": 138, "y": 0},
{"flags": 4, "matrix": [12, 0], "x": 138, "y": 11},
{"flags": 4, "matrix": [11, 0], "x": 138, "y": 21},

{"flags": 4, "matrix": [10, 1], "x": 155, "y": 32},
{"flags": 4, "matrix": [9, 1], "x": 155, "y": 43},
{"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},

{"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": [13, 2], "x": 172, "y": 0},
{"flags": 4, "matrix": [12, 2], "x": 172, "y": 11},
{"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": [13, 3], "x": 190, "y": 0},
{"flags": 4, "matrix": [12, 3], "x": 190, "y": 11},
{"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": [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": [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": [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, 7], "x": 138, "y": 64},
{"flags": 4, "matrix": [7, 6], "x": 155, "y": 64},
{"flags": 4, "matrix": [7, 5], "x": 155, "y": 53}
],
"animations": {
"alpha_mods": true,
"breathing": true,
Expand Down

0 comments on commit 29cdc74

Please sign in to comment.