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

refactor(keyboard): quokka #22942

Merged
merged 2 commits into from
Jan 23, 2024
Merged

refactor(keyboard): quokka #22942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65bb33a
refactor: quokka
lesshonor Jan 21, 2024
efc07b8
feat: community layout support
lesshonor Jan 22, 2024
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
145 changes: 73 additions & 72 deletions keyboards/quokka/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,42 +23,42 @@
"center_point": [133, 54],
"driver": "ws2812",
"layout": [
{ "flags": 4, "matrix": [3, 4], "x": 122, "y": 85 },
{ "flags": 4, "matrix": [3, 3], "x": 102, "y": 85 },
{ "flags": 4, "matrix": [3, 2], "x": 81, "y": 85 },
{ "flags": 4, "matrix": [2, 4], "x": 102, "y": 64 },
{ "flags": 4, "matrix": [1, 4], "x": 102, "y": 43 },
{ "flags": 4, "matrix": [0, 4], "x": 102, "y": 21 },
{ "flags": 4, "matrix": [0, 3], "x": 81, "y": 21 },
{ "flags": 4, "matrix": [1, 3], "x": 81, "y": 43 },
{ "flags": 4, "matrix": [2, 3], "x": 81, "y": 64 },
{ "flags": 4, "matrix": [2, 2], "x": 61, "y": 64 },
{ "flags": 4, "matrix": [1, 2], "x": 61, "y": 43 },
{ "flags": 4, "matrix": [0, 2], "x": 61, "y": 21 },
{ "flags": 4, "matrix": [0, 1], "x": 41, "y": 21 },
{ "flags": 4, "matrix": [1, 1], "x": 41, "y": 43 },
{ "flags": 4, "matrix": [2, 1], "x": 41, "y": 64 },
{ "flags": 4, "matrix": [2, 0], "x": 20, "y": 64 },
{ "flags": 4, "matrix": [1, 0], "x": 20, "y": 43 },
{ "flags": 4, "matrix": [0, 0], "x": 20, "y": 21 },
{ "flags": 4, "matrix": [7, 0], "x": 143, "y": 85 },
{ "flags": 4, "matrix": [7, 1], "x": 163, "y": 85 },
{ "flags": 4, "matrix": [7, 2], "x": 183, "y": 85 },
{ "flags": 4, "matrix": [6, 0], "x": 163, "y": 64 },
{ "flags": 4, "matrix": [5, 0], "x": 163, "y": 43 },
{ "flags": 4, "matrix": [4, 0], "x": 163, "y": 21 },
{ "flags": 4, "matrix": [4, 1], "x": 183, "y": 21 },
{ "flags": 4, "matrix": [5, 1], "x": 183, "y": 43 },
{ "flags": 4, "matrix": [6, 1], "x": 183, "y": 64 },
{ "flags": 4, "matrix": [6, 2], "x": 204, "y": 64 },
{ "flags": 4, "matrix": [5, 2], "x": 204, "y": 43 },
{ "flags": 4, "matrix": [4, 2], "x": 204, "y": 21 },
{ "flags": 4, "matrix": [4, 3], "x": 224, "y": 21 },
{ "flags": 4, "matrix": [5, 3], "x": 224, "y": 43 },
{ "flags": 4, "matrix": [6, 3], "x": 224, "y": 64 },
{ "flags": 4, "matrix": [6, 4], "x": 244, "y": 64 },
{ "flags": 4, "matrix": [5, 4], "x": 244, "y": 43 },
{ "flags": 4, "matrix": [4, 4], "x": 244, "y": 21 }
{"matrix": [3, 4], "x": 122, "y": 85, "flags": 4},
{"matrix": [3, 3], "x": 102, "y": 85, "flags": 4},
{"matrix": [3, 2], "x": 81, "y": 85, "flags": 4},
{"matrix": [2, 4], "x": 102, "y": 64, "flags": 4},
{"matrix": [1, 4], "x": 102, "y": 43, "flags": 4},
{"matrix": [0, 4], "x": 102, "y": 21, "flags": 4},
{"matrix": [0, 3], "x": 81, "y": 21, "flags": 4},
{"matrix": [1, 3], "x": 81, "y": 43, "flags": 4},
{"matrix": [2, 3], "x": 81, "y": 64, "flags": 4},
{"matrix": [2, 2], "x": 61, "y": 64, "flags": 4},
{"matrix": [1, 2], "x": 61, "y": 43, "flags": 4},
{"matrix": [0, 2], "x": 61, "y": 21, "flags": 4},
{"matrix": [0, 1], "x": 41, "y": 21, "flags": 4},
{"matrix": [1, 1], "x": 41, "y": 43, "flags": 4},
{"matrix": [2, 1], "x": 41, "y": 64, "flags": 4},
{"matrix": [2, 0], "x": 20, "y": 64, "flags": 4},
{"matrix": [1, 0], "x": 20, "y": 43, "flags": 4},
{"matrix": [0, 0], "x": 20, "y": 21, "flags": 4},
{"matrix": [7, 0], "x": 143, "y": 85, "flags": 4},
{"matrix": [7, 1], "x": 163, "y": 85, "flags": 4},
{"matrix": [7, 2], "x": 183, "y": 85, "flags": 4},
{"matrix": [6, 0], "x": 163, "y": 64, "flags": 4},
{"matrix": [5, 0], "x": 163, "y": 43, "flags": 4},
{"matrix": [4, 0], "x": 163, "y": 21, "flags": 4},
{"matrix": [4, 1], "x": 183, "y": 21, "flags": 4},
{"matrix": [5, 1], "x": 183, "y": 43, "flags": 4},
{"matrix": [6, 1], "x": 183, "y": 64, "flags": 4},
{"matrix": [6, 2], "x": 204, "y": 64, "flags": 4},
{"matrix": [5, 2], "x": 204, "y": 43, "flags": 4},
{"matrix": [4, 2], "x": 204, "y": 21, "flags": 4},
{"matrix": [4, 3], "x": 224, "y": 21, "flags": 4},
{"matrix": [5, 3], "x": 224, "y": 43, "flags": 4},
{"matrix": [6, 3], "x": 224, "y": 64, "flags": 4},
{"matrix": [6, 4], "x": 244, "y": 64, "flags": 4},
{"matrix": [5, 4], "x": 244, "y": 43, "flags": 4},
{"matrix": [4, 4], "x": 244, "y": 21, "flags": 4}
],
"split_count": [18, 18]
},
Expand All @@ -76,45 +76,46 @@
"driver": "vendor",
"pin": "GP29"
},
"community_layouts": ["split_3x5_3"],
"layouts": {
lesshonor marked this conversation as resolved.
Show resolved Hide resolved
"LAYOUT_split_3x5_3": {
"layout": [
{ "label": "L00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
{ "label": "L01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
{ "label": "L02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
{ "label": "L03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
{ "label": "L04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
{ "label": "R00", "matrix": [4, 4], "w": 1, "x": 5, "y": 0 },
{ "label": "R01", "matrix": [4, 3], "w": 1, "x": 6, "y": 0 },
{ "label": "R02", "matrix": [4, 2], "w": 1, "x": 7, "y": 0 },
{ "label": "R03", "matrix": [4, 1], "w": 1, "x": 8, "y": 0 },
{ "label": "R04", "matrix": [4, 0], "w": 1, "x": 9, "y": 0 },
{ "label": "L10", "matrix": [1, 0], "w": 1, "x": 10, "y": 0 },
{ "label": "L11", "matrix": [1, 1], "w": 1, "x": 11, "y": 0 },
{ "label": "L12", "matrix": [1, 2], "w": 1, "x": 12, "y": 0 },
{ "label": "L13", "matrix": [1, 3], "w": 1, "x": 13, "y": 0 },
{ "label": "L14", "matrix": [1, 4], "w": 1, "x": 14, "y": 0 },
{ "label": "R10", "matrix": [5, 4], "w": 1, "x": 15, "y": 0 },
{ "label": "R11", "matrix": [5, 3], "w": 1, "x": 16, "y": 0 },
{ "label": "R12", "matrix": [5, 2], "w": 1, "x": 17, "y": 0 },
{ "label": "R13", "matrix": [5, 1], "w": 1, "x": 18, "y": 0 },
{ "label": "R14", "matrix": [5, 0], "w": 1, "x": 19, "y": 0 },
{ "label": "L20", "matrix": [2, 0], "w": 1, "x": 20, "y": 0 },
{ "label": "L21", "matrix": [2, 1], "w": 1, "x": 21, "y": 0 },
{ "label": "L22", "matrix": [2, 2], "w": 1, "x": 22, "y": 0 },
{ "label": "L23", "matrix": [2, 3], "w": 1, "x": 23, "y": 0 },
{ "label": "L24", "matrix": [2, 4], "w": 1, "x": 24, "y": 0 },
{ "label": "R20", "matrix": [6, 4], "w": 1, "x": 25, "y": 0 },
{ "label": "R21", "matrix": [6, 3], "w": 1, "x": 26, "y": 0 },
{ "label": "R22", "matrix": [6, 2], "w": 1, "x": 27, "y": 0 },
{ "label": "R23", "matrix": [6, 1], "w": 1, "x": 28, "y": 0 },
{ "label": "R24", "matrix": [6, 0], "w": 1, "x": 29, "y": 0 },
{ "label": "L32", "matrix": [3, 2], "w": 1, "x": 30, "y": 0 },
{ "label": "L33", "matrix": [3, 3], "w": 1, "x": 31, "y": 0 },
{ "label": "L34", "matrix": [3, 4], "w": 1, "x": 32, "y": 0 },
{ "label": "R30", "matrix": [7, 4], "w": 1, "x": 33, "y": 0 },
{ "label": "R31", "matrix": [7, 3], "w": 1, "x": 34, "y": 0 },
{ "label": "R32", "matrix": [7, 2], "w": 1, "x": 35, "y": 0 }
{"label": "L00", "matrix": [0, 0], "x": 0, "y": 1.25},
{"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.25},
{"label": "L02", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0.5},
{"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.65},
{"label": "R00", "matrix": [4, 4], "x": 7, "y": 0.65},
{"label": "R01", "matrix": [4, 3], "x": 8, "y": 0.5},
{"label": "R02", "matrix": [4, 2], "x": 9, "y": 0},
{"label": "R03", "matrix": [4, 1], "x": 10, "y": 0.25},
{"label": "R04", "matrix": [4, 0], "x": 11, "y": 1.25},
{"label": "L10", "matrix": [1, 0], "x": 0, "y": 2.25},
{"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.25},
{"label": "L12", "matrix": [1, 2], "x": 2, "y": 1},
{"label": "L13", "matrix": [1, 3], "x": 3, "y": 1.5},
{"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.65},
{"label": "R10", "matrix": [5, 4], "x": 7, "y": 1.65},
{"label": "R11", "matrix": [5, 3], "x": 8, "y": 1.5},
{"label": "R12", "matrix": [5, 2], "x": 9, "y": 1},
{"label": "R13", "matrix": [5, 1], "x": 10, "y": 1.25},
{"label": "R14", "matrix": [5, 0], "x": 11, "y": 2.25},
{"label": "L20", "matrix": [2, 0], "x": 0, "y": 3.25},
{"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.25},
{"label": "L22", "matrix": [2, 2], "x": 2, "y": 2},
{"label": "L23", "matrix": [2, 3], "x": 3, "y": 2.5},
{"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.65},
{"label": "R20", "matrix": [6, 4], "x": 7, "y": 2.65},
{"label": "R21", "matrix": [6, 3], "x": 8, "y": 2.5},
{"label": "R22", "matrix": [6, 2], "x": 9, "y": 2},
{"label": "R23", "matrix": [6, 1], "x": 10, "y": 2.25},
{"label": "R24", "matrix": [6, 0], "x": 11, "y": 3.25},
{"label": "L32", "matrix": [3, 2], "x": 2.5, "y": 3.65},
{"label": "L33", "matrix": [3, 3], "x": 3.5, "y": 3.75},
{"label": "L34", "matrix": [3, 4], "x": 4.5, "y": 4.15},
{"label": "R30", "matrix": [7, 4], "x": 6.5, "y": 4.15},
{"label": "R31", "matrix": [7, 3], "x": 7.5, "y": 3.75},
{"label": "R32", "matrix": [7, 2], "x": 8.5, "y": 3.65}
]
}
}
Expand Down
1 change: 0 additions & 1 deletion keyboards/quokka/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#include QMK_KEYBOARD_H


// clang-format off

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