chore: update deprecations

calebdw · Jan 10, 2024 · 19a36ec · 19a36ec
1 parent 0e6f8ea
commit 19a36ec
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/config/behaviours.dtsi b/config/behaviours.dtsi
@@ -12,7 +12,6 @@
     behaviors { \
         NAME: NAME { \
             compatible = "zmk,behavior-mod-morph"; \
-            label = #NAME; \
             #binding-cells = <0>; \
             bindings = <BINDING>, <SHIFT_BINDING>; \
             mods = <(MOD_LSFT|MOD_RSFT)>; \
@@ -40,41 +39,36 @@ SHIFT_BEHAVIOUR(_caps_word, &caps_word, &kp CAPS)
     behaviors {
         mht: mht {
             compatible = "zmk,behavior-hold-tap";
-            label = "mht";
             #binding-cells = <2>;
-            tapping_term_ms = <TAPPING_TERM>;
+            tapping-term-ms = <TAPPING_TERM>;
             flavor = "tap-preferred";
             bindings = <&kp>, <&kp>;
         };
         lht: lht {
             compatible = "zmk,behavior-hold-tap";
-            label = "lht";
             #binding-cells = <2>;
-            tapping_term_ms = <TAPPING_TERM>;
+            tapping-term-ms = <TAPPING_TERM>;
             flavor = "tap-preferred";
             bindings = <&mo>, <&kp>;
         };
         bspc_del: backspace_delete {
             compatible = "zmk,behavior-mod-morph";
-            label = "BACKSPACE_DELETE";
             #binding-cells = <0>;
             bindings = <&kp BACKSPACE>, <&kp DELETE>;
             mods = <(MOD_LSFT|MOD_RSFT)>;
             keep-mods = <(MOD_RSFT)>;
         };
         lt_bdel: lt_backspace_delete {
             compatible = "zmk,behavior-hold-tap";
-            label = "lt_backspace_delete";
             #binding-cells = <2>;
-            tapping_term_ms = <TAPPING_TERM>;
+            tapping-term-ms = <TAPPING_TERM>;
             flavor = "tap-preferred";
             bindings = <&mo>, <&bspc_del>;
         };
         lt_krpt: lt_key_repeat {
             compatible = "zmk,behavior-hold-tap";
-            label = "lt_key_repeat";
             #binding-cells = <2>;
-            tapping_term_ms = <TAPPING_TERM>;
+            tapping-term-ms = <TAPPING_TERM>;
             flavor = "tap-preferred";
             bindings = <&mo>, <&key_repeat>;
         };

diff --git a/config/boards/shields/nice_view_custom/nice_view_custom.overlay b/config/boards/shields/nice_view_custom/nice_view_custom.overlay
@@ -8,7 +8,6 @@
     status = "okay";
     nice_view_custom: ls0xx@0 {
         compatible = "sharp,ls0xx";
-        label = "DISPLAY";
         spi-max-frequency = <1000000>;
         reg = <0>;
         width = <160>;

diff --git a/config/boards/shields/nice_view_custom/widgets/status.c b/config/boards/shields/nice_view_custom/widgets/status.c
@@ -276,7 +276,7 @@ static void layer_status_update_cb(struct layer_status_state state) {
 
 static struct layer_status_state layer_status_get_state(const zmk_event_t *eh) {
     uint8_t index = zmk_keymap_highest_layer_active();
-    return (struct layer_status_state){.index = index, .label = zmk_keymap_layer_label(index)};
+    return (struct layer_status_state){.index = index, .label = zmk_keymap_layer_name(index)};
 }
 
 ZMK_DISPLAY_WIDGET_LISTENER(widget_layer_status, struct layer_status_state, layer_status_update_cb,

diff --git a/config/corne.keymap b/config/corne.keymap
@@ -21,7 +21,7 @@
         // |                 | ESC | TAB | SPC | | RET | BCK | DEL |                 |
         // -----------------------------------------------------------------------------
         base {
-            label = "Base";
+            display-name = "Base";
             bindings = <
                 // Engram (https://engram.dev) Modified
                 // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
@@ -36,7 +36,7 @@
             >;
         };
         nav {
-            label = "Nav";
+            display-name = "Nav";
             bindings = <
                 // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
                     XXX           XXX           XXX           XXX           XXX           XXX               _RDO          _PST          _CPY          _CUT          _UND          XXX
@@ -50,7 +50,7 @@
             >;
         };
         num {
-            label = "Num";
+            display-name = "Num";
             bindings = <
                 // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
                     XXX           XXX           XXX           XXX           XXX           XXX               _MULT         &kp N7        &kp N8        &kp N9        &kp MINUS     XXX
@@ -64,7 +64,7 @@
             >;
         };
         sym {
-            label = "Sym";
+            display-name = "Sym";
             bindings = <
                 // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
                     XXX           &kp LT        &kp LBKT      &kp RBKT      &kp GT        &kp GRAVE         XXX           XXX           XXX           XXX           XXX           XXX
@@ -78,7 +78,7 @@
             >;
         };
         fun {
-            label = "Fun";
+            display-name = "Fun";
             bindings = <
                 // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
                     XXX           &kp F12       &kp F7        &kp F8        &kp F9        &kp PSCRN         XXX           XXX           XXX           XXX           XXX           XXX
@@ -93,7 +93,7 @@
         };
         button {
             // TODO: Add mouse buttons to thumb keys
-            label = "Button";
+            display-name = "Button";
             bindings = <
                 // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
                     XXX           _UND          _CUT          _CPY          _PST          _RDO              _RDO          _PST          _CPY          _CUT          _UND          XXX
@@ -107,7 +107,7 @@
             >;
         };
         media {
-            label = "Media";
+            display-name = "Media";
             bindings = <
                 // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
                     XXX           &bt_sel_0     &bt_sel_1     &bt_sel_2     &bt_sel_3     &bt_sel_4         XXX           XXX           XXX           XXX           XXX           XXX
@@ -121,7 +121,7 @@
             >;
         };
         mouse {
-            label = "Mouse";
+            display-name = "Mouse";
             bindings = <
                 // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
                     XXX           &kp F15       &kp F7        &kp F8        &kp F9        &kp F12           XXX           XXX           XXX           XXX           XXX           XXX

diff --git a/config/macros.dtsi b/config/macros.dtsi
@@ -11,7 +11,6 @@
          */
         bt_sel_clr: bt_sel_clr {
             compatible = "zmk,behavior-macro-one-param";
-            label = "ZM_BT_SEL_CLR";
             wait-ms = <0>;
             #binding-cells = <1>;
             bindings