Skip to content

Commit e4458dc

Browse files
thrlygithub-actions[bot]
thrly
authored and
github-actions[bot]
committed
Update new key layout
1 parent b4802df commit e4458dc

File tree

10 files changed

+572
-335
lines changed

10 files changed

+572
-335
lines changed

‎boards/shields/tempest/boards/tempest-pinctrl.dtsi‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// TODO: map pins for the display. reference: https://zmk.dev/docs/development/hardware-integration/pinctrl
2+
// REFERENCE: tempest v2 pins:
3+
// P4: row_top
4+
// P5: row_home
5+
// P6: row_bottom
6+
// P7: row_thumb
7+
// P14: col_inner
8+
// P15: col_index
9+
// P18: col_middle
10+
// P19: col_ring
11+
// P20: col_pinky
12+
// P21: col_extra
13+
// P8: MOSI
14+
// P9: SCK
15+
// P10: CS
16+
17+
&pinctrl {
18+
// need to do something here I think?
19+
}
20+

‎boards/shields/tempest/tempest.dtsi‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,22 @@
1717
compatible = "zmk,matrix-transform";
1818
columns = <10>;
1919
rows = <4>;
20-
// | SW1 | SW2 | SW3 | SW4 | SW5 | | SW5 | SW4 | SW3 | SW2 | SW1 |
21-
// | SW6 | SW7 | SW8 | SW9 | SW10 | | SW10 | SW9 | SW8 | SW7 | SW6 |
22-
// | SW11 | SW12 | SW13 | SW14 | SW15 | | SW15 | SW14 | SW13 | SW12 | SW11 |
23-
// | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 |
20+
21+
/* | SW01 | SW02 | SW03 | SW04 | SW05 | | SW05 | SW04 | SW3 | SW02 | SW01 | */
22+
/* SW06 | SW07 | SW08 | SW09 | SW10 | SW11 | | SW11 | SW10 | SW09 | SW08 | SW07 | SW06 */
23+
/* | SW12 | SW13 | SW14 | SW15 | SW16 | | SW16 | SW15 | SW14 | SW13 | SW12 | */
24+
/* | SW17 | SW18 | SW19 | | SW19 | SW18 | SW17 | */
2425
map = <
25-
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
26-
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
27-
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
28-
RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7)
26+
RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10)
27+
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
28+
RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(3,10)
29+
RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8)
2930
>;
3031
};
3132

33+
/* TODO: what happens when extra keys (SW06) aren't used? */afs/
34+
35+
3236
kscan0: kscan {
3337
compatible = "zmk,kscan-gpio-matrix";
3438
label = "KSCAN";
@@ -62,4 +66,4 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
6266
com-sequential;
6367
prechargep = <0x22>;
6468
};
65-
};
69+
};

‎boards/shields/tempest/tempest_left.overlay‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
&kscan0 {
1010
col-gpios
11-
= <&pro_micro 20 GPIO_ACTIVE_HIGH>
11+
= <&pro_micro 21 GPIO_ACTIVE_HIGH>
12+
, <&pro_micro 20 GPIO_ACTIVE_HIGH>
1213
, <&pro_micro 19 GPIO_ACTIVE_HIGH>
1314
, <&pro_micro 18 GPIO_ACTIVE_HIGH>
1415
, <&pro_micro 15 GPIO_ACTIVE_HIGH>
1516
, <&pro_micro 14 GPIO_ACTIVE_HIGH>
1617
;
17-
};
18+
};

‎boards/shields/tempest/tempest_right.overlay‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "tempest.dtsi"
88

99
&default_transform {
10-
col-offset = <5>;
10+
col-offset = <6>;
1111
};
1212

1313
&kscan0 {
@@ -17,5 +17,6 @@
1717
, <&pro_micro 18 GPIO_ACTIVE_HIGH>
1818
, <&pro_micro 19 GPIO_ACTIVE_HIGH>
1919
, <&pro_micro 20 GPIO_ACTIVE_HIGH>
20+
, <&pro_micro 21 GPIO_ACTIVE_HIGH>
2021
;
21-
};
22+
};

‎build.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
---
2121
include:
2222
- board: nice_nano_v2
23-
shield: tempest_left
23+
shield: tempest_left nice_view_adapter nice_view # TODO: needs pins to be manually set?
2424
- board: nice_nano_v2
25-
shield: tempest_right
25+
shield: tempest_right nice_view_adapter nice_view
2626
- board: nice_nano_v2
27-
shield: settings_reset
27+
shield: settings_reset
28+

‎config/tempest.conf‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
# CONFIG_WS2812_STRIP=y
44

55
# Uncomment the following line to enable the Tempest OLED Display
6-
# CONFIG_ZMK_DISPLAY=y
6+
CONFIG_ZMK_DISPLAY=y
7+
CONFIG_ZMK_DISPLAY_STATUS_SCREEN_BUILT_IN=y
8+
CONFIG_ZMK_LV_FONT_DEFAULT_SMALL_MONTSERRAT_26=y
9+
CONFIG_LV_FONT_DEFAULT_MONTSERRAT_26=y
710

811
# add mouse behavior
9-
CONFIG_ZMK_POINTING=y
12+
CONFIG_ZMK_POINTING=y
13+
14+
# Uncomment the following line to enable deep sleep
15+
CONFIG_ZMK_SLEEP=y

‎config/tempest.json‎

Lines changed: 186 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,197 @@
11
{
22
"id": "tempest",
33
"name": "tempest",
4+
45
"layouts": {
56
"TEMPEST": {
67
"layout": [
7-
{ "row": 0, "col": 0, "x": 0.065, "y": 1.24, "r": -8, "rx": 0.565, "ry": 1.74 },
8-
{ "row": 0, "col": 1, "x": 1.135, "y": 0.48, "r": -4, "rx": 1.635, "ry": 0.98 },
9-
{ "row": 0, "col": 2, "x": 2.265, "y": 0 },
10-
{ "row": 0, "col": 3, "x": 3.265, "y": 0.4 },
11-
{ "row": 0, "col": 4, "x": 4.265, "y": 0.55 },
12-
{ "row": 0, "col": 5, "x": 9.7, "y": 0.55 },
13-
{ "row": 0, "col": 6, "x": 10.7, "y": 0.4 },
14-
{ "row": 0, "col": 7, "x": 11.7, "y": 0 },
15-
{ "row": 0, "col": 8, "x": 12.83, "y": 0.48, "r": 4, "rx": 13.33, "ry": 0.98 },
16-
{ "row": 0, "col": 9, "x": 13.9, "y": 1.24, "r": 8, "rx": 14.4, "ry": 1.74 },
8+
{
9+
"row": 0,
10+
"col": 1,
11+
"x": 0.884,
12+
"y": 0.843,
13+
"r": -8,
14+
"rx": 1.384,
15+
"ry": 1.343
16+
},
17+
{
18+
"row": 0,
19+
"col": 2,
20+
"x": 1.987,
21+
"y": 0.33,
22+
"r": -4,
23+
"rx": 2.487,
24+
"ry": 0.83
25+
},
26+
{ "row": 0, "col": 3, "x": 3.128, "y": 0 },
27+
{ "row": 0, "col": 4, "x": 4.128, "y": 0.2 },
28+
{ "row": 0, "col": 5, "x": 5.128, "y": 0.35 },
29+
{ "row": 0, "col": 6, "x": 10.6, "y": 0.35 },
30+
{ "row": 0, "col": 7, "x": 11.6, "y": 0.2 },
31+
{ "row": 0, "col": 8, "x": 12.6, "y": 0 },
32+
{
33+
"row": 0,
34+
"col": 9,
35+
"x": 13.74,
36+
"y": 0.33,
37+
"r": 4,
38+
"rx": 14.24,
39+
"ry": 0.83
40+
},
41+
{
42+
"row": 0,
43+
"col": 10,
44+
"x": 14.843,
45+
"y": 0.843,
46+
"r": 8,
47+
"rx": 15.343,
48+
"ry": 1.343
49+
},
1750

18-
{ "row": 1, "col": 0, "x": 0.196, "y": 2.23, "r": -8, "rx": 0.696, "ry": 2.73 },
19-
{ "row": 1, "col": 1, "x": 1.201, "y": 1.477, "r": -4, "rx": 1.701, "ry": 1.977 },
20-
{ "row": 1, "col": 2, "x": 2.265, "y": 1 },
21-
{ "row": 1, "col": 3, "x": 3.265, "y": 1.4 },
22-
{ "row": 1, "col": 4, "x": 4.265, "y": 1.55 },
23-
{ "row": 1, "col": 5, "x": 9.7, "y": 1.55 },
24-
{ "row": 1, "col": 6, "x": 10.7, "y": 1.4 },
25-
{ "row": 1, "col": 7, "x": 11.7, "y": 1 },
26-
{ "row": 1, "col": 8, "x": 12.765, "y": 1.477, "r": 4, "rx": 13.265, "ry": 1.977 },
27-
{ "row": 1, "col": 9, "x": 13.769, "y": 2.23, "r": 8, "rx": 14.269, "ry": 2.73 },
51+
{
52+
"row": 1,
53+
"col": 0,
54+
"x": 0.065,
55+
"y": 2.278,
56+
"r": -8,
57+
"rx": 0.565,
58+
"ry": 2.778
59+
},
60+
{
61+
"row": 1,
62+
"col": 1,
63+
"x": 1.016,
64+
"y": 1.833,
65+
"r": -8,
66+
"rx": 1.516,
67+
"ry": 2.333
68+
},
69+
{
70+
"row": 1,
71+
"col": 2,
72+
"x": 2.053,
73+
"y": 1.328,
74+
"r": -4,
75+
"rx": 2.553,
76+
"ry": 1.828
77+
},
78+
{ "row": 1, "col": 3, "x": 3.128, "y": 1 },
79+
{ "row": 1, "col": 4, "x": 4.128, "y": 1.2 },
80+
{ "row": 1, "col": 5, "x": 5.128, "y": 1.35 },
81+
{ "row": 1, "col": 6, "x": 10.6, "y": 1.35 },
82+
{ "row": 1, "col": 7, "x": 11.6, "y": 1.2 },
83+
{ "row": 1, "col": 8, "x": 12.6, "y": 1 },
84+
{
85+
"row": 1,
86+
"col": 9,
87+
"x": 13.674,
88+
"y": 1.328,
89+
"r": 4,
90+
"rx": 14.174,
91+
"ry": 1.828
92+
},
93+
{
94+
"row": 1,
95+
"col": 10,
96+
"x": 14.712,
97+
"y": 1.833,
98+
"r": 8,
99+
"rx": 15.212,
100+
"ry": 2.333
101+
},
102+
{
103+
"row": 1,
104+
"col": 11,
105+
"x": 15.663,
106+
"y": 2.278,
107+
"r": 8,
108+
"rx": 16.163,
109+
"ry": 2.778
110+
},
28111

29-
{ "row": 2, "col": 0, "x": 0.328, "y": 3.221, "r": -8, "rx": 0.828, "ry": 3.721 },
30-
{ "row": 2, "col": 1, "x": 1.267, "y": 2.475, "r": -4, "rx": 1.767, "ry": 2.975 },
31-
{ "row": 2, "col": 2, "x": 2.265, "y": 2 },
32-
{ "row": 2, "col": 3, "x": 3.265, "y": 2.4 },
33-
{ "row": 2, "col": 4, "x": 4.265, "y": 2.55 },
34-
{ "row": 2, "col": 5, "x": 9.7, "y": 2.55 },
35-
{ "row": 2, "col": 6, "x": 10.7, "y": 2.4 },
36-
{ "row": 2, "col": 7, "x": 11.7, "y": 2 },
37-
{ "row": 2, "col": 8, "x": 12.699, "y": 2.475, "r": 4, "rx": 13.199, "ry": 2.975 },
38-
{ "row": 2, "col": 9, "x": 13.638, "y": 3.221, "r": 8, "rx": 14.138, "ry": 3.721 },
112+
{
113+
"row": 2,
114+
"col": 1,
115+
"x": 1.147,
116+
"y": 2.823,
117+
"r": -8,
118+
"rx": 1.647,
119+
"ry": 3.323
120+
},
121+
{
122+
"row": 2,
123+
"col": 2,
124+
"x": 2.119,
125+
"y": 2.325,
126+
"r": -4,
127+
"rx": 2.619,
128+
"ry": 2.825
129+
},
130+
{ "row": 2, "col": 3, "x": 3.128, "y": 2 },
131+
{ "row": 2, "col": 4, "x": 4.128, "y": 2.2 },
132+
{ "row": 2, "col": 5, "x": 5.128, "y": 2.35 },
133+
{ "row": 2, "col": 6, "x": 10.6, "y": 2.35 },
134+
{ "row": 2, "col": 7, "x": 11.6, "y": 2.2 },
135+
{ "row": 2, "col": 8, "x": 12.6, "y": 2 },
136+
{
137+
"row": 2,
138+
"col": 9,
139+
"x": 13.609,
140+
"y": 2.325,
141+
"r": 4,
142+
"rx": 14.109,
143+
"ry": 2.825
144+
},
145+
{
146+
"row": 2,
147+
"col": 10,
148+
"x": 14.58,
149+
"y": 2.823,
150+
"r": 8,
151+
"rx": 15.08,
152+
"ry": 3.323
153+
},
39154

40-
{ "row": 3, "col": 2, "x": 3.765, "y": 3.65 },
41-
{ "row": 3, "col": 3, "x": 4.871, "y": 3.804, "r": 15, "rx": 5.371, "ry": 4.304 },
42-
{ "row": 3, "col": 4, "x": 5.9, "y": 4.256, "r": 30, "rx": 6.4, "ry": 4.756 },
43-
{ "row": 3, "col": 5, "x": 8.065, "y": 4.256, "r": -30, "rx": 8.565, "ry": 4.756 },
44-
{ "row": 3, "col": 6, "x": 9.095, "y": 3.804, "r": -15, "rx": 9.595, "ry": 4.304 },
45-
{ "row": 3, "col": 7, "x": 10.2, "y": 3.65 }
155+
{ "row": 3, "col": 3, "x": 4.528, "y": 3.45 },
156+
{
157+
"row": 3,
158+
"col": 4,
159+
"x": 5.633,
160+
"y": 3.604,
161+
"r": 15,
162+
"rx": 6.133,
163+
"ry": 4.104
164+
},
165+
{
166+
"row": 3,
167+
"col": 5,
168+
"x": 6.663,
169+
"y": 4.056,
170+
"r": 30,
171+
"rx": 7.163,
172+
"ry": 4.556
173+
},
174+
{
175+
"row": 3,
176+
"col": 6,
177+
"x": 9.065,
178+
"y": 4.056,
179+
"r": -30,
180+
"rx": 9.565,
181+
"ry": 4.556
182+
},
183+
{
184+
"row": 3,
185+
"col": 7,
186+
"x": 10.095,
187+
"y": 3.604,
188+
"r": -15,
189+
"rx": 10.595,
190+
"ry": 4.104
191+
},
192+
{ "row": 3, "col": 8, "x": 11.2, "y": 3.45 }
46193
]
47194
}
48-
},
49-
"sensors": []
50-
}
195+
}
196+
}
197+

0 commit comments

Comments
 (0)