summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-01-31 11:16:45 +0000
committerQMK Bot <hello@qmk.fm>2022-01-31 11:16:45 +0000
commit8116b2a15ca766d735a3f936e8af78d64bc8b28a (patch)
treed98ccf74bcea6dad39fe79c7a263f16dbb89158d
parent14c1bd3b937d221d5fdd2a4c2073f290f2c5c14c (diff)
parent7512e58cfee443da78ee3a0fa4c333080ef1a6f9 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/kapcave/arya/arya.h5
-rw-r--r--keyboards/kapcave/arya/info.json140
-rw-r--r--keyboards/kapcave/arya/rules.mk2
3 files changed, 74 insertions, 73 deletions
diff --git a/keyboards/kapcave/arya/arya.h b/keyboards/kapcave/arya/arya.h
index ea1d1916c3..38e4afaf05 100644
--- a/keyboards/kapcave/arya/arya.h
+++ b/keyboards/kapcave/arya/arya.h
@@ -36,8 +36,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ KC_NO , K71 , K72 , K73 , K74 , K75 , K76 , K77 }, \
{ K80 , K81 , K82 , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
}
-
-
-
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json
index fb220aa070..72ee2e1d74 100644
--- a/keyboards/kapcave/arya/info.json
+++ b/keyboards/kapcave/arya/info.json
@@ -3,75 +3,79 @@
"url": "https://kapcave.com/products/arya",
"maintainer": "nachie",
"layouts": {
- "LAYOUT": {
+ "LAYOUT_alice_split_bs": {
"layout": [
- {"label":"Esc", "x":2.75, "y":5.9},
- {"label":"\u00ac", "x":4, "y":6.0},
- {"label":"!", "x":5, "y":6.0},
- {"label":"\"", "x":6, "y":6.0},
- {"label":"_", "x":15.25, "y":6.0},
- {"label":"+", "x":16.25, "y":6.0},
- {"label":"", "x":17.25, "y":6.0},
- {"label":"", "x":18.25, "y":6.0},
- {"label":"Pg Up", "x":2.5, "y":6.9},
- {"label":"Tab", "x":3.75, "y":7.0, "w":1.5},
- {"label":"Q", "x":5.25, "y":7.0},
- {"label":"P", "x":15, "y":7.0},
- {"label":"{", "x":16, "y":7.0},
- {"label":"}", "x":17, "y":7.0},
- {"label":"|", "x":18, "y":7.0, "w":1.5},
- {"label":"Pg Dn", "x":2.25, "y":7.9},
- {"label":"Caps Lock", "x":3.5, "y":8.0, "w":1.75},
- {"label":"A", "x":5.25, "y":8.0},
- {"label":":", "x":15.5, "y":8.0},
- {"label":"\"", "x":16.5, "y":8.0},
- {"label":"Enter", "x":17.5, "y":8.0, "w":2.25},
- {"label":"Shift", "x":3.25, "y":9.0, "w":2.25},
- {"label":"Z", "x":5.5, "y":9.0},
- {"label":">", "x":15.25, "y":9.0},
- {"label":"?", "x":16.25, "y":9.0},
- {"label":"Shift", "x":17.25, "y":9.0, "w":1.75},
- {"label":"Fn", "x":19, "y":9.0},
- {"label":"Ctrl", "x":3.25, "y":10.0, "w":1.5},
- {"label":"Ctrl", "x":18.25, "y":10.0, "w":1.5},
- {"label":"\u00a3", "x":8.25, "y":4.5},
- {"label":"$", "x":9.25, "y":4.5},
- {"label":"%", "x":10.25, "y":4.5},
- {"label":"^", "x":11.25, "y":4.5},
- {"label":"W", "x":7.75, "y":5.5},
- {"label":"E", "x":8.75, "y":5.5},
- {"label":"R", "x":9.75, "y":5.5},
- {"label":"T", "x":10.75, "y":5.5},
- {"label":"S", "x":8, "y":6.5},
- {"label":"D", "x":9, "y":6.5},
- {"label":"F", "x":10, "y":6.5},
- {"label":"G", "x":11, "y":6.5},
- {"label":"X", "x":8.5, "y":7.5},
- {"label":"C", "x":9.5, "y":7.5},
- {"label":"V", "x":10.5, "y":7.5},
- {"label":"B", "x":11.5, "y":7.5},
- {"label":"Alt", "x":8.25, "y":8.5, "w":1.5},
- {"label":"", "x":9.75, "y":8.5, "w":2},
- {"label":"Fn", "x":11.75, "y":8.5, "w":1.25},
- {"label":"&", "x":9.5, "y":9.0},
- {"label":"*", "x":10.5, "y":9.0},
- {"label":"(", "x":11.5, "y":9.0},
- {"label":")", "x":12.5, "y":9.0},
- {"label":"Y", "x":9, "y":10.0},
- {"label":"U", "x":10, "y":10.0},
- {"label":"I", "x":11, "y":10.0},
- {"label":"O", "x":12, "y":10.0},
- {"label":"H", "x":9.25, "y":11.0},
- {"label":"J", "x":10.25, "y":11.0},
- {"label":"K", "x":11.25, "y":11.0},
- {"label":"L", "x":12.25, "y":11.0},
- {"label":"Fn", "x":8.75, "y":12.0},
- {"label":"N", "x":9.75, "y":12.0},
- {"label":"M", "x":10.75, "y":12.0},
- {"label":"<", "x":11.75, "y":12.0},
- {"label":"Shift", "x":8.75, "y":13.0, "w":2.75},
- {"label":"Alt", "x":11.5, "y":13.0, "w":1.5}
+ {"x":0.4, "y":0},
+ {"x":1.55, "y":0.1},
+ {"x":2.55, "y":0.1},
+ {"x":3.55, "y":0},
+ {"x":4.55, "y":0.1},
+ {"x":5.55, "y":0.1},
+ {"x":6.55, "y":0.1},
+ {"x":7.55, "y":0.1},
+ {"x":9.75, "y":0.1},
+ {"x":10.75, "y":0.1},
+ {"x":11.75, "y":0.1},
+ {"x":12.75, "y":0.1},
+ {"x":13.75, "y":0},
+ {"x":14.75, "y":0.1},
+ {"x":15.75, "y":0.1},
+ {"x":16.75, "y":0.1},
+
+ {"x":0.2, "y":1.0},
+ {"x":1.35, "y":1.1, "w":1.5},
+ {"x":2.85, "y":1.1},
+ {"x":3.85, "y":1.1},
+ {"x":4.85, "y":1.1},
+ {"x":5.85, "y":1.1},
+ {"x":6.85, "y":1.1},
+ {"x":9.45, "y":1.1},
+ {"x":10.45, "y":1.1},
+ {"x":11.45, "y":1.1},
+ {"x":12.45, "y":1.1},
+ {"x":13.45, "y":1.1},
+ {"x":14.45, "y":1.1},
+ {"x":15.45, "y":1.1},
+ {"x":16.45, "y":1.1, "w":1.5},
+
+ {"x":0, "y":2.0},
+ {"x":1.15, "y":2.1, "w":1.75},
+ {"x":2.9, "y":2.1},
+ {"x":3.9, "y":2.1},
+ {"x":4.9, "y":2.1},
+ {"x":5.9, "y":2.1},
+ {"x":6.9, "y":2.1},
+ {"x":9.9, "y":2.1},
+ {"x":10.9, "y":2.1},
+ {"x":11.9, "y":2.1},
+ {"x":12.9, "y":2.1},
+ {"x":13.9, "y":2.1},
+ {"x":14.9, "y":2.1},
+ {"x":15.9, "y":2.1, "w":2.25},
+
+ {"x":0.95, "y":3.1, "w":2.25},
+ {"x":3.2, "y":3.1},
+ {"x":4.2, "y":3.1},
+ {"x":5.2, "y":3.1},
+ {"x":6.2, "y":3.1},
+ {"x":7.2, "y":3.1},
+ {"x":9.6, "y":3.1},
+ {"x":10.6, "y":3.1},
+ {"x":11.6, "y":3.1},
+ {"x":12.6, "y":3.1},
+ {"x":13.6, "y":3.1},
+ {"x":14.6, "y":3.1},
+ {"x":15.6, "y":3.1, "w":1.75},
+ {"x":17.35, "y":3.1},
+
+ {"x":0.95, "y":4.1, "w":1.5},
+ {"x":3.85, "y":4.1, "w":1.5},
+ {"x":5.35, "y":4.1, "w":2},
+ {"x":7.35, "y":4.1, "w":1.25},
+ {"x":9.6, "y":4.1, "w":2.75},
+ {"x":12.35, "y":4.1, "w":1.5},
+ {"x":16.65, "y":4.1, "w":1.5}
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/kapcave/arya/rules.mk b/keyboards/kapcave/arya/rules.mk
index 09800a48f2..5ceb651b1c 100644
--- a/keyboards/kapcave/arya/rules.mk
+++ b/keyboards/kapcave/arya/rules.mk
@@ -20,3 +20,5 @@ ENCODER_ENABLE = yes
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+LAYOUTS = alice_split_bs