Skip to content

Commit

Permalink
Remove deprecated label property
Browse files Browse the repository at this point in the history 
See: zmkfirmware/zmk#2028
  • Loading branch information
@aaronkollasch
aaronkollasch committed Feb 22, 2024
1 parent 9542f8e commit 1300f71
Showing 1 changed file with 12 additions and 36 deletions.
48 changes: 12 additions & 36 deletions config/corne.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
)
#define TOG_VIM_KEY_NOCTRL(key) \
tog_vim_noc_##key: tog_vim_noc_##key { \
label = ZMK_MACRO_STRINGIFY(ZM_TOG_VIM_NOC_ ## key); \
compatible = "zmk,behavior-mod-morph"; \
#binding-cells = <0>; \
bindings = <&tog_vim_##key>, <&kp key>; \
Expand Down Expand Up @@ -106,7 +105,6 @@

macros {
// esc_space: esc_space {
// label = "ZM_esc_space";
// compatible = "zmk,behavior-macro";
// #binding-cells = <0>;
// bindings
Expand All @@ -116,7 +114,6 @@
// ;
// };
next_win: next_win {
label = "ZM_next_win";
compatible = "zmk,behavior-macro";
#binding-cells = <0>;
bindings
Expand All @@ -127,7 +124,6 @@
;
};
next_app: next_app {
label = "ZM_next_app";
compatible = "zmk,behavior-macro";
#binding-cells = <0>;
bindings
Expand All @@ -138,7 +134,6 @@
;
};
next_app_win: next_app_win {
label = "ZM_next_app_win";
compatible = "zmk,behavior-macro";
#binding-cells = <0>;
bindings
Expand All @@ -149,7 +144,6 @@
;
};
pluseq: pluseq {
label = "ZM_plus_equals";
compatible = "zmk,behavior-macro";
#binding-cells = <0>;
bindings
Expand Down Expand Up @@ -180,71 +174,62 @@
behaviors {
// 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)>;
// };
comma_dqt: comma_double_quote {
compatible = "zmk,behavior-mod-morph";
label = "COMMA_DOUBLE_QUOTE";
#binding-cells = <0>;
bindings = <&kp COMMA>, <&kp DQT>;
mods = <(MOD_LSFT|MOD_RSFT)>;
keep-mods = <(MOD_RSFT)>;
};
dot_sqt: dot_single_quote {
compatible = "zmk,behavior-mod-morph";
label = "DOT_SINGLE_QUOTE";
#binding-cells = <0>;
bindings = <&kp DOT>, <&kp SQT>;
mods = <(MOD_LSFT|MOD_RSFT)>;
keep-mods = <(MOD_RSFT)>;
};
// comma_sqt: comma_single_quote {
// compatible = "zmk,behavior-mod-morph";
// label = "COMMA_SINGLE_QUOTE";
// #binding-cells = <0>;
// bindings = <&kp COMMA>, <&kp SQT>;
// mods = <(MOD_LSFT|MOD_RSFT)>;
// keep-mods = <(MOD_RSFT)>;
// };
// dot_dqt: dot_double_quote {
// compatible = "zmk,behavior-mod-morph";
// label = "DOT_DOUBLE_QUOTE";
// #binding-cells = <0>;
// bindings = <&kp DOT>, <&kp DQT>;
// mods = <(MOD_LSFT|MOD_RSFT)>;
// keep-mods = <(MOD_RSFT)>;
// };
undo_w: undo_w {
compatible = "zmk,behavior-mod-morph";
label = "UNDO_W";
#binding-cells = <0>;
bindings = <&kp undo>, <&kp W>;
mods = <(MOD_RGUI)>;
keep-mods = <(MOD_RGUI)>;
};
redo_q: redo_q {
compatible = "zmk,behavior-mod-morph";
label = "REDO_Q";
#binding-cells = <0>;
bindings = <&kp redo>, <&kp Q>;
mods = <(MOD_RGUI)>;
keep-mods = <(MOD_RGUI)>;
};
undo_w_osx: undo_w_osx {
compatible = "zmk,behavior-mod-morph";
label = "UNDO_W_OSX";
#binding-cells = <0>;
bindings = <&kp undo_OSX>, <&kp W>;
mods = <(MOD_RGUI)>;
keep-mods = <(MOD_RGUI)>;
};
redo_q_osx: redo_q_osx {
compatible = "zmk,behavior-mod-morph";
label = "REDO_Q_OSX";
#binding-cells = <0>;
bindings = <&kp redo_OSX>, <&kp Q>;
mods = <(MOD_RGUI)>;
Expand All @@ -253,7 +238,6 @@

// espmod: esc_space_mod {
// compatible = "zmk,behavior-hold-tap";
// label = "ESC_SPACE_MOD";
// #binding-cells = <2>;
// flavor = "hold-preferred";
// tapping-term-ms = <400>;
Expand All @@ -262,23 +246,20 @@
// };
skht: sticky_key_hold_tap {
compatible = "zmk,behavior-hold-tap";
label = "STICKY_KEY_HOLD_TAP";
#binding-cells = <2>;
flavor = "balanced";
tapping-term-ms = <150>;
bindings = <&kp>, <&sk>;
};
lthp: layer_tap_hold_preferred {
compatible = "zmk,behavior-hold-tap";
label = "LAYER_TAP_HOLD_PREFERRED";
#binding-cells = <2>;
flavor = "hold-preferred";
tapping-term-ms = <200>;
bindings = <&mo>, <&kp>;
};
ltb: layer_tap_balanced {
compatible = "zmk,behavior-hold-tap";
label = "LAYER_TAP_BALANCED";
#binding-cells = <2>;
flavor = "balanced";
tapping-term-ms = <150>;
Expand All @@ -287,31 +268,27 @@
};
// ltbr: layer_tap_balanced_repeat {
// compatible = "zmk,behavior-hold-tap";
// label = "LAYER_TAP_BALANCED_REPEAT";
// #binding-cells = <2>;
// flavor = "balanced";
// tapping-term-ms = <150>;
// bindings = <&mo>, <&key_repeat>;
// };
htbr: hold_tap_balanced_repeat {
compatible = "zmk,behavior-hold-tap";
label = "HOLD_TAP_BALANCED_REPEAT";
#binding-cells = <2>;
flavor = "balanced";
tapping-term-ms = <200>;
bindings = <&kp>, <&key_repeat>;
};

pc_connect: pc_connect{
label = "ZM_PC_CONNECT";
compatible = "zmk,behavior-macro";
#binding-cells = <0>;
wait-ms = <100>;
tap-ms = <5>;
bindings = <&bt BT_SEL 1 &to DEF>;
};
osx_connect: osx_connect{
label = "ZM_OSX_CONNECT";
compatible = "zmk,behavior-macro";
#binding-cells = <0>;
wait-ms = <100>;
Expand All @@ -322,7 +299,6 @@
// vim-specific bindings
lttogsp: layer_tap_toggle_space {
compatible = "zmk,behavior-hold-tap";
label = "LAYER_TAP_TOGGLE_SPACE";
#binding-cells = <2>;
flavor = "balanced";
tapping-term-ms = <150>;
Expand Down Expand Up @@ -376,7 +352,7 @@
compatible = "zmk,keymap";
// Colemak-DH
default_layer {
label = "DEF";
display-name = "DEF";
// -----------------------------------------------------------------------------------------
// | TAB | Q | W | F | P | B | | J | L | U | Y | ; | BKSP |
// | ESC | A | R | S | T | G | | M | N | E | I | O | ' |
Expand All @@ -391,7 +367,7 @@
};

default_osx_layer {
label = "DX";
display-name = "DX";
// -----------------------------------------------------------------------------------------
// | | | | | | | | | | | | | |
// | | | | | | | | | | | | | |
Expand All @@ -407,7 +383,7 @@

// Qwerty
default_qwerty_layer {
label = "QWE";
display-name = "QWE";
// -----------------------------------------------------------------------------------------
// | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP |
// | ESC | A | S | D | F | G | | H | J | K | L | ; | ' |
Expand All @@ -422,7 +398,7 @@
};

vim_layer {
label = "VIM";
display-name = "VIM";
// -----------------------------------------------------------------------------------------
// | | | W | | Preview | B | | C-I | C-D | C-U | C-O | | |
// | | A+EXIT | | S+EXIT | Stage | G | | H | J | K | L | :+EXIT | |
Expand All @@ -437,7 +413,7 @@
};

nav_layer {
label = "NAV";
display-name = "NAV";
// -----------------------------------------------------------------------------------------
// | TAB | NEXT WIN | NEXT APP | TAB LFT | TAB RGT | NEW TAB | | HOME | PGDN | PGUP | END | SCR LFT | BKSP |
// | ESC | SHFT | CTRL | ALT | CMD | CLOSE | | LFT | DWN | UP | RGT | ENT | |
Expand All @@ -452,7 +428,7 @@
};

nav_right_layer {
label = "NAV";
display-name = "NAV";
// -----------------------------------------------------------------------------------------
// | TAB | NEXT WIN | NEXT APP | TAB LFT | TAB RGT | NEW TAB | | HOME | PGDN | PGUP | END | SCR LFT | BKSP |
// | ESC | SHFT | CTRL | ALT | CMD | CLOSE | | LFT | DWN | UP | RGT | ENT | |
Expand All @@ -467,7 +443,7 @@
};

nav_osx_layer {
label = "NAV";
display-name = "NAV";
// -----------------------------------------------------------------------------------------
// | | | | | | NEW TAB | | | | | | SCR LFT | |
// | | | | | | CLOSE | | | | | | | |
Expand All @@ -482,7 +458,7 @@
};

sym_layer {
label = "SYM";
display-name = "SYM";
// -----------------------------------------------------------------------------------------
// | TAB | ` | @ | # | $ | % | | & | "|" | ( | ) | : | BKSP |
// | ESC | ~ | ! | = | _ | G | | - | \ | [ | ] | ' | \ |
Expand All @@ -497,7 +473,7 @@
};

num_layer {
label = "NUM";
display-name = "NUM";
// -----------------------------------------------------------------------------------------
// | TAB | SHFT| CTRL | ALT | CMD | % | | - | CMD | CTRL| ALT | SHFT| BKSP |
// | ESC | 7 | 8 | 9 | 0 | 6 | | 5 | 1 | 2 | 3 | 4 | |
Expand All @@ -512,7 +488,7 @@
};

fun_layer {
label = "FN";
display-name = "FN";
// -----------------------------------------------------------------------------------------
// | TAB | F7 | F8 | F9 | F10 | F6 | | F5 | F1 | F2 | F3 | F4 | BKSP |
// | ESC | SHFT | CTRL | ALT | CMD | F12 | | F11 | CMD | ALT | CTRL | SHFT | |
Expand All @@ -527,7 +503,7 @@
};

mouse_layer {
label = "MOU";
display-name = "MOU";
// -----------------------------------------------------------------------------------------
// | | | | | | ACC 2 | | SCL UP | SCL LFT | MOU UP | SCL RGT | | |
// | ESC | SHFT | CTRL | ALT | CMD | ACC 1 | | SCL DN | MOU LFT | MOU DN | MOU RGT | | |
Expand All @@ -542,7 +518,7 @@
};

sys_layer {
label = "SYS";
display-name = "SYS";
// -----------------------------------------------------------------------------------------
// | |BTCLR| | DEF | DEF_OSX | QWERTY | | | | | | | |
// | | BT3 | BT2 | PC connect | OSX connect | Reset | | Reset | | | | | |
Expand Down

0 comments on commit 1300f71

Please sign in to comment.