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

Mechlovin Adelais: add support for full-length Right Shift #14622

Merged
merged 5 commits into from
Sep 28, 2021
Merged

Mechlovin Adelais: add support for full-length Right Shift #14622

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
7533c92
add layout variants with 2.75u Right Shift
noroadsleft Sep 27, 2021
c403bd0
move layout alias to info.json
noroadsleft Sep 27, 2021
2e62a61
match info.json labels to matrix positions
noroadsleft Sep 27, 2021
74479ba
info.json: add line breaks between keyboard rows
noroadsleft Sep 27, 2021
05a0a4c
info.json: use GitHub username in maintainer field
noroadsleft Sep 27, 2021
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
28 changes: 27 additions & 1 deletion keyboards/mechlovin/adelais/adelais.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,30 @@
{ K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
}

#define LAYOUT_all LAYOUT_alice_split_bs
#define LAYOUT_alice_split_bs_full_rshift( \
K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, \
K40, K42, K44, K46, K48, K4A, K4E \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
{ K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
{ K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
}

#define LAYOUT_alice_full_rshift( \
K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, \
K40, K42, K44, K46, K48, K4A, K4E \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
{ K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
{ K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, KC_NO, K4E }, \
}
167 changes: 161 additions & 6 deletions keyboards/mechlovin/adelais/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"keyboard_name": "Adelais",
"url": "",
"maintainer": "Team Mechlovin'",
"maintainer": "mechlovin",
"layout_aliases": {
"LAYOUT_all": "LAYOUT_alice_split_bs"
},
"layouts": {
"LAYOUT_alice_split_bs": {
"layout": [
Expand All @@ -21,6 +24,7 @@
{"label":"K0C", "x":15.5, "y":0},
{"label":"K0D", "x":16.5, "y":0},
{"label":"K0E", "x":17.5, "y":0},

{"label":"K2E", "x":0, "y":1},
{"label":"K10", "x":1.5, "y":1, "w":1.5},
{"label":"K11", "x":3, "y":1},
Expand All @@ -36,6 +40,7 @@
{"label":"K1B", "x":15, "y":1},
{"label":"K1C", "x":16, "y":1},
{"label":"K1D", "x":17, "y":1, "w":1.5},

{"label":"K3E", "x":0, "y":2},
{"label":"K20", "x":1.5, "y":2, "w":1.75},
{"label":"K21", "x":3.25, "y":2},
Expand All @@ -50,6 +55,7 @@
{"label":"K2A", "x":14.25, "y":2},
{"label":"K2B", "x":15.25, "y":2},
{"label":"K2D", "x":16.25, "y":2, "w":2.25},

{"label":"K30", "x":1.5, "y":3, "w":2.25},
{"label":"K32", "x":3.75, "y":3},
{"label":"K33", "x":4.75, "y":3},
Expand All @@ -61,9 +67,10 @@
{"label":"K39", "x":11.75, "y":3},
{"label":"K3A", "x":12.75, "y":3},
{"label":"K3B", "x":13.75, "y":3},
{"label":"K4D", "x":14.75, "y":3},
{"label":"K3D", "x":14.75, "y":3},
{"label":"K3C", "x":15.75, "y":3, "w":1.75},
{"label":"K3D", "x":17.5, "y":3},
{"label":"K4D", "x":17.5, "y":3},

{"label":"K40", "x":1.5, "y":4, "w":1.5},
{"label":"K42", "x":4.5, "y":4, "w":1.25},
{"label":"K44", "x":5.75, "y":4, "w":2.25},
Expand All @@ -90,6 +97,7 @@
{"label":"K0B", "x":14.5, "y":0},
{"label":"K0C", "x":15.5, "y":0},
{"label":"K0D", "x":16.5, "y":0, "w":2},

{"label":"K2E", "x":0, "y":1},
{"label":"K10", "x":1.5, "y":1, "w":1.5},
{"label":"K11", "x":3, "y":1},
Expand All @@ -105,6 +113,7 @@
{"label":"K1B", "x":15, "y":1},
{"label":"K1C", "x":16, "y":1},
{"label":"K1D", "x":17, "y":1, "w":1.5},

{"label":"K3E", "x":0, "y":2},
{"label":"K20", "x":1.5, "y":2, "w":1.75},
{"label":"K21", "x":3.25, "y":2},
Expand All @@ -119,6 +128,7 @@
{"label":"K2A", "x":14.25, "y":2},
{"label":"K2B", "x":15.25, "y":2},
{"label":"K2D", "x":16.25, "y":2, "w":2.25},

{"label":"K30", "x":1.5, "y":3, "w":2.25},
{"label":"K32", "x":3.75, "y":3},
{"label":"K33", "x":4.75, "y":3},
Expand All @@ -130,9 +140,155 @@
{"label":"K39", "x":11.75, "y":3},
{"label":"K3A", "x":12.75, "y":3},
{"label":"K3B", "x":13.75, "y":3},
{"label":"K4D", "x":14.75, "y":3},
{"label":"K3D", "x":14.75, "y":3},
{"label":"K3C", "x":15.75, "y":3, "w":1.75},
{"label":"K3D", "x":17.5, "y":3},
{"label":"K4D", "x":17.5, "y":3},

{"label":"K40", "x":1.5, "y":4, "w":1.5},
{"label":"K42", "x":4.5, "y":4, "w":1.25},
{"label":"K44", "x":5.75, "y":4, "w":2.25},
{"label":"K46", "x":8, "y":4, "w":1.25},
{"label":"K48", "x":9.75, "y":4, "w":2.75},
{"label":"K4A", "x":12.5, "y":4, "w":1.25},
{"label":"K4E", "x":17, "y":4, "w":1.5}
]
},
"LAYOUT_alice_split_bs_full_rshift": {
"layout": [
{"label":"K1E", "x":0, "y":0},
{"label":"K00", "x":1.5, "y":0},
{"label":"K01", "x":2.5, "y":0},
{"label":"K02", "x":3.5, "y":0},
{"label":"K03", "x":4.5, "y":0},
{"label":"K04", "x":5.5, "y":0},
{"label":"K05", "x":6.5, "y":0},
{"label":"K06", "x":7.5, "y":0},
{"label":"K07", "x":10.5, "y":0},
{"label":"K08", "x":11.5, "y":0},
{"label":"K09", "x":12.5, "y":0},
{"label":"K0A", "x":13.5, "y":0},
{"label":"K0B", "x":14.5, "y":0},
{"label":"K0C", "x":15.5, "y":0},
{"label":"K0D", "x":16.5, "y":0},
{"label":"K0E", "x":17.5, "y":0},

{"label":"K2E", "x":0, "y":1},
{"label":"K10", "x":1.5, "y":1, "w":1.5},
{"label":"K11", "x":3, "y":1},
{"label":"K12", "x":4, "y":1},
{"label":"K13", "x":5, "y":1},
{"label":"K14", "x":6, "y":1},
{"label":"K15", "x":7, "y":1},
{"label":"K16", "x":10, "y":1},
{"label":"K17", "x":11, "y":1},
{"label":"K18", "x":12, "y":1},
{"label":"K19", "x":13, "y":1},
{"label":"K1A", "x":14, "y":1},
{"label":"K1B", "x":15, "y":1},
{"label":"K1C", "x":16, "y":1},
{"label":"K1D", "x":17, "y":1, "w":1.5},

{"label":"K3E", "x":0, "y":2},
{"label":"K20", "x":1.5, "y":2, "w":1.75},
{"label":"K21", "x":3.25, "y":2},
{"label":"K22", "x":4.25, "y":2},
{"label":"K23", "x":5.25, "y":2},
{"label":"K24", "x":6.25, "y":2},
{"label":"K25", "x":7.25, "y":2},
{"label":"K26", "x":10.25, "y":2},
{"label":"K27", "x":11.25, "y":2},
{"label":"K28", "x":12.25, "y":2},
{"label":"K29", "x":13.25, "y":2},
{"label":"K2A", "x":14.25, "y":2},
{"label":"K2B", "x":15.25, "y":2},
{"label":"K2D", "x":16.25, "y":2, "w":2.25},

{"label":"K30", "x":1.5, "y":3, "w":2.25},
{"label":"K32", "x":3.75, "y":3},
{"label":"K33", "x":4.75, "y":3},
{"label":"K34", "x":5.75, "y":3},
{"label":"K35", "x":6.75, "y":3},
{"label":"K36", "x":7.75, "y":3},
{"label":"K37", "x":9.75, "y":3},
{"label":"K38", "x":10.75, "y":3},
{"label":"K39", "x":11.75, "y":3},
{"label":"K3A", "x":12.75, "y":3},
{"label":"K3B", "x":13.75, "y":3},
{"label":"K3D", "x":14.75, "y":3},
{"label":"K3C", "x":15.75, "y":3, "w":2.75},

{"label":"K40", "x":1.5, "y":4, "w":1.5},
{"label":"K42", "x":4.5, "y":4, "w":1.25},
{"label":"K44", "x":5.75, "y":4, "w":2.25},
{"label":"K46", "x":8, "y":4, "w":1.25},
{"label":"K48", "x":9.75, "y":4, "w":2.75},
{"label":"K4A", "x":12.5, "y":4, "w":1.25},
{"label":"K4E", "x":17, "y":4, "w":1.5}
]
},
"LAYOUT_alice_full_rshift": {
"layout": [
{"label":"K1E", "x":0, "y":0},
{"label":"K00", "x":1.5, "y":0},
{"label":"K01", "x":2.5, "y":0},
{"label":"K02", "x":3.5, "y":0},
{"label":"K03", "x":4.5, "y":0},
{"label":"K04", "x":5.5, "y":0},
{"label":"K05", "x":6.5, "y":0},
{"label":"K06", "x":7.5, "y":0},
{"label":"K07", "x":10.5, "y":0},
{"label":"K08", "x":11.5, "y":0},
{"label":"K09", "x":12.5, "y":0},
{"label":"K0A", "x":13.5, "y":0},
{"label":"K0B", "x":14.5, "y":0},
{"label":"K0C", "x":15.5, "y":0},
{"label":"K0D", "x":16.5, "y":0, "w":2},

{"label":"K2E", "x":0, "y":1},
{"label":"K10", "x":1.5, "y":1, "w":1.5},
{"label":"K11", "x":3, "y":1},
{"label":"K12", "x":4, "y":1},
{"label":"K13", "x":5, "y":1},
{"label":"K14", "x":6, "y":1},
{"label":"K15", "x":7, "y":1},
{"label":"K16", "x":10, "y":1},
{"label":"K17", "x":11, "y":1},
{"label":"K18", "x":12, "y":1},
{"label":"K19", "x":13, "y":1},
{"label":"K1A", "x":14, "y":1},
{"label":"K1B", "x":15, "y":1},
{"label":"K1C", "x":16, "y":1},
{"label":"K1D", "x":17, "y":1, "w":1.5},

{"label":"K3E", "x":0, "y":2},
{"label":"K20", "x":1.5, "y":2, "w":1.75},
{"label":"K21", "x":3.25, "y":2},
{"label":"K22", "x":4.25, "y":2},
{"label":"K23", "x":5.25, "y":2},
{"label":"K24", "x":6.25, "y":2},
{"label":"K25", "x":7.25, "y":2},
{"label":"K26", "x":10.25, "y":2},
{"label":"K27", "x":11.25, "y":2},
{"label":"K28", "x":12.25, "y":2},
{"label":"K29", "x":13.25, "y":2},
{"label":"K2A", "x":14.25, "y":2},
{"label":"K2B", "x":15.25, "y":2},
{"label":"K2D", "x":16.25, "y":2, "w":2.25},

{"label":"K30", "x":1.5, "y":3, "w":2.25},
{"label":"K32", "x":3.75, "y":3},
{"label":"K33", "x":4.75, "y":3},
{"label":"K34", "x":5.75, "y":3},
{"label":"K35", "x":6.75, "y":3},
{"label":"K36", "x":7.75, "y":3},
{"label":"K37", "x":9.75, "y":3},
{"label":"K38", "x":10.75, "y":3},
{"label":"K39", "x":11.75, "y":3},
{"label":"K3A", "x":12.75, "y":3},
{"label":"K3B", "x":13.75, "y":3},
{"label":"K3D", "x":14.75, "y":3},
{"label":"K3C", "x":15.75, "y":3, "w":2.75},

{"label":"K40", "x":1.5, "y":4, "w":1.5},
{"label":"K42", "x":4.5, "y":4, "w":1.25},
{"label":"K44", "x":5.75, "y":4, "w":2.25},
Expand All @@ -143,5 +299,4 @@
]
}
}
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}