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

amend 96_(ansi|iso) community_layouts in keyboards/ #22066

Merged
merged 5 commits into from
Sep 20, 2023
Merged

amend 96_(ansi|iso) community_layouts in keyboards/ #22066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cdde4b5
add boards
dunk2k Sep 18, 2023
858db6c
Merge branch 'qmk:master' into comm_96
dunk2k Sep 18, 2023
61d8ba6
add matrix diagrams
dunk2k Sep 19, 2023
f0ebec7
Merge branch 'comm_96' of https://github.com/dunk2k/qmk_firmware into…
dunk2k Sep 19, 2023
df1eb19
add budget96
dunk2k Sep 19, 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
224 changes: 222 additions & 2 deletions keyboards/donutcables/budget96/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
},
"processor": "atmega32a",
"bootloader": "bootloadhid",
"community_layouts": ["96_ansi", "96_iso"],
"layouts": {
"LAYOUT_all": {
"layout": [
Expand Down Expand Up @@ -156,6 +157,225 @@
]
},
"LAYOUT_96_ansi": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change should not have gone directly to master, as it changes the layout macro in a non backwards compatible way.

"layout": [
{"matrix": [5, 0], "x": 0, "y": 0},
{"matrix": [5, 2], "x": 1, "y": 0},
{"matrix": [5, 3], "x": 2, "y": 0},
{"matrix": [5, 4], "x": 3, "y": 0},
{"matrix": [5, 5], "x": 4, "y": 0},
{"matrix": [6, 0], "x": 5, "y": 0},
{"matrix": [6, 10], "x": 6, "y": 0},
{"matrix": [7, 10], "x": 7, "y": 0},
{"matrix": [7, 0], "x": 8, "y": 0},
{"matrix": [5, 11], "x": 9, "y": 0},
{"matrix": [5, 12], "x": 10, "y": 0},
{"matrix": [5, 13], "x": 11, "y": 0},
{"matrix": [5, 14], "x": 12, "y": 0},
{"matrix": [1, 13], "x": 13, "y": 0},
{"matrix": [2, 14], "x": 14, "y": 0},
{"matrix": [0, 13], "x": 15, "y": 0},
{"matrix": [7, 6], "x": 16, "y": 0},
{"matrix": [7, 8], "x": 17, "y": 0},
{"matrix": [7, 9], "x": 18, "y": 0},

{"matrix": [4, 0], "x": 0, "y": 1},
{"matrix": [4, 1], "x": 1, "y": 1},
{"matrix": [4, 2], "x": 2, "y": 1},
{"matrix": [4, 3], "x": 3, "y": 1},
{"matrix": [4, 4], "x": 4, "y": 1},
{"matrix": [4, 5], "x": 5, "y": 1},
{"matrix": [6, 1], "x": 6, "y": 1},
{"matrix": [6, 11], "x": 7, "y": 1},
{"matrix": [7, 11], "x": 8, "y": 1},
{"matrix": [7, 1], "x": 9, "y": 1},
{"matrix": [4, 10], "x": 10, "y": 1},
{"matrix": [4, 11], "x": 11, "y": 1},
{"matrix": [4, 12], "x": 12, "y": 1},
{"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
{"matrix": [4, 6], "x": 15, "y": 1},
{"matrix": [4, 7], "x": 16, "y": 1},
{"matrix": [4, 8], "x": 17, "y": 1},
{"matrix": [4, 9], "x": 18, "y": 1},

{"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
{"matrix": [3, 1], "x": 1.5, "y": 2},
{"matrix": [3, 2], "x": 2.5, "y": 2},
{"matrix": [3, 3], "x": 3.5, "y": 2},
{"matrix": [3, 4], "x": 4.5, "y": 2},
{"matrix": [3, 5], "x": 5.5, "y": 2},
{"matrix": [6, 2], "x": 6.5, "y": 2},
{"matrix": [6, 12], "x": 7.5, "y": 2},
{"matrix": [7, 12], "x": 8.5, "y": 2},
{"matrix": [7, 2], "x": 9.5, "y": 2},
{"matrix": [3, 10], "x": 10.5, "y": 2},
{"matrix": [3, 11], "x": 11.5, "y": 2},
{"matrix": [3, 12], "x": 12.5, "y": 2},
{"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [3, 6], "x": 15, "y": 2},
{"matrix": [3, 7], "x": 16, "y": 2},
{"matrix": [3, 8], "x": 17, "y": 2},
{"matrix": [3, 9], "x": 18, "y": 2, "h": 2},

{"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 3},
{"matrix": [2, 2], "x": 2.75, "y": 3},
{"matrix": [2, 3], "x": 3.75, "y": 3},
{"matrix": [2, 4], "x": 4.75, "y": 3},
{"matrix": [2, 5], "x": 5.75, "y": 3},
{"matrix": [6, 3], "x": 6.75, "y": 3},
{"matrix": [6, 13], "x": 7.75, "y": 3},
{"matrix": [7, 13], "x": 8.75, "y": 3},
{"matrix": [7, 3], "x": 9.75, "y": 3},
{"matrix": [2, 10], "x": 10.75, "y": 3},
{"matrix": [2, 11], "x": 11.75, "y": 3},
{"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [2, 6], "x": 15, "y": 3},
{"matrix": [2, 7], "x": 16, "y": 3},
{"matrix": [2, 8], "x": 17, "y": 3},

{"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
{"matrix": [1, 1], "x": 2.25, "y": 4},
{"matrix": [1, 2], "x": 3.25, "y": 4},
{"matrix": [1, 3], "x": 4.25, "y": 4},
{"matrix": [1, 4], "x": 5.25, "y": 4},
{"matrix": [1, 5], "x": 6.25, "y": 4},
{"matrix": [6, 4], "x": 7.25, "y": 4},
{"matrix": [6, 14], "x": 8.25, "y": 4},
{"matrix": [7, 14], "x": 9.25, "y": 4},
{"matrix": [7, 4], "x": 10.25, "y": 4},
{"matrix": [1, 10], "x": 11.25, "y": 4},
{"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
{"matrix": [6, 8], "x": 14, "y": 4},
{"matrix": [1, 6], "x": 15, "y": 4},
{"matrix": [1, 7], "x": 16, "y": 4},
{"matrix": [1, 8], "x": 17, "y": 4},
{"matrix": [1, 9], "x": 18, "y": 4, "h": 2},

{"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
{"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
{"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
{"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
{"matrix": [7, 5], "x": 10, "y": 5},
{"matrix": [0, 10], "x": 11, "y": 5},
{"matrix": [0, 11], "x": 12, "y": 5},
{"matrix": [6, 6], "x": 13, "y": 5},
{"matrix": [6, 7], "x": 14, "y": 5},
{"matrix": [6, 9], "x": 15, "y": 5},
{"matrix": [0, 6], "x": 16, "y": 5},
{"matrix": [0, 8], "x": 17, "y": 5}
]
},
"LAYOUT_96_iso": {
"layout": [
{"matrix": [5, 0], "x": 0, "y": 0},
{"matrix": [5, 2], "x": 1, "y": 0},
{"matrix": [5, 3], "x": 2, "y": 0},
{"matrix": [5, 4], "x": 3, "y": 0},
{"matrix": [5, 5], "x": 4, "y": 0},
{"matrix": [6, 0], "x": 5, "y": 0},
{"matrix": [6, 10], "x": 6, "y": 0},
{"matrix": [7, 10], "x": 7, "y": 0},
{"matrix": [7, 0], "x": 8, "y": 0},
{"matrix": [5, 11], "x": 9, "y": 0},
{"matrix": [5, 12], "x": 10, "y": 0},
{"matrix": [5, 13], "x": 11, "y": 0},
{"matrix": [5, 14], "x": 12, "y": 0},
{"matrix": [1, 13], "x": 13, "y": 0},
{"matrix": [2, 14], "x": 14, "y": 0},
{"matrix": [0, 13], "x": 15, "y": 0},
{"matrix": [7, 6], "x": 16, "y": 0},
{"matrix": [7, 8], "x": 17, "y": 0},
{"matrix": [7, 9], "x": 18, "y": 0},

{"matrix": [4, 0], "x": 0, "y": 1},
{"matrix": [4, 1], "x": 1, "y": 1},
{"matrix": [4, 2], "x": 2, "y": 1},
{"matrix": [4, 3], "x": 3, "y": 1},
{"matrix": [4, 4], "x": 4, "y": 1},
{"matrix": [4, 5], "x": 5, "y": 1},
{"matrix": [6, 1], "x": 6, "y": 1},
{"matrix": [6, 11], "x": 7, "y": 1},
{"matrix": [7, 11], "x": 8, "y": 1},
{"matrix": [7, 1], "x": 9, "y": 1},
{"matrix": [4, 10], "x": 10, "y": 1},
{"matrix": [4, 11], "x": 11, "y": 1},
{"matrix": [4, 12], "x": 12, "y": 1},
{"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
{"matrix": [4, 6], "x": 15, "y": 1},
{"matrix": [4, 7], "x": 16, "y": 1},
{"matrix": [4, 8], "x": 17, "y": 1},
{"matrix": [4, 9], "x": 18, "y": 1},

{"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
{"matrix": [3, 1], "x": 1.5, "y": 2},
{"matrix": [3, 2], "x": 2.5, "y": 2},
{"matrix": [3, 3], "x": 3.5, "y": 2},
{"matrix": [3, 4], "x": 4.5, "y": 2},
{"matrix": [3, 5], "x": 5.5, "y": 2},
{"matrix": [6, 2], "x": 6.5, "y": 2},
{"matrix": [6, 12], "x": 7.5, "y": 2},
{"matrix": [7, 12], "x": 8.5, "y": 2},
{"matrix": [7, 2], "x": 9.5, "y": 2},
{"matrix": [3, 10], "x": 10.5, "y": 2},
{"matrix": [3, 11], "x": 11.5, "y": 2},
{"matrix": [3, 12], "x": 12.5, "y": 2},
{"matrix": [3, 6], "x": 15, "y": 2},
{"matrix": [3, 7], "x": 16, "y": 2},
{"matrix": [3, 8], "x": 17, "y": 2},
{"matrix": [3, 9], "x": 18, "y": 2, "h": 2},

{"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 3},
{"matrix": [2, 2], "x": 2.75, "y": 3},
{"matrix": [2, 3], "x": 3.75, "y": 3},
{"matrix": [2, 4], "x": 4.75, "y": 3},
{"matrix": [2, 5], "x": 5.75, "y": 3},
{"matrix": [6, 3], "x": 6.75, "y": 3},
{"matrix": [6, 13], "x": 7.75, "y": 3},
{"matrix": [7, 13], "x": 8.75, "y": 3},
{"matrix": [7, 3], "x": 9.75, "y": 3},
{"matrix": [2, 10], "x": 10.75, "y": 3},
{"matrix": [2, 11], "x": 11.75, "y": 3},
{"matrix": [2, 12], "x": 12.75, "y": 3},
{"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
{"matrix": [2, 6], "x": 15, "y": 3},
{"matrix": [2, 7], "x": 16, "y": 3},
{"matrix": [2, 8], "x": 17, "y": 3},

{"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [0, 3], "x": 1.25, "y": 4},
{"matrix": [1, 1], "x": 2.25, "y": 4},
{"matrix": [1, 2], "x": 3.25, "y": 4},
{"matrix": [1, 3], "x": 4.25, "y": 4},
{"matrix": [1, 4], "x": 5.25, "y": 4},
{"matrix": [1, 5], "x": 6.25, "y": 4},
{"matrix": [6, 4], "x": 7.25, "y": 4},
{"matrix": [6, 14], "x": 8.25, "y": 4},
{"matrix": [7, 14], "x": 9.25, "y": 4},
{"matrix": [7, 4], "x": 10.25, "y": 4},
{"matrix": [1, 10], "x": 11.25, "y": 4},
{"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
{"matrix": [6, 8], "x": 14, "y": 4},
{"matrix": [1, 6], "x": 15, "y": 4},
{"matrix": [1, 7], "x": 16, "y": 4},
{"matrix": [1, 8], "x": 17, "y": 4},
{"matrix": [1, 9], "x": 18, "y": 4, "h": 2},

{"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
{"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
{"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
{"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
{"matrix": [7, 5], "x": 10, "y": 5},
{"matrix": [0, 10], "x": 11, "y": 5},
{"matrix": [0, 11], "x": 12, "y": 5},
{"matrix": [6, 6], "x": 13, "y": 5},
{"matrix": [6, 7], "x": 14, "y": 5},
{"matrix": [6, 9], "x": 15, "y": 5},
{"matrix": [0, 6], "x": 16, "y": 5},
{"matrix": [0, 8], "x": 17, "y": 5}
]
},
"LAYOUT_96_ansi_2_right_mod": {
"layout": [
{"matrix": [5, 0], "x": 0, "y": 0},
{"matrix": [5, 2], "x": 1, "y": 0},
Expand Down Expand Up @@ -249,6 +469,7 @@
{"matrix": [1, 6], "x": 15, "y": 4},
{"matrix": [1, 7], "x": 16, "y": 4},
{"matrix": [1, 8], "x": 17, "y": 4},
{"matrix": [1, 9], "x": 18, "y": 4, "h": 2},

{"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
{"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
Expand All @@ -260,8 +481,7 @@
{"matrix": [6, 7], "x": 14, "y": 5},
{"matrix": [6, 9], "x": 15, "y": 5},
{"matrix": [0, 6], "x": 16, "y": 5},
{"matrix": [0, 8], "x": 17, "y": 5},
{"matrix": [0, 9], "x": 18, "y": 4, "h": 2}
{"matrix": [0, 8], "x": 17, "y": 5}
]
}
}
Expand Down
24 changes: 8 additions & 16 deletions keyboards/donutcables/budget96/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,21 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_96_ansi(
[0] = LAYOUT_96_ansi_2_right_mod(
KC_ESC, 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_PSCR, KC_NUM, KC_INS, KC_HOME, KC_PGUP, KC_PSLS,
KC_GRV, 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_END, KC_PGDN, KC_PSLS, KC_PAST,
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_P7, KC_P8, KC_P9, KC_PMNS,
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, KC_P4, KC_P5, KC_P6, KC_PPLS,
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_P1, KC_P2, KC_P3,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_PDOT, KC_PENT),

[1] = LAYOUT_96_ansi(
QK_BOOT, EE_CLR, 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_TRNS,
BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_UP, BL_DOWN, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, 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, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),

[2] = LAYOUT_96_ansi(
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_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_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_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_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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[1] = LAYOUT_96_ansi_2_right_mod(
QK_BOOT, EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_UP, BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};


Expand Down
Loading
Loading