Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wakizashi40 Handwired Touch-Up #20671

Merged
merged 3 commits into from
May 2, 2023
Merged

Wakizashi40 Handwired Touch-Up #20671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f24e7e
info.json: correct layout data
noroadsleft May 1, 2023
42ebad5
info.json: apply friendly formatting
noroadsleft May 2, 2023
5447ed2
rename LAYOUT_all to LAYOUT
noroadsleft May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 82 additions & 82 deletions keyboards/handwired/wakizashi40/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,88 +1,88 @@
{
"manufacturer": "xia0",
"keyboard_name": "Wakizashi 40",
"maintainer": "xia0",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
"features": {
"audio": false,
"backlight": false,
"bluetooth": false,
"bootmagic": true,
"command": false,
"console": true,
"extrakey": true,
"midi": false,
"mousekey": true,
"nkro": true,
"rgblight": false,
"unicode": false
},
"matrix_pins": {
"cols": ["F4", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
"rows": ["D3", "D2", "D1", "D0"]
},
"usb": {
"vid": "0x6662",
"pid": "0x7740",
"device_version": "0.0.1"
},
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
"layouts": {
"LAYOUT_all": {
"layout": [
{ "label": "TAB", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0 },
{ "label": "Q", "matrix": [0, 2], "x": 1.5, "y": 0 },
{ "label": "W", "matrix": [0, 3], "x": 2.5, "y": 0 },
{ "label": "E", "matrix": [0, 4], "x": 3.5, "y": 0 },
{ "label": "R", "matrix": [0, 5], "x": 4.5, "y": 0 },
{ "label": "T", "matrix": [0, 6], "x": 5.5, "y": 0 },
{ "label": "Y", "matrix": [0, 7], "x": 6.5, "y": 0 },
{ "label": "U", "matrix": [0, 8], "x": 7.5, "y": 0 },
{ "label": "I", "matrix": [0, 9], "x": 8.5, "y": 0 },
{ "label": "O", "matrix": [0, 10], "x": 9.5, "y": 0 },
{ "label": "P", "matrix": [0, 11], "x": 10.5, "y": 0 },
{ "label": "BACKSPACE", "matrix": [0, 12], "w": 1.5, "x": 11.5, "y": 0 },
"manufacturer": "xia0",
"keyboard_name": "Wakizashi 40",
"maintainer": "xia0",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
"features": {
"audio": false,
"backlight": false,
"bluetooth": false,
"bootmagic": true,
"command": false,
"console": true,
"extrakey": true,
"midi": false,
"mousekey": true,
"nkro": true,
"rgblight": false,
"unicode": false
},
"matrix_pins": {
"cols": ["F4", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
"rows": ["D3", "D2", "D1", "D0"]
},
"usb": {
"vid": "0x6662",
"pid": "0x7740",
"device_version": "0.0.1"
},
"layout_aliases": {
"LAYOUT_all": "LAYOUT"
},
"layouts": {
"LAYOUT": {
"layout": [
{"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
{"label": "Q", "matrix": [0, 2], "x": 1.5, "y": 0},
{"label": "W", "matrix": [0, 3], "x": 2.5, "y": 0},
{"label": "E", "matrix": [0, 4], "x": 3.5, "y": 0},
{"label": "R", "matrix": [0, 5], "x": 4.5, "y": 0},
{"label": "T", "matrix": [0, 6], "x": 5.5, "y": 0},
{"label": "Y", "matrix": [0, 7], "x": 6.5, "y": 0},
{"label": "U", "matrix": [0, 8], "x": 7.5, "y": 0},
{"label": "I", "matrix": [0, 9], "x": 8.5, "y": 0},
{"label": "O", "matrix": [0, 10], "x": 9.5, "y": 0},
{"label": "P", "matrix": [0, 11], "x": 10.5, "y": 0},
{"label": "Backspace", "matrix": [0, 12], "x": 11.5, "y": 0, "w": 1.5},

{ "label": "CAPSLOCK", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
{ "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.75, "y": 1 },
{ "label": "H", "matrix": [1, 7], "x": 6.75, "y": 1 },
{ "label": "J", "matrix": [1, 8], "x": 7.75, "y": 1 },
{ "label": "K", "matrix": [1, 9], "x": 8.75, "y": 1 },
{ "label": "L", "matrix": [1, 10], "x": 9.75, "y": 1 },
{ "label": "SEMICOLON", "matrix": [1, 11], "x": 10.75, "y": 1 },
{ "label": "ENTER", "matrix": [1, 12], "w": 1.25, "x": 11.75, "y": 1 },
{"label": "Caps Lock", "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, 7], "x": 6.75, "y": 1},
{"label": "J", "matrix": [1, 8], "x": 7.75, "y": 1},
{"label": "K", "matrix": [1, 9], "x": 8.75, "y": 1},
{"label": "L", "matrix": [1, 10], "x": 9.75, "y": 1},
{"label": ";", "matrix": [1, 11], "x": 10.75, "y": 1},
{"label": "Enter", "matrix": [1, 12], "x": 11.75, "y": 1, "w": 1.25},

{ "label": "LSHIFT", "matrix": [2, 0], "x": 0, "y": 2 },
{ "label": "Z", "matrix": [2, 1], "x": 1, "y": 2 },
{ "label": "X", "matrix": [2, 2], "x": 2, "y": 2 },
{ "label": "C", "matrix": [2, 3], "x": 3, "y": 2 },
{ "label": "V", "matrix": [2, 4], "x": 4, "y": 2 },
{ "label": "B", "matrix": [2, 5], "x": 5, "y": 2 },
{ "label": "ESCAPE", "matrix": [2, 6], "x": 6, "y": 2 },
{ "label": "N", "matrix": [2, 7], "x": 7, "y": 2 },
{ "label": "M", "matrix": [2, 8], "x": 8, "y": 2 },
{ "label": "COMMA", "matrix": [2, 9], "x": 9, "y": 2 },
{ "label": "PERIOD", "matrix": [2, 10], "x": 10, "y": 2 },
{ "label": "SLASH", "matrix": [2, 11], "x": 11, "y": 2 },
{ "label": "RSHIFT", "matrix": [2, 12], "x": 12, "y": 2 },
{"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2},
{"label": "Z", "matrix": [2, 1], "x": 1, "y": 2},
{"label": "X", "matrix": [2, 2], "x": 2, "y": 2},
{"label": "C", "matrix": [2, 3], "x": 3, "y": 2},
{"label": "V", "matrix": [2, 4], "x": 4, "y": 2},
{"label": "B", "matrix": [2, 5], "x": 5, "y": 2},
{"label": "Esc", "matrix": [2, 6], "x": 6, "y": 2},
{"label": "N", "matrix": [2, 7], "x": 7, "y": 2},
{"label": "M", "matrix": [2, 8], "x": 8, "y": 2},
{"label": ",", "matrix": [2, 9], "x": 9, "y": 2},
{"label": ".", "matrix": [2, 10], "x": 10, "y": 2},
{"label": "/", "matrix": [2, 11], "x": 11, "y": 2},
{"label": "Shift", "matrix": [2, 12], "x": 12, "y": 2},

{ "label": "LCTRL", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
{ "label": "LWIN", "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3 },
{ "label": "LALT", "matrix": [3, 3], "w": 1.25, "x": 2.5, "y": 3 },
{ "label": "SPACE1", "matrix": [3, 5], "w": 2.75, "x": 3.75, "y": 3 },
{ "label": "SPACE2", "matrix": [3, 7], "w": 2.75, "x": 6.5, "y": 3 },
{ "label": "RALT", "matrix": [3, 9], "w": 1.25, "x": 9.25, "y": 3 },
{ "label": "MENU", "matrix": [3, 11], "w": 1.25, "x": 10.5, "y": 3 },
{ "label": "RCTRL", "matrix": [3, 12], "w": 1.25, "x": 11.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.25},
{"label": "Alt", "matrix": [3, 3], "x": 2.5, "y": 3, "w": 1.25},
{"label": "Space1", "matrix": [3, 5], "x": 3.75, "y": 3, "w": 2.75},
{"label": "Space2", "matrix": [3, 7], "x": 6.5, "y": 3, "w": 2.75},
{"label": "Alt", "matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.25},
{"label": "Menu (Legacy)", "matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.25},
{"label": "Ctrl", "matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
]
}
}
}
}
8 changes: 4 additions & 4 deletions keyboards/handwired/wakizashi40/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,25 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[0] = LAYOUT_all(
[0] = LAYOUT(
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ESC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), LT(2, KC_SPC), KC_LALT, KC_MENU, KC_LCTL),

[1] = LAYOUT_all(
[1] = LAYOUT(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
MO(3), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),

[2] = LAYOUT_all(
[2] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
MO(11), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_QUOT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),

[3] = LAYOUT_all(
[3] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
Expand Down
8 changes: 4 additions & 4 deletions keyboards/handwired/wakizashi40/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@

#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
[0] = LAYOUT(
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ESC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), LT(2, KC_SPC), KC_LALT, KC_MENU, KC_LCTL),

[1] = LAYOUT_all(
[1] = LAYOUT(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
MO(3), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),

[2] = LAYOUT_all(
[2] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_QUOT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),

[3] = LAYOUT_all(
[3] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
Expand Down