Skip to content

Commit d129930

Browse files
joelspadinjoelspadin
committed
feat(boards)!: refactor Corne layouts
Split up the Corne layout files to match the previous commit.
1 parent 868f081 commit d129930

File tree

6 files changed

+135
-123
lines changed

6 files changed

+135
-123
lines changed

‎app/boards/shields/corne/corne.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
#include <dt-bindings/zmk/matrix_transform.h>
88

9-
#include <layouts/foostan/corne.dtsi>
9+
#include <layouts/foostan/corne/5column.dtsi>
10+
#include <layouts/foostan/corne/6column.dtsi>
1011

1112
&foostan_corne_6col_layout {
1213
transform = <&default_transform>;

‎app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
#include <dt-bindings/zmk/matrix_transform.h>
88

9-
#include <layouts/foostan/corne.dtsi>
9+
#include <layouts/foostan/corne/5column.dtsi>
10+
#include <layouts/foostan/corne/6column.dtsi>
1011

1112
&foostan_corne_6col_layout {
1213
transform = <&default_transform>;

‎app/dts/layouts/foostan/corne.dtsi

Lines changed: 0 additions & 121 deletions
This file was deleted.

‎app/dts/layouts/foostan/corne/5column.dtsi

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#include <layouts/foostan/corne/position_map.dtsi>
2+
#include <physical_layouts.dtsi>
3+
4+
/ {
5+
foostan_corne_5col_layout: foostan_corne_5col_layout {
6+
compatible = "zmk,physical-layout";
7+
display-name = "5 Column";
8+
9+
keys // w h x y rot rx ry
10+
= <&key_physical_attrs 100 100 0 37 0 0 0>
11+
, <&key_physical_attrs 100 100 100 12 0 0 0>
12+
, <&key_physical_attrs 100 100 200 0 0 0 0>
13+
, <&key_physical_attrs 100 100 300 12 0 0 0>
14+
, <&key_physical_attrs 100 100 400 24 0 0 0>
15+
, <&key_physical_attrs 100 100 700 24 0 0 0>
16+
, <&key_physical_attrs 100 100 800 12 0 0 0>
17+
, <&key_physical_attrs 100 100 900 0 0 0 0>
18+
, <&key_physical_attrs 100 100 1000 12 0 0 0>
19+
, <&key_physical_attrs 100 100 1100 37 0 0 0>
20+
, <&key_physical_attrs 100 100 0 137 0 0 0>
21+
, <&key_physical_attrs 100 100 100 112 0 0 0>
22+
, <&key_physical_attrs 100 100 200 100 0 0 0>
23+
, <&key_physical_attrs 100 100 300 112 0 0 0>
24+
, <&key_physical_attrs 100 100 400 124 0 0 0>
25+
, <&key_physical_attrs 100 100 700 124 0 0 0>
26+
, <&key_physical_attrs 100 100 800 112 0 0 0>
27+
, <&key_physical_attrs 100 100 900 100 0 0 0>
28+
, <&key_physical_attrs 100 100 1000 112 0 0 0>
29+
, <&key_physical_attrs 100 100 1100 137 0 0 0>
30+
, <&key_physical_attrs 100 100 0 237 0 0 0>
31+
, <&key_physical_attrs 100 100 100 212 0 0 0>
32+
, <&key_physical_attrs 100 100 200 200 0 0 0>
33+
, <&key_physical_attrs 100 100 300 212 0 0 0>
34+
, <&key_physical_attrs 100 100 400 224 0 0 0>
35+
, <&key_physical_attrs 100 100 700 224 0 0 0>
36+
, <&key_physical_attrs 100 100 800 212 0 0 0>
37+
, <&key_physical_attrs 100 100 900 200 0 0 0>
38+
, <&key_physical_attrs 100 100 1000 212 0 0 0>
39+
, <&key_physical_attrs 100 100 1100 237 0 0 0>
40+
, <&key_physical_attrs 100 100 250 312 0 0 0>
41+
, <&key_physical_attrs 100 100 350 312 1200 350 412>
42+
, <&key_physical_attrs 100 150 448 283 2400 448 433>
43+
, <&key_physical_attrs 100 150 652 283 (-2400) 752 433>
44+
, <&key_physical_attrs 100 100 750 312 (-1200) 850 412>
45+
, <&key_physical_attrs 100 100 850 312 0 0 0>
46+
;
47+
};
48+
};
49+
50+
&layouts_foostan_corne_position_map {
51+
five_column {
52+
physical-layout = <&foostan_corne_5col_layout>;
53+
positions
54+
= <36 0 1 2 3 4 5 6 7 8 9 37>
55+
, <38 10 11 12 13 14 15 16 17 18 19 39>
56+
, <40 20 21 22 23 24 25 26 27 28 29 41>
57+
, < 30 31 32 33 34 35 >;
58+
};
59+
};

‎app/dts/layouts/foostan/corne/6column.dtsi

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
#include <layouts/foostan/corne/position_map.dtsi>
2+
#include <physical_layouts.dtsi>
3+
4+
/ {
5+
foostan_corne_6col_layout: foostan_corne_6col_layout {
6+
compatible = "zmk,physical-layout";
7+
display-name = "6 Column";
8+
9+
keys // w h x y rot rx ry
10+
= <&key_physical_attrs 100 100 0 37 0 0 0>
11+
, <&key_physical_attrs 100 100 100 37 0 0 0>
12+
, <&key_physical_attrs 100 100 200 12 0 0 0>
13+
, <&key_physical_attrs 100 100 300 0 0 0 0>
14+
, <&key_physical_attrs 100 100 400 12 0 0 0>
15+
, <&key_physical_attrs 100 100 500 24 0 0 0>
16+
, <&key_physical_attrs 100 100 800 24 0 0 0>
17+
, <&key_physical_attrs 100 100 900 12 0 0 0>
18+
, <&key_physical_attrs 100 100 1000 0 0 0 0>
19+
, <&key_physical_attrs 100 100 1100 12 0 0 0>
20+
, <&key_physical_attrs 100 100 1200 37 0 0 0>
21+
, <&key_physical_attrs 100 100 1300 37 0 0 0>
22+
, <&key_physical_attrs 100 100 0 137 0 0 0>
23+
, <&key_physical_attrs 100 100 100 137 0 0 0>
24+
, <&key_physical_attrs 100 100 200 112 0 0 0>
25+
, <&key_physical_attrs 100 100 300 100 0 0 0>
26+
, <&key_physical_attrs 100 100 400 112 0 0 0>
27+
, <&key_physical_attrs 100 100 500 124 0 0 0>
28+
, <&key_physical_attrs 100 100 800 124 0 0 0>
29+
, <&key_physical_attrs 100 100 900 112 0 0 0>
30+
, <&key_physical_attrs 100 100 1000 100 0 0 0>
31+
, <&key_physical_attrs 100 100 1100 112 0 0 0>
32+
, <&key_physical_attrs 100 100 1200 137 0 0 0>
33+
, <&key_physical_attrs 100 100 1300 137 0 0 0>
34+
, <&key_physical_attrs 100 100 0 237 0 0 0>
35+
, <&key_physical_attrs 100 100 100 237 0 0 0>
36+
, <&key_physical_attrs 100 100 200 212 0 0 0>
37+
, <&key_physical_attrs 100 100 300 200 0 0 0>
38+
, <&key_physical_attrs 100 100 400 212 0 0 0>
39+
, <&key_physical_attrs 100 100 500 224 0 0 0>
40+
, <&key_physical_attrs 100 100 800 224 0 0 0>
41+
, <&key_physical_attrs 100 100 900 212 0 0 0>
42+
, <&key_physical_attrs 100 100 1000 200 0 0 0>
43+
, <&key_physical_attrs 100 100 1100 212 0 0 0>
44+
, <&key_physical_attrs 100 100 1200 237 0 0 0>
45+
, <&key_physical_attrs 100 100 1300 237 0 0 0>
46+
, <&key_physical_attrs 100 100 350 312 0 0 0>
47+
, <&key_physical_attrs 100 100 450 312 1200 450 412>
48+
, <&key_physical_attrs 100 150 548 283 2400 548 433>
49+
, <&key_physical_attrs 100 150 752 283 (-2400) 852 433>
50+
, <&key_physical_attrs 100 100 850 312 (-1200) 950 412>
51+
, <&key_physical_attrs 100 100 950 312 0 0 0>
52+
;
53+
};
54+
};
55+
56+
&layouts_foostan_corne_position_map {
57+
twelve {
58+
physical-layout = <&foostan_corne_6col_layout>;
59+
positions
60+
= < 0 1 2 3 4 5 6 7 8 9 10 11>
61+
, <12 13 14 15 16 17 18 19 20 21 22 23>
62+
, <24 25 26 27 28 29 30 31 32 33 34 35>
63+
, < 36 37 38 39 40 41 >;
64+
};
65+
};

‎app/dts/layouts/foostan/corne/position_map.dtsi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/ {
2+
layouts_foostan_corne_position_map: layouts_foostan_corne_position_map {
3+
compatible = "zmk,physical-layout-position-map";
4+
5+
complete;
6+
};
7+
};

0 commit comments

Comments
 (0)