summaryrefslogtreecommitdiff
path: root/keyboards/jacky_studio/bear_65
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-25 02:38:35 +1000
committerGitHub <noreply@github.com>2023-04-25 02:38:35 +1000
commitf111bea3cda240b7c54bff2e12b5043b7b0797f7 (patch)
tree9fa3b3356f50e0b989231bf69da4ce00c18e85e0 /keyboards/jacky_studio/bear_65
parent72d2be24f9bb1ab40a7a64447f2625c31b22a201 (diff)
Move miscellaneous layouts to data driven (#20516)
Diffstat (limited to 'keyboards/jacky_studio/bear_65')
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/info.json631
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/rev2.h76
2 files changed, 338 insertions, 369 deletions
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index c6565255ed..6ee4f53c22 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -35,308 +35,353 @@
"layouts": {
"LAYOUT_wk_full": {
"layout": [
- {"label":"Esc", "x":0.5, "y":0},
- {"label":"~", "x":1.75, "y":0},
- {"label":"!", "x":2.75, "y":0},
- {"label":"@", "x":3.75, "y":0},
- {"label":"#", "x":4.75, "y":0},
- {"label":"$", "x":5.75, "y":0},
- {"label":"%", "x":6.75, "y":0},
- {"label":"^", "x":7.75, "y":0},
- {"label":"&", "x":11.25, "y":0},
- {"label":"*", "x":12.25, "y":0},
- {"label":"(", "x":13.25, "y":0},
- {"label":")", "x":14.25, "y":0},
- {"label":"_", "x":15.25, "y":0},
- {"label":"+", "x":16.25, "y":0},
- {"label":"|", "x":17.25, "y":0},
- {"label":"~", "x":18.25, "y":0},
- {"label":"Del", "x":19.75, "y":0},
-
- {"label":"PgUp", "x":0.25, "y":1},
- {"label":"Tab", "x":1.75, "y":1, "w":1.5},
- {"label":"Q", "x":3.25, "y":1},
- {"label":"W", "x":4.25, "y":1},
- {"label":"E", "x":5.25, "y":1},
- {"label":"R", "x":6.25, "y":1},
- {"label":"T", "x":7.25, "y":1},
- {"label":"Y", "x":10.75, "y":1},
- {"label":"U", "x":11.75, "y":1},
- {"label":"I", "x":12.75, "y":1},
- {"label":"O", "x":13.75, "y":1},
- {"label":"P", "x":14.75, "y":1},
- {"label":"{", "x":15.75, "y":1},
- {"label":"}", "x":16.75, "y":1},
- {"label":"Backspace", "x":17.75, "y":1, "w":1.5},
-
- {"label":"PgDn", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
- {"label":"A", "x":3.5, "y":2},
- {"label":"S", "x":4.5, "y":2},
- {"label":"D", "x":5.5, "y":2},
- {"label":"F", "x":6.5, "y":2},
- {"label":"G", "x":7.5, "y":2},
- {"label":"H", "x":11, "y":2},
- {"label":"J", "x":12, "y":2},
- {"label":"K", "x":13, "y":2},
- {"label":"L", "x":14, "y":2},
- {"label":":", "x":15, "y":2},
- {"label":"\"", "x":16, "y":2},
- {"label":"Enter", "x":17, "y":2, "w":2.25},
-
- {"label":"Shift", "x":1.75, "y":3, "w":2.25},
- {"label":"Z", "x":4, "y":3},
- {"label":"X", "x":5, "y":3},
- {"label":"C", "x":6, "y":3},
- {"label":"V", "x":7, "y":3},
- {"label":"B", "x":8, "y":3},
- {"label":"B", "x":10.5, "y":3},
- {"label":"N", "x":11.5, "y":3},
- {"label":"M", "x":12.5, "y":3},
- {"label":"<", "x":13.5, "y":3},
- {"label":">", "x":14.5, "y":3},
- {"label":"?", "x":15.5, "y":3},
- {"label":"Shift", "x":16.5, "y":3, "w":1.75},
- {"label":"Up", "x":18.25, "y":3},
-
- {"label":"Ctrl", "x":1.75, "y":4, "w":1.25},
- {"label":"Super", "x":3, "y":4},
- {"label":"Alt", "x":4, "y":4, "w":1.25},
- {"x":5.25, "y":4, "w":2.25},
- {"label":"Fn", "x":8.25, "y":4},
- {"x":11, "y":4, "w":2.75},
- {"label":"Alt", "x":13.75, "y":4, "w":1.25},
- {"label":"Ctrl", "x":15, "y":4},
- {"label":"Left", "x":17.25, "y":4},
- {"label":"Down", "x":18.25, "y":4},
- {"label":"Right", "x":19.25, "y":4}]
+ {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.75, "y": 0},
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+ {"matrix": [0, 5], "x": 6.75, "y": 0},
+ {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 11.25, "y": 0},
+ {"matrix": [0, 8], "x": 12.25, "y": 0},
+ {"matrix": [0, 9], "x": 13.25, "y": 0},
+ {"matrix": [0, 10], "x": 14.25, "y": 0},
+ {"matrix": [0, 11], "x": 15.25, "y": 0},
+ {"matrix": [0, 12], "x": 16.25, "y": 0},
+ {"matrix": [0, 13], "x": 17.25, "y": 0},
+ {"matrix": [0, 14], "x": 18.25, "y": 0},
+
+ {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+ {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3.25, "y": 1},
+ {"matrix": [1, 2], "x": 4.25, "y": 1},
+ {"matrix": [1, 3], "x": 5.25, "y": 1},
+ {"matrix": [1, 4], "x": 6.25, "y": 1},
+ {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+ {"matrix": [1, 6], "x": 10.75, "y": 1},
+ {"matrix": [1, 7], "x": 11.75, "y": 1},
+ {"matrix": [1, 8], "x": 12.75, "y": 1},
+ {"matrix": [1, 9], "x": 13.75, "y": 1},
+ {"matrix": [1, 10], "x": 14.75, "y": 1},
+ {"matrix": [1, 11], "x": 15.75, "y": 1},
+ {"matrix": [1, 12], "x": 16.75, "y": 1},
+ {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.5, "y": 2},
+ {"matrix": [2, 2], "x": 4.5, "y": 2},
+ {"matrix": [2, 3], "x": 5.5, "y": 2},
+ {"matrix": [2, 4], "x": 6.5, "y": 2},
+ {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2},
+ {"matrix": [2, 10], "x": 15, "y": 2},
+ {"matrix": [2, 11], "x": 16, "y": 2},
+ {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+ {"matrix": [3, 5], "x": 7, "y": 3},
+ {"matrix": [3, 6], "x": 8, "y": 3},
+
+ {"matrix": [3, 7], "x": 10.5, "y": 3},
+ {"matrix": [3, 8], "x": 11.5, "y": 3},
+ {"matrix": [3, 9], "x": 12.5, "y": 3},
+ {"matrix": [3, 10], "x": 13.5, "y": 3},
+ {"matrix": [3, 11], "x": 14.5, "y": 3},
+ {"matrix": [3, 12], "x": 15.5, "y": 3},
+ {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 3, "y": 4},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+ {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 15, "y": 4},
+
+ {"matrix": [4, 11], "x": 17.25, "y": 4},
+ {"matrix": [4, 12], "x": 18.25, "y": 4},
+ {"matrix": [4, 13], "x": 19.25, "y": 4}
+ ]
},
"LAYOUT_wkl_full": {
"layout": [
- {"label":"Esc", "x":0.5, "y":0},
- {"label":"~", "x":1.75, "y":0},
- {"label":"!", "x":2.75, "y":0},
- {"label":"@", "x":3.75, "y":0},
- {"label":"#", "x":4.75, "y":0},
- {"label":"$", "x":5.75, "y":0},
- {"label":"%", "x":6.75, "y":0},
- {"label":"^", "x":7.75, "y":0},
- {"label":"&", "x":11.25, "y":0},
- {"label":"*", "x":12.25, "y":0},
- {"label":"(", "x":13.25, "y":0},
- {"label":")", "x":14.25, "y":0},
- {"label":"_", "x":15.25, "y":0},
- {"label":"+", "x":16.25, "y":0},
- {"label":"|", "x":17.25, "y":0},
- {"label":"~", "x":18.25, "y":0},
- {"label":"Del", "x":19.75, "y":0},
-
- {"label":"PgUp", "x":0.25, "y":1},
- {"label":"Tab", "x":1.75, "y":1, "w":1.5},
- {"label":"Q", "x":3.25, "y":1},
- {"label":"W", "x":4.25, "y":1},
- {"label":"E", "x":5.25, "y":1},
- {"label":"R", "x":6.25, "y":1},
- {"label":"T", "x":7.25, "y":1},
- {"label":"Y", "x":10.75, "y":1},
- {"label":"U", "x":11.75, "y":1},
- {"label":"I", "x":12.75, "y":1},
- {"label":"O", "x":13.75, "y":1},
- {"label":"P", "x":14.75, "y":1},
- {"label":"{", "x":15.75, "y":1},
- {"label":"}", "x":16.75, "y":1},
- {"label":"Backspace", "x":17.75, "y":1, "w":1.5},
-
- {"label":"PgDn", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
- {"label":"A", "x":3.5, "y":2},
- {"label":"S", "x":4.5, "y":2},
- {"label":"D", "x":5.5, "y":2},
- {"label":"F", "x":6.5, "y":2},
- {"label":"G", "x":7.5, "y":2},
- {"label":"H", "x":11, "y":2},
- {"label":"J", "x":12, "y":2},
- {"label":"K", "x":13, "y":2},
- {"label":"L", "x":14, "y":2},
- {"label":":", "x":15, "y":2},
- {"label":"\"", "x":16, "y":2},
- {"label":"Enter", "x":17, "y":2, "w":2.25},
-
- {"label":"Shift", "x":1.75, "y":3, "w":2.25},
- {"label":"Z", "x":4, "y":3},
- {"label":"X", "x":5, "y":3},
- {"label":"C", "x":6, "y":3},
- {"label":"V", "x":7, "y":3},
- {"label":"B", "x":8, "y":3},
- {"label":"B", "x":10.5, "y":3},
- {"label":"N", "x":11.5, "y":3},
- {"label":"M", "x":12.5, "y":3},
- {"label":"<", "x":13.5, "y":3},
- {"label":">", "x":14.5, "y":3},
- {"label":"?", "x":15.5, "y":3},
- {"label":"Shift", "x":16.5, "y":3, "w":1.75},
- {"label":"Up", "x":18.25, "y":3},
-
- {"label":"Ctrl", "x":1.75, "y":4, "w":1.25},
- {"label":"Alt", "x":3, "y":4},
- {"x":5.25, "y":4, "w":2.25},
- {"label":"Fn", "x":8.25, "y":4},
- {"x":11, "y":4, "w":2.75},
- {"label":"Alt", "x":13.75, "y":4, "w":1.25},
- {"label":"Left", "x":17.25, "y":4},
- {"label":"Down", "x":18.25, "y":4},
- {"label":"Right", "x":19.25, "y":4}]
+ {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.75, "y": 0},
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+ {"matrix": [0, 5], "x": 6.75, "y": 0},
+ {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 11.25, "y": 0},
+ {"matrix": [0, 8], "x": 12.25, "y": 0},
+ {"matrix": [0, 9], "x": 13.25, "y": 0},
+ {"matrix": [0, 10], "x": 14.25, "y": 0},
+ {"matrix": [0, 11], "x": 15.25, "y": 0},
+ {"matrix": [0, 12], "x": 16.25, "y": 0},
+ {"matrix": [0, 13], "x": 17.25, "y": 0},
+ {"matrix": [0, 14], "x": 18.25, "y": 0},
+
+ {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+ {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3.25, "y": 1},
+ {"matrix": [1, 2], "x": 4.25, "y": 1},
+ {"matrix": [1, 3], "x": 5.25, "y": 1},
+ {"matrix": [1, 4], "x": 6.25, "y": 1},
+ {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+ {"matrix": [1, 6], "x": 10.75, "y": 1},
+ {"matrix": [1, 7], "x": 11.75, "y": 1},
+ {"matrix": [1, 8], "x": 12.75, "y": 1},
+ {"matrix": [1, 9], "x": 13.75, "y": 1},
+ {"matrix": [1, 10], "x": 14.75, "y": 1},
+ {"matrix": [1, 11], "x": 15.75, "y": 1},
+ {"matrix": [1, 12], "x": 16.75, "y": 1},
+ {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.5, "y": 2},
+ {"matrix": [2, 2], "x": 4.5, "y": 2},
+ {"matrix": [2, 3], "x": 5.5, "y": 2},
+ {"matrix": [2, 4], "x": 6.5, "y": 2},
+ {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2},
+ {"matrix": [2, 10], "x": 15, "y": 2},
+ {"matrix": [2, 11], "x": 16, "y": 2},
+ {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+ {"matrix": [3, 5], "x": 7, "y": 3},
+ {"matrix": [3, 6], "x": 8, "y": 3},
+
+ {"matrix": [3, 7], "x": 10.5, "y": 3},
+ {"matrix": [3, 8], "x": 11.5, "y": 3},
+ {"matrix": [3, 9], "x": 12.5, "y": 3},
+ {"matrix": [3, 10], "x": 13.5, "y": 3},
+ {"matrix": [3, 11], "x": 14.5, "y": 3},
+ {"matrix": [3, 12], "x": 15.5, "y": 3},
+ {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+ {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 11], "x": 17.25, "y": 4},
+ {"matrix": [4, 12], "x": 18.25, "y": 4},
+ {"matrix": [4, 13], "x": 19.25, "y": 4}
+ ]
},
"LAYOUT_wk_bs": {
"layout": [
- {"label":"Esc", "x":0.5, "y":0},
- {"label":"~", "x":1.75, "y":0},
- {"label":"!", "x":2.75, "y":0},
- {"label":"@", "x":3.75, "y":0},
- {"label":"#", "x":4.75, "y":0},
- {"label":"$", "x":5.75, "y":0},
- {"label":"%", "x":6.75, "y":0},
- {"label":"^", "x":7.75, "y":0},
- {"label":"&", "x":11.25, "y":0},
- {"label":"*", "x":12.25, "y":0},
- {"label":"(", "x":13.25, "y":0},
- {"label":")", "x":14.25, "y":0},
- {"label":"_", "x":15.25, "y":0},
- {"label":"+", "x":16.25, "y":0},
- {"label":"Back Space", "x":17.25, "y":0},
- {"label":"Del", "x":19.75, "y":0},
-
- {"label":"PgUp", "x":0.25, "y":1},
- {"label":"Tab", "x":1.75, "y":1, "w":1.5},
- {"label":"Q", "x":3.25, "y":1},
- {"label":"W", "x":4.25, "y":1},
- {"label":"E", "x":5.25, "y":1},
- {"label":"R", "x":6.25, "y":1},
- {"label":"T", "x":7.25, "y":1},
- {"label":"Y", "x":10.75, "y":1},
- {"label":"U", "x":11.75, "y":1},
- {"label":"I", "x":12.75, "y":1},
- {"label":"O", "x":13.75, "y":1},
- {"label":"P", "x":14.75, "y":1},
- {"label":"{", "x":15.75, "y":1},
- {"label":"}", "x":16.75, "y":1},
- {"label":"|", "x":17.75, "y":1, "w":1.5},
-
- {"label":"PgDn", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
- {"label":"A", "x":3.5, "y":2},
- {"label":"S", "x":4.5, "y":2},
- {"label":"D", "x":5.5, "y":2},
- {"label":"F", "x":6.5, "y":2},
- {"label":"G", "x":7.5, "y":2},
- {"label":"H", "x":11, "y":2},
- {"label":"J", "x":12, "y":2},
- {"label":"K", "x":13, "y":2},
- {"label":"L", "x":14, "y":2},
- {"label":":", "x":15, "y":2},
- {"label":"\"", "x":16, "y":2},
- {"label":"Enter", "x":17, "y":2, "w":2.25},
-
- {"label":"Shift", "x":1.75, "y":3, "w":2.25},
- {"label":"Z", "x":4, "y":3},
- {"label":"X", "x":5, "y":3},
- {"label":"C", "x":6, "y":3},
- {"label":"V", "x":7, "y":3},
- {"label":"B", "x":8, "y":3},
- {"label":"B", "x":10.5, "y":3},
- {"label":"N", "x":11.5, "y":3},
- {"label":"M", "x":12.5, "y":3},
- {"label":"<", "x":13.5, "y":3},
- {"label":">", "x":14.5, "y":3},
- {"label":"?", "x":15.5, "y":3},
- {"label":"Shift", "x":16.5, "y":3, "w":1.75},
- {"label":"Up", "x":18.25, "y":3},
-
- {"label":"Ctrl", "x":1.75, "y":4, "w":1.25},
- {"label":"Super", "x":3, "y":4},
- {"label":"Alt", "x":4, "y":4, "w":1.25},
- {"x":5.25, "y":4, "w":2.25},
- {"label":"Fn", "x":8.25, "y":4},
- {"x":11, "y":4, "w":2.75},
- {"label":"Alt", "x":13.75, "y":4, "w":1.25},
- {"label":"Ctrl", "x":15, "y":4},
- {"label":"Left", "x":17.25, "y":4},
- {"label":"Down", "x":18.25, "y":4},
- {"label":"Right", "x":19.25, "y":4}]
+ {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.75, "y": 0},
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+ {"matrix": [0, 5], "x": 6.75, "y": 0},
+ {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 11.25, "y": 0},
+ {"matrix": [0, 8], "x": 12.25, "y": 0},
+ {"matrix": [0, 9], "x": 13.25, "y": 0},
+ {"matrix": [0, 10], "x": 14.25, "y": 0},
+ {"matrix": [0, 11], "x": 15.25, "y": 0},
+ {"matrix": [0, 12], "x": 16.25, "y": 0},
+ {"matrix": [0, 13], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+ {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3.25, "y": 1},
+ {"matrix": [1, 2], "x": 4.25, "y": 1},
+ {"matrix": [1, 3], "x": 5.25, "y": 1},
+ {"matrix": [1, 4], "x": 6.25, "y": 1},
+ {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+ {"matrix": [1, 6], "x": 10.75, "y": 1},
+ {"matrix": [1, 7], "x": 11.75, "y": 1},
+ {"matrix": [1, 8], "x": 12.75, "y": 1},
+ {"matrix": [1, 9], "x": 13.75, "y": 1},
+ {"matrix": [1, 10], "x": 14.75, "y": 1},
+ {"matrix": [1, 11], "x": 15.75, "y": 1},
+ {"matrix": [1, 12], "x": 16.75, "y": 1},
+ {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.5, "y": 2},
+ {"matrix": [2, 2], "x": 4.5, "y": 2},
+ {"matrix": [2, 3], "x": 5.5, "y": 2},
+ {"matrix": [2, 4], "x": 6.5, "y": 2},
+ {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2},
+ {"matrix": [2, 10], "x": 15, "y": 2},
+ {"matrix": [2, 11], "x": 16, "y": 2},
+ {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+ {"matrix": [3, 5], "x": 7, "y": 3},
+ {"matrix": [3, 6], "x": 8, "y": 3},
+
+ {"matrix": [3, 7], "x": 10.5, "y": 3},
+ {"matrix": [3, 8], "x": 11.5, "y": 3},
+ {"matrix": [3, 9], "x": 12.5, "y": 3},
+ {"matrix": [3, 10], "x": 13.5, "y": 3},
+ {"matrix": [3, 11], "x": 14.5, "y": 3},
+ {"matrix": [3, 12], "x": 15.5, "y": 3},
+ {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 3, "y": 4},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+ {"matrix": [4, 8], "x": 11, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 15, "y": 4},
+
+ {"matrix": [4, 11], "x": 17.25, "y": 4},
+ {"matrix": [4, 12], "x": 18.25, "y": 4},
+ {"matrix": [4, 13], "x": 19.25, "y": 4}
+ ]
},
"LAYOUT_wkl_bs": {
"layout": [
- {"label":"Esc", "x":0.5, "y":0},
- {"label":"~", "x":1.75, "y":0},
- {"label":"!", "x":2.75, "y":0},
- {"label":"@", "x":3.75, "y":0},
- {"label":"#", "x":4.75, "y":0},
- {"label":"$", "x":5.75, "y":0},
- {"label":"%", "x":6.75, "y":0},
- {"label":"^", "x":7.75, "y":0},
- {"label":"&", "x":11.25, "y":0},
- {"label":"*", "x":12.25, "y":0},
- {"label":"(", "x":13.25, "y":0},
- {"label":")", "x":14.25, "y":0},
- {"label":"_", "x":15.25, "y":0},
- {"label":"+", "x":16.25, "y":0},
- {"label":"Back Space", "x":17.25, "y":0},
- {"label":"Del", "x":19.75, "y":0},
-
- {"label":"PgUp", "x":0.25, "y":1},
- {"label":"Tab", "x":1.75, "y":1, "w":1.5},
- {"label":"Q", "x":3.25, "y":1},
- {"label":"W", "x":4.25, "y":1},
- {"label":"E", "x":5.25, "y":1},
- {"label":"R", "x":6.25, "y":1},
- {"label":"T", "x":7.25, "y":1},
- {"label":"Y", "x":10.75, "y":1},
- {"label":"U", "x":11.75, "y":1},
- {"label":"I", "x":12.75, "y":1},
- {"label":"O", "x":13.75, "y":1},
- {"label":"P", "x":14.75, "y":1},
- {"label":"{", "x":15.75, "y":1},
- {"label":"}", "x":16.75, "y":1},
- {"label":"|", "x":17.75, "y":1, "w":1.5},
-
- {"label":"PgDn", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
- {"label":"A", "x":3.5, "y":2},
- {"label":"S", "x":4.5, "y":2},
- {"label":"D", "x":5.5, "y":2},
- {"label":"F", "x":6.5, "y":2},
- {"label":"G", "x":7.5, "y":2},
- {"label":"H", "x":11, "y":2},
- {"label":"J", "x":12, "y":2},
- {"label":"K", "x":13, "y":2},
- {"label":"L", "x":14, "y":2},
- {"label":":", "x":15, "y":2},
- {"label":"\"", "x":16, "y":2},
- {"label":"Enter", "x":17, "y":2, "w":2.25},
-
- {"label":"Shift", "x":1.75, "y":3, "w":2.25},
- {"label":"Z", "x":4, "y":3},
- {"label":"X", "x":5, "y":3},
- {"label":"C", "x":6, "y":3},
- {"label":"V", "x":7, "y":3},
- {"label":"B", "x":8, "y":3},
- {"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3},
- {"label":"M", "x":12.5, "y":3},
- {"label":"<", "x":13.5, "y":3},
- {"label":">", "x":14.5, "y":3},
- {"label":"?", "x":15.5, "y":3},
- {"label":"Shift", "x":16.5, "y":3, "w":1.75},
- {"label":"Up", "x":18.25, "y":3},
-
- {"label":"Ctrl", "x":1.75, "y":4, "w":1.5},
- {"label":"Alt", "x":4.75, "y":4, "w":1.25},
- {"x":6, "y":4, "w":2.25},
- {"label":"Win", "x":8.25, "y":4},
- {"x":10.5, "y":4, "w":2.75},
- {"label":"Alt", "x":13.25, "y":4, "w":1.5},
- {"label":"Left", "x":17.25, "y":4},
- {"label":"Down", "x":18.25, "y":4},
- {"label":"Right", "x":19.25, "y":4}]
+ {"matrix": [3, 1], "x": 0.5, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.75, "y": 0},
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+ {"matrix": [0, 5], "x": 6.75, "y": 0},
+ {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 11.25, "y": 0},
+ {"matrix": [0, 8], "x": 12.25, "y": 0},
+ {"matrix": [0, 9], "x": 13.25, "y": 0},
+ {"matrix": [0, 10], "x": 14.25, "y": 0},
+ {"matrix": [0, 11], "x": 15.25, "y": 0},
+ {"matrix": [0, 12], "x": 16.25, "y": 0},
+ {"matrix": [0, 13], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 14], "x": 19.75, "y": 0},
+
+ {"matrix": [1, 14], "x": 0.25, "y": 1},
+
+ {"matrix": [1, 0], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3.25, "y": 1},
+ {"matrix": [1, 2], "x": 4.25, "y": 1},
+ {"matrix": [1, 3], "x": 5.25, "y": 1},
+ {"matrix": [1, 4], "x": 6.25, "y": 1},
+ {"matrix": [1, 5], "x": 7.25, "y": 1},
+
+ {"matrix": [1, 6], "x": 10.75, "y": 1},
+ {"matrix": [1, 7], "x": 11.75, "y": 1},
+ {"matrix": [1, 8], "x": 12.75, "y": 1},
+ {"matrix": [1, 9], "x": 13.75, "y": 1},
+ {"matrix": [1, 10], "x": 14.75, "y": 1},
+ {"matrix": [1, 11], "x": 15.75, "y": 1},
+ {"matrix": [1, 12], "x": 16.75, "y": 1},
+ {"matrix": [1, 13], "x": 17.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.5, "y": 2},
+ {"matrix": [2, 2], "x": 4.5, "y": 2},
+ {"matrix": [2, 3], "x": 5.5, "y": 2},
+ {"matrix": [2, 4], "x": 6.5, "y": 2},
+ {"matrix": [2, 5], "x": 7.5, "y": 2},
+
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2},
+ {"matrix": [2, 10], "x": 15, "y": 2},
+ {"matrix": [2, 11], "x": 16, "y": 2},
+ {"matrix": [2, 13], "x": 17, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 1.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+ {"matrix": [3, 5], "x": 7, "y": 3},
+ {"matrix": [3, 6], "x": 8, "y": 3},
+
+ {"matrix": [3, 7], "x": 10.5, "y": 3},
+ {"matrix": [3, 8], "x": 11.5, "y": 3},
+ {"matrix": [3, 9], "x": 12.5, "y": 3},
+ {"matrix": [3, 10], "x": 13.5, "y": 3},
+ {"matrix": [3, 11], "x": 14.5, "y": 3},
+ {"matrix": [3, 12], "x": 15.5, "y": 3},
+ {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 18.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+ {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 13.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 11], "x": 17.25, "y": 4},
+ {"matrix": [4, 12], "x": 18.25, "y": 4},
+ {"matrix": [4, 13], "x": 19.25, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/jacky_studio/bear_65/rev2/rev2.h b/keyboards/jacky_studio/bear_65/rev2/rev2.h
deleted file mode 100644
index 61f5a9d6fe..0000000000
--- a/keyboards/jacky_studio/bear_65/rev2/rev2.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_wk_full( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
- K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K43, K45, K46, K48, K49, K4A, K4B, K4C, K4D \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_wkl_full( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
- K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K43, K45, K46, K48, K49, K4B, K4C, K4D \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, K49, KC_NO, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_wk_bs( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
- K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K43, K45, K46, K48, K49, K4A, K4B, K4C, K4D \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_wkl_bs( \
- K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
- K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K43, K45, K46, K48, K4A, K4B, K4C, K4D \
-) { \
- { 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, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
-}
-