Skip to content

Commit d4e8dee

Browse files
joelspadinjoelspadin
committed
refactor(keymaps): Rename layer label to "display-name"
Changed the property used to define a layer name for displays from "label" (which affects other things in Zephyr and is deprecated) to "display-name". (It cannot be named simply "name", because that has special meaning in newer versions of the devicetree compiler.) "label" is still supported as a fallback, so no changes need to be made to existing keymaps.
1 parent ba5637f commit d4e8dee

File tree

18 files changed

+51
-44
lines changed

18 files changed

+51
-44
lines changed

‎app/boards/arm/corneish_zen/corneish_zen.keymap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
compatible = "zmk,keymap";
2222

2323
default_layer {
24-
label = "QWERTY";
24+
display-name = "QWERTY";
2525
// --------------------------------------------------------------------------------
2626
// | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP |
2727
// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' |
@@ -36,7 +36,7 @@
3636
};
3737

3838
lower_layer {
39-
label = "NUMBER";
39+
display-name = "NUMBER";
4040
// -----------------------------------------------------------------------------------------
4141
// | TAB | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BKSP |
4242
// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 | | LFT | DWN | UP | RGT | | |
@@ -51,7 +51,7 @@
5151
};
5252

5353
raise_layer {
54-
label = "SYMBOL";
54+
display-name = "SYMBOL";
5555
// -----------------------------------------------------------------------------------------
5656
// | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP |
5757
// | CTRL | | | | | | | - | = | [ | ] | \ | ` |

‎app/boards/arm/corneish_zen/widgets/layer_status.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static void layer_status_update_cb(struct layer_status_state state) {
4545

4646
static struct layer_status_state layer_status_get_state(const zmk_event_t *eh) {
4747
uint8_t index = zmk_keymap_highest_layer_active();
48-
return (struct layer_status_state){.index = index, .label = zmk_keymap_layer_label(index)};
48+
return (struct layer_status_state){.index = index, .label = zmk_keymap_layer_name(index)};
4949
}
5050

5151
ZMK_DISPLAY_WIDGET_LISTENER(widget_layer_status, struct layer_status_state, layer_status_update_cb,

‎app/boards/shields/hummingbird/hummingbird.keymap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
};
6767

6868
nav_layer {
69-
label = "Nav";
69+
display-name = "Nav";
7070
bindings = <
7171
&trans &trans &trans &trans &trans &trans &kp HOME &kp UARW &kp PG_UP &trans
7272
&trans &trans &trans &trans &trans &trans &kp LARW &kp DARW &kp RARW &trans
@@ -76,7 +76,7 @@
7676
};
7777

7878
num_layer {
79-
label = "Num";
79+
display-name = "Num";
8080
bindings = <
8181
&kp LBKT &kp N7 &kp N8 &kp N9 &kp RBKT &trans &trans &trans &trans &trans
8282
&kp SEMI &kp N4 &kp N5 &kp N6 &kp EQUAL &trans &trans &trans &trans &trans
@@ -86,7 +86,7 @@
8686
};
8787

8888
sym_layer {
89-
label = "Sym";
89+
display-name = "Sym";
9090
bindings = <
9191
&kp LBRC &kp LS(N7) &kp LS(N8) &kp LS(N9) &kp RBRC &trans &trans &trans &trans &trans
9292
&kp COLON &kp LS(N4) &kp LS(N5) &kp LS(N6) &kp PLUS &trans &trans &trans &trans &trans

‎app/boards/shields/leeloo/leeloo.keymap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
compatible = "zmk,keymap";
2626

2727
default_layer {
28-
label = " QWERTY";
28+
display-name = " QWERTY";
2929
bindings = <
3030
&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSLH
3131
&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp GRAV
@@ -38,7 +38,7 @@
3838
};
3939

4040
lower_layer {
41-
label = " Lower";
41+
display-name = " Lower";
4242
bindings = <
4343
&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11
4444
&trans &trans &trans &trans &trans &trans &kp PG_UP &kp HOME &kp UP &kp END &trans &kp F12
@@ -51,7 +51,7 @@
5151
};
5252

5353
raise_layer {
54-
label = " Raise";
54+
display-name = " Raise";
5555
bindings = <
5656
&trans &trans &trans &trans &trans &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans
5757
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &sys_reset &bootloader

‎app/boards/shields/leeloo/leeloo_rev2.keymap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
compatible = "zmk,keymap";
3838

3939
default_layer {
40-
label = " QWERTY";
40+
display-name = " QWERTY";
4141
bindings = <
4242
&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSLH
4343
&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp GRAV
@@ -50,7 +50,7 @@
5050
};
5151

5252
lower_layer {
53-
label = " Lower";
53+
display-name = " Lower";
5454
bindings = <
5555
&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11
5656
&trans &trans &trans &trans &trans &trans &kp PG_UP &kp HOME &kp UP &kp END &trans &kp F12
@@ -63,7 +63,7 @@
6363
};
6464

6565
raise_layer {
66-
label = " Raise";
66+
display-name = " Raise";
6767
bindings = <
6868
&trans &trans &trans &trans &trans &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans
6969
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &sys_reset &bootloader

‎app/boards/shields/leeloo_micro/leeloo_micro.keymap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
compatible = "zmk,keymap";
7474

7575
default_layer {
76-
label = " QWERTY";
76+
display-name = " QWERTY";
7777
bindings = <
7878
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
7979
&kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI
@@ -85,7 +85,7 @@
8585
};
8686

8787
lower_layer {
88-
label = " Lower";
88+
display-name = " Lower";
8989
bindings = <
9090
&kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0
9191
&trans &trans &trans &trans &trans &trans &trans &trans &trans &kp QUOT
@@ -97,7 +97,7 @@
9797
};
9898

9999
raise_layer {
100-
label = " Raise";
100+
display-name = " Raise";
101101
bindings = <
102102
&kp TAB &trans &trans &trans &trans &kp PG_UP &kp HOME &kp UP &kp END &kp BSLH
103103
&kp CAPS &trans &trans &trans &trans &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &kp GRAVE
@@ -109,7 +109,7 @@
109109
};
110110

111111
adjust_layer {
112-
label = " Adjust";
112+
display-name = " Adjust";
113113
bindings = <
114114

115115
&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &trans &trans &trans &trans &trans
@@ -122,7 +122,7 @@
122122
};
123123

124124
numpad_layer {
125-
label = " NumPad";
125+
display-name = " NumPad";
126126
bindings = <
127127

128128
&trans &none &none &none &none &kp SLASH &kp N7 &kp N8 &kp N9 &kp MINUS
@@ -135,7 +135,7 @@ RGBOFF RGBEFF RGBHUD RGBSAD RGBBRD &trans &trans &no
135135
};
136136

137137
ble_layer {
138-
label = " BLE";
138+
display-name = " BLE";
139139
bindings = <
140140

141141
&bt BT0 &bt BT1 &bt BT2 &bt BT3 &bt BT4 &bt BT0 &bt BT1 &bt BT2 &bt BT3 &bt BT4

‎app/boards/shields/murphpad/murphpad.keymap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
compatible = "zmk,keymap";
5757

5858
default_layer {
59-
label = "default layer";
59+
display-name = "default layer";
6060
bindings = <
6161
&bt BT_CLR &kp TAB &kp F5 &kp LC(LA(C)) &kp LG(D)
6262
&rgb_ug RGB_TOG &kp ESC &kp KP_DIVIDE &kp KP_MULTIPLY &kp KP_MINUS
@@ -70,7 +70,7 @@
7070
};
7171

7272
fn_layer {
73-
label = "fn layer";
73+
display-name = "fn layer";
7474
bindings = <
7575
&trans &trans &trans &trans &trans
7676
&trans &kp KP_NUM &trans &trans &trans

‎app/boards/shields/nibble/nibble.keymap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
compatible = "zmk,keymap";
2020

2121
default_layer {
22-
label = "Default";
22+
display-name = "Default";
2323

2424
sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
2525

@@ -32,7 +32,7 @@
3232
>;
3333
};
3434
function_layer {
35-
label = "Function";
35+
display-name = "Function";
3636

3737
sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
3838

‎app/boards/shields/nice_view/widgets/status.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ static void layer_status_update_cb(struct layer_status_state state) {
276276

277277
static struct layer_status_state layer_status_get_state(const zmk_event_t *eh) {
278278
uint8_t index = zmk_keymap_highest_layer_active();
279-
return (struct layer_status_state){.index = index, .label = zmk_keymap_layer_label(index)};
279+
return (struct layer_status_state){.index = index, .label = zmk_keymap_layer_name(index)};
280280
}
281281

282282
ZMK_DISPLAY_WIDGET_LISTENER(widget_layer_status, struct layer_status_state, layer_status_update_cb,

‎app/boards/shields/reviung34/reviung34.keymap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
compatible = "zmk,keymap";
2626

2727
base {
28-
label = "Base";
28+
display-name = "Base";
2929
bindings = <
3030
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
3131
&kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI
@@ -35,7 +35,7 @@
3535
};
3636

3737
lower {
38-
label = "Lower";
38+
display-name = "Lower";
3939
bindings = <
4040
&kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp ASTRK &kp LPAR &kp RPAR
4141
&trans &kp TILDE &kp DQT &kp PIPE &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC
@@ -45,7 +45,7 @@
4545
};
4646

4747
upper {
48-
label = "Upper";
48+
display-name = "Upper";
4949
bindings = <
5050
&kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0
5151
&trans &kp GRAVE &kp SQT &kp BSLH &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT
@@ -55,7 +55,7 @@
5555
};
5656

5757
function {
58-
label = "Function";
58+
display-name = "Function";
5959
bindings = <
6060
&kp TAB &trans &kp C_VOL_UP &trans &trans &trans &trans &trans &trans &kp ENTER
6161
&kp ESC &kp C_BRI_DN &kp C_VOL_DN &kp C_BRI_UP &trans &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT
@@ -65,7 +65,7 @@
6565
};
6666

6767
meta {
68-
label = "Meta";
68+
display-name = "Meta";
6969
bindings = <
7070
&rgb_ug RGB_HUI &rgb_ug RGB_SAI &rgb_ug RGB_BRI &rgb_ug RGB_SPI &rgb_ug RGB_EFF &none &none &none &none &none
7171
&rgb_ug RGB_HUD &rgb_ug RGB_SAD &rgb_ug RGB_BRD &rgb_ug RGB_SPD &rgb_ug RGB_EFR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4

0 commit comments

Comments
 (0)