Jacob/zmk
1
0
Fork 0
forked from kofal.net/zmk
Code Pull Requests Activity

refactor: new physical layouts convention

Browse Source
This commit is contained in:
Nicolas Munnich
2024-11-05 15:29:33 +01:00
committed by Pete Johanson
parent a173be9d71
commit 99b8506437
31 changed files with 443 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/boards/shields/jiran/layouts/full.dtsi → app/boards/shields/jiran/jiran-layouts.dtsi
View File

@@ -1,6 +1,40 @@
#include <layouts/kgoh/jian/6column.dtsi>
#include <layouts/kgoh/jian/full.dtsi>
#include <physical_layouts.dtsi>
#include "position_map.dtsi"
&layouts_kgoh_jian_position_map {
ladniy_jiran_full_posmap: full_jiran {
physical-layout = <&ladniy_jiran_full_layout>;
positions
= < 0 1 2 3 4 5 6 7 8 9 10 11 >
, <12 13 14 15 16 17 18 19 20 21 22 23 24 25>
, < 26 27 28 29 30 31 32 33 34 35 36 37 >
, < 38 39 40 41 42 43 44 45 46 47 48 49 >
, < 50 51 52 53 54 55 >;
};
};
&kgoh_jian_full_posmap {
positions
= < 44 45 46 47 48 49 50 51 52 53 54 55 >
, < 0 1 2 3 4 5 6 7 8 9 10 11 12 13>
, < 14 15 16 17 18 19 20 21 22 23 24 25 >
, < 26 27 28 29 30 31 32 33 34 35 36 37 >
, < 38 39 40 41 42 43 >;
};
&kgoh_jian_6col_posmap {
positions
= < 42 43 44 45 46 47 48 49 50 51 52 53 >
, <54 0 1 2 3 4 5 6 7 8 9 10 11 55>
, < 12 13 14 15 16 17 18 19 20 21 22 23 >
, < 24 25 26 27 28 29 30 31 32 33 34 35 >
, < 36 37 38 39 40 41 >;
};
&kgoh_jian_full_layout {
display-name = "Jian (with pinky)";
};
/ {
ladniy_jiran_full_layout: ladniy_jiran_full_layout {
@@ -67,15 +101,3 @@
;
};
};
&layouts_ladniy_jiran_position_map {
ladniy_jiran_full_posmap: full {
physical-layout = <&ladniy_jiran_full_layout>;
positions
= < 0 1 2 3 4 5 6 7 8 9 10 11 >
, <12 13 14 15 16 17 18 19 20 21 22 23 24 25>
, < 26 27 28 29 30 31 32 33 34 35 36 37 >
, < 38 39 40 41 42 43 44 45 46 47 48 49 >
, < 50 51 52 53 54 55 >;
};
};

8
app/boards/shields/jiran/jiran.dtsi
View File

@@ -6,12 +6,10 @@
#include <dt-bindings/zmk/matrix_transform.h>
#include "layouts/full.dtsi"
#include "layouts/jian.dtsi"
#include "layouts/6column.dtsi"
#include "jiran-layouts.dtsi"
&ladniy_jiran_full_layout {
transform = <&default_transform>;
transform = <&jiran_transform>;
};
&kgoh_jian_full_layout {
@@ -28,7 +26,7 @@
zmk,physical-layout = &ladniy_jiran_full_layout;
};
default_transform: keymap_transform_0 {
jiran_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform";
columns = <12>;
rows = <5>;

2
app/boards/shields/jiran/jiran_right.overlay
View File

@@ -6,7 +6,7 @@
#include "jiran.dtsi"
&default_transform {
&jiran_transform {
col-offset = <6>;
};

20
app/boards/shields/jiran/layouts/6column.dtsi
View File

@@ -1,20 +0,0 @@
#include <layouts/kgoh/jian/6column.dtsi>
#include <physical_layouts.dtsi>
#include "position_map.dtsi"
&layouts_kgoh_jian_position_map {
status = "disabled";
};
&layouts_ladniy_jiran_position_map {
ladniy_jiran_6col_posmap: six {
physical-layout = <&kgoh_jian_6col_layout>;
positions
= < 42 43 44 45 46 47 48 49 50 51 52 53 >
, <54 0 1 2 3 4 5 6 7 8 9 10 11 55>
, < 12 13 14 15 16 17 18 19 20 21 22 23 >
, < 24 25 26 27 28 29 30 31 32 33 34 35 >
, < 36 37 38 39 40 41 >;
};
};

24
app/boards/shields/jiran/layouts/jian.dtsi
View File

@@ -1,24 +0,0 @@
#include <layouts/kgoh/jian/full.dtsi>
#include <physical_layouts.dtsi>
#include "position_map.dtsi"
&kgoh_jian_full_layout {
display-name = "Jian (with pinky)";
};
&layouts_kgoh_jian_position_map {
status = "disabled";
};
&layouts_ladniy_jiran_position_map {
ladniy_jiran_jian_posmap: jian {
physical-layout = <&kgoh_jian_full_layout>;
positions
= < 44 45 46 47 48 49 50 51 52 53 54 55 >
, < 0 1 2 3 4 5 6 7 8 9 10 11 12 13>
, < 14 15 16 17 18 19 20 21 22 23 24 25 >
, < 26 27 28 29 30 31 32 33 34 35 36 37 >
, < 38 39 40 41 42 43 >;
};
};

7
app/boards/shields/jiran/layouts/position_map.dtsi
View File

@@ -1,7 +0,0 @@
/ {
layouts_ladniy_jiran_position_map: layouts_ladniy_jiran_position_map {
compatible = "zmk,physical-layout-position-map";
complete;
};
};