Skip to content

Commit

Permalink
One Key Co Dango40 Touch-Up and Layout Addition (qmk#20755)
Browse files Browse the repository at this point in the history 
* add matrix_diagram.md

* info.json: apply friendly formatting

* remove matrix position K3B

Based on photos of the keyboard and renders of the PCB, I'm not convinced it exists.

* add LAYOUT_625u_space
  • Loading branch information
@noroadsleft
noroadsleft authored May 7, 2023
1 parent 7cbbdfe commit e41893b
Show file tree
Hide file tree
Showing 4 changed files with 151 additions and 80 deletions.
148 changes: 100 additions & 48 deletions keyboards/onekeyco/dango40/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,57 +23,109 @@
"layouts": {
"LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
{"matrix": [0, 12], "x": 12.75, "y": 0},
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "Backspace", "matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
{"label": "Mute", "matrix": [0, 12], "x": 12.75, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
{"matrix": [1, 1], "x": 1.25, "y": 1},
{"matrix": [1, 2], "x": 2.25, "y": 1},
{"matrix": [1, 3], "x": 3.25, "y": 1},
{"matrix": [1, 4], "x": 4.25, "y": 1},
{"matrix": [1, 5], "x": 5.25, "y": 1},
{"matrix": [1, 6], "x": 6.25, "y": 1},
{"matrix": [1, 7], "x": 7.25, "y": 1},
{"matrix": [1, 8], "x": 8.25, "y": 1},
{"matrix": [1, 9], "x": 9.25, "y": 1},
{"matrix": [1, 10], "x": 10.25, "y": 1},
{"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
{"matrix": [1, 12], "x": 12.75, "y": 1},
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
{"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1},
{"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1},
{"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1},
{"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1},
{"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1},
{"label": "H", "matrix": [1, 6], "x": 6.25, "y": 1},
{"label": "J", "matrix": [1, 7], "x": 7.25, "y": 1},
{"label": "K", "matrix": [1, 8], "x": 8.25, "y": 1},
{"label": "L", "matrix": [1, 9], "x": 9.25, "y": 1},
{"label": ";", "matrix": [1, 10], "x": 10.25, "y": 1},
{"label": "Enter", "matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
{"label": "Page Up", "matrix": [1, 12], "x": 12.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},
{"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
{"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2},
{"label": "Page Down", "matrix": [2, 12], "x": 12.75, "y": 2},

{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
{"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
{"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
{"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.75},
{"matrix": [3, 7], "x": 9, "y": 3, "w": 1.25},
{"matrix": [3, 9], "x": 10.25, "y": 3, "w": 1.25},
{"matrix": [3, 10], "x": 11.5, "y": 3, "w": 1.25},
{"matrix": [3, 11], "x": 12.75, "y": 3}
{"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"label": "GUI", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
{"label": "Alt", "matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
{"label": "Space", "matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
{"label": "Space", "matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.75},
{"label": "Alt", "matrix": [3, 7], "x": 9, "y": 3, "w": 1.25},
{"label": "Ctrl", "matrix": [3, 9], "x": 10.25, "y": 3, "w": 1.25},
{"label": "Fn", "matrix": [3, 10], "x": 11.5, "y": 3, "w": 1.25}
]
},
"LAYOUT_625u_space": {
"layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "Backspace", "matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
{"label": "Mute", "matrix": [0, 12], "x": 12.75, "y": 0},

{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
{"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1},
{"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1},
{"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1},
{"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1},
{"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1},
{"label": "H", "matrix": [1, 6], "x": 6.25, "y": 1},
{"label": "J", "matrix": [1, 7], "x": 7.25, "y": 1},
{"label": "K", "matrix": [1, 8], "x": 8.25, "y": 1},
{"label": "L", "matrix": [1, 9], "x": 9.25, "y": 1},
{"label": ";", "matrix": [1, 10], "x": 10.25, "y": 1},
{"label": "Enter", "matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
{"label": "Page Up", "matrix": [1, 12], "x": 12.75, "y": 1},

{"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
{"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2},
{"label": "Page Down", "matrix": [2, 12], "x": 12.75, "y": 2},

{"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"label": "GUI", "matrix": [3, 1], "x": 1.25, "y": 3},
{"label": "Alt", "matrix": [3, 2], "x": 2.25, "y": 3},
{"label": "Space", "matrix": [3, 4], "x": 3.25, "y": 3, "w": 6.25},
{"label": "Alt", "matrix": [3, 7], "x": 9.5, "y": 3},
{"label": "Ctrl", "matrix": [3, 9], "x": 10.5, "y": 3, "w": 1.25},
{"label": "Fn", "matrix": [3, 10], "x": 11.75, "y": 3}
]
}
}
Expand Down
24 changes: 12 additions & 12 deletions keyboards/onekeyco/dango40/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
QK_GESC, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSPC, KC_MUTE,
KC_TAB , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_ENT , KC_PGUP,
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_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_RALT, KC_RCTL, MO(1) , KC_RGHT
QK_GESC, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSPC, KC_MUTE,
KC_TAB , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_ENT , KC_PGUP,
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_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_RALT, KC_RCTL, MO(1)
),
[1] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
40 changes: 20 additions & 20 deletions keyboards/onekeyco/dango40/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
QK_GESC, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSPC, KC_MUTE,
KC_TAB , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_ENT , KC_PGUP,
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_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_RALT, KC_RCTL, MO(1) , KC_RGHT
QK_GESC, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSPC, KC_MUTE,
KC_TAB , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_ENT , KC_PGUP,
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_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_RALT, KC_RCTL, MO(1)
),
[1] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[4] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
Loading

0 comments on commit e41893b

Please sign in to comment.