masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-07-24 12:40:43 +00:00
parent f6612c219f 191f6e8069
commit 62cd280c3b
4 changed files with 78 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
keyboards/idobao/id63/info.json
View File

@ -26,76 +26,80 @@
"pid": "0x0063",
"vid": "0x6964"
},
"layout_aliases": {
"LAYOUT_63_ansi": "LAYOUT_60_ansi_arrow"
},
"community_layouts": ["60_ansi_arrow"],
"layouts": {
"LAYOUT_63_ansi": {
"LAYOUT_60_ansi_arrow": {
"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 },
{ "matrix": [0, 12], "x": 12, "y": 0 },
{ "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
{ "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
{ "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
{ "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
{ "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
{ "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
{ "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
{ "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
{ "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
{ "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
{ "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
{ "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
{ "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
{ "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
{ "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{ "matrix": [1, 1], "x": 1.5, "y": 1 },
{ "matrix": [1, 2], "x": 2.5, "y": 1 },
{ "matrix": [1, 3], "x": 3.5, "y": 1 },
{ "matrix": [1, 4], "x": 4.5, "y": 1 },
{ "matrix": [1, 5], "x": 5.5, "y": 1 },
{ "matrix": [1, 6], "x": 6.5, "y": 1 },
{ "matrix": [1, 7], "x": 7.5, "y": 1 },
{ "matrix": [1, 8], "x": 8.5, "y": 1 },
{ "matrix": [1, 9], "x": 9.5, "y": 1 },
{ "matrix": [1, 10], "x": 10.5, "y": 1 },
{ "matrix": [1, 11], "x": 11.5, "y": 1 },
{ "matrix": [1, 12], "x": 12.5, "y": 1 },
{ "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
{ "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{ "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
{ "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
{ "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
{ "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
{ "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
{ "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
{ "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
{ "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
{ "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
{ "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
{ "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
{ "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
{ "label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
{ "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
{ "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, 13], "x": 12.75, "y": 2, "w": 2.25 },
{ "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
{ "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
{ "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
{ "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
{ "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
{ "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
{ "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
{ "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
{ "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
{ "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
{ "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
{ "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
{ "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
{ "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 },
{ "matrix": [3, 2], "x": 2.25, "y": 3 },
{ "matrix": [3, 3], "x": 3.25, "y": 3 },
{ "matrix": [3, 4], "x": 4.25, "y": 3 },
{ "matrix": [3, 5], "x": 5.25, "y": 3 },
{ "matrix": [3, 6], "x": 6.25, "y": 3 },
{ "matrix": [3, 7], "x": 7.25, "y": 3 },
{ "matrix": [3, 8], "x": 8.25, "y": 3 },
{ "matrix": [3, 9], "x": 9.25, "y": 3 },
{ "matrix": [3, 10], "x": 10.25, "y": 3 },
{ "matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75 },
{ "matrix": [3, 12], "x": 13, "y": 3 },
{ "matrix": [3, 13], "x": 14, "y": 3 },
{ "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 },
{ "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
{ "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
{ "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
{ "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
{ "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
{ "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
{ "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
{ "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
{ "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
{ "label": "Shift", "matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75 },
{ "label": "\u2191", "matrix": [3, 12], "x": 13, "y": 3 },
{ "label": "/?", "matrix": [3, 13], "x": 14, "y": 3 },
{ "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
{ "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
{ "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
{ "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25 },
{ "matrix": [4, 9], "x": 10, "y": 4 },
{ "matrix": [4, 10], "x": 11, "y": 4 },
{ "matrix": [4, 11], "x": 12, "y": 4 },
{ "matrix": [4, 12], "x": 13, "y": 4 },
{ "matrix": [4, 13], "x": 14, "y": 4 }
{ "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
{ "label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
{ "label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
{ "label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25 },
{ "label": "Fn", "matrix": [4, 9], "x": 10, "y": 4 },
{ "label": "Menu", "matrix": [4, 10], "x": 11, "y": 4 },
{ "label": "\u2190", "matrix": [4, 11], "x": 12, "y": 4 },
{ "label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4 },
{ "label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4 }
]
}
}

4
keyboards/idobao/id63/keymaps/default/keymap.c
View File

@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │Ctrl│Win │Alt │ │Fn │Mnu│Lf │Dn │Rt │
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
*/
[0] = LAYOUT_63_ansi(
[0] = LAYOUT_60_ansi_arrow(
KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │ │ │ │ │ │ │Hom│PDn│End│
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
*/
[1] = LAYOUT_63_ansi(
[1] = LAYOUT_60_ansi_arrow(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
_______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, _______,

8
keyboards/idobao/id63/keymaps/idobao/keymap.c
View File

@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │Ctrl│Win │Alt │ │Fn1│*M*│Lf │Dn │Rt │ *M* => Tap = Menu, Hold = Layer 2 (Fn2)
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
*/
[_BASE] = LAYOUT_63_ansi(
[_BASE] = LAYOUT_60_ansi_arrow(
KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
SK_LT1C, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │ │ │ │ │ │ │Hom│PDn│End│
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
*/
[_FN1] = LAYOUT_63_ansi(
[_FN1] = LAYOUT_60_ansi_arrow(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
_______, _______, KC_UP, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______,
@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, MO(_FN3), KC_HOME, KC_PGDN, KC_END
),
[_FN2] = LAYOUT_63_ansi(
[_FN2] = LAYOUT_60_ansi_arrow(
KC_ESC, KC_BRID, KC_BRIU, KC_MCON, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_POWER,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, MO(_FN3), _______, _______, _______, _______
),
[_FN3] = LAYOUT_63_ansi(
[_FN3] = LAYOUT_60_ansi_arrow(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

8
keyboards/idobao/id63/keymaps/via/keymap.c
View File

@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │Ctrl│Win │Alt │ │Fn │Mnu│Lf │Dn │Rt │
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
*/
[0] = LAYOUT_63_ansi(
[0] = LAYOUT_60_ansi_arrow(
KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │ │ │ │ │ │ │Hom│PDn│End│
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
*/
[1] = LAYOUT_63_ansi(
[1] = LAYOUT_60_ansi_arrow(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
_______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______, _______,
@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
),
[2] = LAYOUT_63_ansi(
[2] = LAYOUT_60_ansi_arrow(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_63_ansi(
[3] = LAYOUT_60_ansi_arrow(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,