aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-18 03:38:43 +0000
committerQMK Bot <hello@qmk.fm>2021-03-18 03:38:43 +0000
commit74c89de3e98ed8e631026c24625dcde0d538443f (patch)
treec08911c11ab57cc6d87733f007296ae9fff50413
parentaf5c10ef0c71d41446b8fb27b942fb2bc92e49d8 (diff)
parented446360a4f8781c8d97af325f69c90dbac1d752 (diff)
downloadqmk_firmware-74c89de3e98ed8e631026c24625dcde0d538443f.tar.gz
qmk_firmware-74c89de3e98ed8e631026c24625dcde0d538443f.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/aleblazer/zodiark/info.json81
-rw-r--r--keyboards/aleblazer/zodiark/readme.md4
2 files changed, 80 insertions, 5 deletions
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
index e0acaaa46..0d781f0c7 100644
--- a/keyboards/aleblazer/zodiark/info.json
+++ b/keyboards/aleblazer/zodiark/info.json
@@ -2,11 +2,86 @@
2 "keyboard_name": "zodiark", 2 "keyboard_name": "zodiark",
3 "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark", 3 "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark",
4 "maintainer": "Aleblazer", 4 "maintainer": "Aleblazer",
5 "width": 19, 5 "width": 18,
6 "height": 8.48, 6 "height": 6.25,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT": {
9 "layout": [{"label":"L03", "x":3, "y":0}, {"label":"R03", "x":15, "y":0}, {"label":"L02", "x":2, "y":0.125}, {"label":"L04", "x":4, "y":0.125}, {"label":"R02", "x":14, "y":0.125}, {"label":"R04", "x":16, "y":0.125}, {"label":"L05", "x":5, "y":0.25}, {"label":"R01", "x":13, "y":0.25}, {"label":"L00", "x":0, "y":0.53}, {"label":"L01", "x":1, "y":0.53}, {"label":"R05", "x":17, "y":0.53}, {"label":"R06", "x":18, "y":0.53}, {"label":"L13", "x":3, "y":1}, {"label":"R13", "x":15, "y":1}, {"label":"L12", "x":2, "y":1.125}, {"label":"L14", "x":4, "y":1.125}, {"label":"R12", "x":14, "y":1.125}, {"label":"R14", "x":16, "y":1.125}, {"label":"L15", "x":5, "y":1.25}, {"label":"R11", "x":13, "y":1.25}, {"label":"L10", "x":0, "y":1.53}, {"label":"L11", "x":1, "y":1.53}, {"label":"R15", "x":17, "y":1.53}, {"label":"R16", "x":18, "y":1.53}, {"label":"L06", "x":6, "y":1.7000000000000002}, {"label":"R00", "x":12, "y":1.7000000000000002}, {"label":"L23", "x":3, "y":2.0}, {"label":"R23", "x":15, "y":2.0}, {"label":"L22", "x":2, "y":2.125}, {"label":"L24", "x":4, "y":2.125}, {"label":"R22", "x":14, "y":2.125}, {"label":"R24", "x":16, "y":2.125}, {"label":"L25", "x":5, "y":2.25}, {"label":"R21", "x":13, "y":2.25}, {"label":"L20", "x":0, "y":2.5300000000000002}, {"label":"L21", "x":1, "y":2.5300000000000002}, {"label":"R25", "x":17, "y":2.5300000000000002}, {"label":"R26", "x":18, "y":2.5300000000000002}, {"label":"L16", "x":6, "y":2.7}, {"label":"R10", "x":12, "y":2.7}, {"label":"L33", "x":3, "y":3.0000000000000004}, {"label":"R33", "x":15, "y":3.0000000000000004}, {"label":"L32", "x":2, "y":3.1250000000000004}, {"label":"L34", "x":4, "y":3.1250000000000004}, {"label":"R32", "x":14, "y":3.1250000000000004}, {"label":"R34", "x":16, "y":3.1250000000000004}, {"label":"L35", "x":5, "y":3.2500000000000004}, {"label":"R31", "x":13, "y":3.2500000000000004}, {"label":"L30", "x":0, "y":3.5300000000000002}, {"label":"L31", "x":1, "y":3.5300000000000002}, {"label":"R35", "x":17, "y":3.5300000000000002}, {"label":"R36", "x":18, "y":3.5300000000000002}, {"label":"L43", "x":3, "y":4.0}, {"label":"R43", "x":15, "y":4.0}, {"label":"L42", "x":2, "y":4.125}, {"label":"R44", "x":16, "y":4.125}, {"label":"L44", "x":4, "y":4.13}, {"label":"R42", "x":14, "y":4.13}, {"label":"L40", "x":0, "y":4.53}, {"label":"L41", "x":1, "y":4.53}, {"label":"R45", "x":17, "y":4.53}, {"label":"R46", "x":18, "y":4.53}, {"label":"L26", "x":-0.33, "y":5.13}, {"label":"L36", "x":0.6699999999999999, "y":5.13}, {"label":"L45", "x":-0.83, "y":6.13, "w":1.5}, {"label":"L46", "x":0.67, "y":6.13}, {"label":"R30", "x":-2.1, "y":6.48}, {"label":"R20", "x":-1.1, "y":6.48}, {"label":"R40", "x":-2.1, "y":7.48}, {"label":"R41", "x":-1.1, "y":7.48, "w":1.5}] 9 "layout": [
10 {"x":0, "y":0.53},
11 {"x":1, "y":0.53},
12 {"x":2, "y":0.125},
13 {"x":3, "y":0},
14 {"x":4, "y":0.125},
15 {"x":5, "y":0.25},
16 {"x":12, "y":0.25},
17 {"x":13, "y":0.125},
18 {"x":14, "y":0},
19 {"x":15, "y":0.125},
20 {"x":16, "y":0.53},
21 {"x":17, "y":0.53},
22
23 {"x":0, "y":1.53},
24 {"x":1, "y":1.53},
25 {"x":2, "y":1.125},
26 {"x":3, "y":1},
27 {"x":4, "y":1.125},
28 {"x":5, "y":1.25},
29 {"x":6, "y":1.7},
30 {"x":11, "y":1.7},
31 {"x":12, "y":1.25},
32 {"x":13, "y":1.125},
33 {"x":14, "y":1},
34 {"x":15, "y":1.125},
35 {"x":16, "y":1.53},
36 {"x":17, "y":1.53},
37
38 {"x":0, "y":2.53},
39 {"x":1, "y":2.53},
40 {"x":2, "y":2.125},
41 {"x":3, "y":2},
42 {"x":4, "y":2.125},
43 {"x":5, "y":2.25},
44 {"x":6, "y":2.7},
45 {"x":11, "y":2.7},
46 {"x":12, "y":2.25},
47 {"x":13, "y":2.125},
48 {"x":14, "y":2},
49 {"x":15, "y":2.125},
50 {"x":16, "y":2.53},
51 {"x":17, "y":2.53},
52
53 {"x":0, "y":3.53},
54 {"x":1, "y":3.53},
55 {"x":2, "y":3.125},
56 {"x":3, "y":3},
57 {"x":4, "y":3.125},
58 {"x":5, "y":3.25},
59 {"x":6.5, "y":4.25},
60 {"x":7.5, "y":4.25},
61 {"x":9.5, "y":4.25},
62 {"x":10.5, "y":4.25},
63 {"x":12, "y":3.25},
64 {"x":13, "y":3.125},
65 {"x":14, "y":3},
66 {"x":15, "y":3.125},
67 {"x":16, "y":3.53},
68 {"x":17, "y":3.53},
69
70 {"x":0, "y":4.53},
71 {"x":1, "y":4.53},
72 {"x":2, "y":4.125},
73 {"x":3, "y":4},
74 {"x":4, "y":4.125},
75 {"x":6, "y":5.25, "w":1.5},
76 {"x":7.5, "y":5.25},
77 {"x":9.5, "y":5.25},
78 {"x":10.5, "y":5.25, "w":1.5},
79 {"x":13, "y":4.125},
80 {"x":14, "y":4},
81 {"x":15, "y":4.125},
82 {"x":16, "y":4.53},
83 {"x":17, "y":4.53}
84 ]
10 } 85 }
11 } 86 }
12} 87}
diff --git a/keyboards/aleblazer/zodiark/readme.md b/keyboards/aleblazer/zodiark/readme.md
index fe28bedd4..392744ded 100644
--- a/keyboards/aleblazer/zodiark/readme.md
+++ b/keyboards/aleblazer/zodiark/readme.md
@@ -10,11 +10,11 @@ A split keyboard with 5x7 including a thumbcluster, encoders on each side, per k
10 10
11Make example for this keyboard (after setting up your build environment): 11Make example for this keyboard (after setting up your build environment):
12 12
13 make zodiark:default 13 make aleblazer/zodiark:default
14 14
15Flashing example for this keyboard: 15Flashing example for this keyboard:
16 16
17 make zodiark:default:flash 17 make aleblazer/zodiark:default:flash
18 18
19Remove TRRS cable from halves, plug into one side, press reset button when asked. Repeat process on the other side. 19Remove TRRS cable from halves, plug into one side, press reset button when asked. Repeat process on the other side.
20 20
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-04 19:49:07 +0000