From efc19be06212c199641964d18afd606d3c6c0b2a Mon Sep 17 00:00:00 2001 From: KemoNine Date: Mon, 12 Apr 2021 22:44:49 +0000 Subject: [PATCH] Update artsey v0.8 to match yaml definition and discord conversations --- config/artsey.dtsi | 181 +++++++++++++-------------------------------- 1 file changed, 50 insertions(+), 131 deletions(-) diff --git a/config/artsey.dtsi b/config/artsey.dtsi index b756782..e3746b9 100644 --- a/config/artsey.dtsi +++ b/config/artsey.dtsi @@ -91,29 +91,29 @@ *****************************************/ #if !defined ARTSEY_LAYER_CUSTOM #if defined ARTSEY_RIGHT -#define ARTSEY_LAYER_CUSTOM \ - custom { \ - label = "Custom"; \ - bindings = < \ - LEADING_NONES \ - &kp C_MUTE &kp INS &sk RCTRL &kp C_VOL_UP \ - MIDDLE_NONES \ - &sk RSHFT &kp PSCRN &sk RALT &kp C_VOL_DN \ - TRAILING_NONES \ - >; \ +#define ARTSEY_LAYER_CUSTOM \ + custom { \ + label = "Custom"; \ + bindings = < \ + LEADING_NONES \ + &kp C_MUTE &kp INS &kp C_VOL_UP &none \ + MIDDLE_NONES \ + &sk RSHFT &kp PSCRN &kp C_VOL_DN &mo LAYER_ID_CUSTOM \ + TRAILING_NONES \ + >; \ }; #endif #if defined ARTSEY_LEFT -#define ARTSEY_LAYER_CUSTOM \ - custom { \ - label = "Custom"; \ - bindings = < \ - LEADING_NONES \ - &kp C_VOL_UP &sk RCTRL &kp INS &kp C_MUTE \ - MIDDLE_NONES \ - &kp C_VOL_DN &sk RALT &kp PSCRN &sk RSHFT \ - TRAILING_NONES \ - >; \ +#define ARTSEY_LAYER_CUSTOM \ + custom { \ + label = "Custom"; \ + bindings = < \ + LEADING_NONES \ + &none &kp C_VOL_UP &kp INS &kp C_MUTE \ + MIDDLE_NONES \ + &mo LAYER_ID_CUSTOM &kp C_VOL_DN &kp PSCRN &sk RSHFT \ + TRAILING_NONES \ + >; \ }; #endif #endif @@ -127,10 +127,8 @@ #define LAYER_ID_SYMBOLS 2 #define LAYER_ID_PARENTHETICALS 3 #define LAYER_ID_NAVIGATION 4 -#define LAYER_ID_F_ONE_SIX 5 -#define LAYER_ID_F_SEVEN_TWELVE 6 -#define LAYER_ID_CUSTOM 7 -#define LAYER_ID_MOUSE 8 +#define LAYER_ID_CUSTOM 5 +#define LAYER_ID_MOUSE 6 /***************************************** * Define how long it takes for the combos/holds to 'time out' @@ -145,9 +143,6 @@ &sk { release-after-ms = <1000>; }; -&sl { - release-after-ms = <2000>; -}; /***************************************** * Standard ARTSEY combo definitions @@ -196,7 +191,7 @@ combo_zero { layers = ; timeout-ms = ; key-positions = ; bindings = <&kp N0>; }; combo_bt_nxt { key-positions = ; bindings = <&bt BT_NXT>; }; combo_bt_clr { key-positions = ; bindings = <&bt BT_CLR>; }; - combo_layer_custom { key-positions = ; bindings = <&tog LAYER_ID_CUSTOM>; }; + combo_layer_navigation { key-positions = ; bindings = <&tog LAYER_ID_NAVIGATION>; }; /* TODO: Setup/Enable once Mouse Keys feature(s) are added to ZMK */ //combo_mouse { timeout-ms = ; key-positions = ; bindings = <&none>; }; }; @@ -208,60 +203,24 @@ *****************************************/ / { behaviors { - layer_base_none: layer_base_none { compatible = "zmk,behavior-hold-tap"; label = "layer_base_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&to>, <&none>; }; layer_base_kp: layer_base_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_base_kp"; #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&kp>; }; - layer_base_sl: layer_base_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_base_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&sl>; }; - layer_numbers_none: layer_numbers_none { compatible = "zmk,behavior-hold-tap"; label = "layer_numbers_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&to>, <&none>; }; + bindings = <&mo>, <&kp>; }; layer_numbers_kp: layer_numbers_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_numbers_kp"; #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&kp>; }; - layer_numbers_sl: layer_numbers_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_numbers_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&sl>; }; - layer_symbols_none: layer_symbols_none { compatible = "zmk,behavior-hold-tap"; label = "layer_symbols_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&to>, <&none>; }; + bindings = <&mo>, <&kp>; }; layer_symbols_kp: layer_symbols_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_symbols_kp"; #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&kp>; }; - layer_symbols_sl: layer_symbols_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_symbols_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&sl>; }; - layer_parentheticals_none: layer_parentheticals_none { compatible = "zmk,behavior-hold-tap"; label = "layer_parentheticals_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&to>, <&none>; }; + bindings = <&mo>, <&kp>; }; layer_parentheticals_kp: layer_parentheticals_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_parentheticals_kp"; #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&kp>; }; - layer_parentheticals_sl: layer_parentheticals_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_parentheticals_sl"; + bindings = <&mo>, <&kp>; }; + layer_custom_kp: layer_custom_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_custom_kp"; #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&sl>; }; - layer_navigation_none: layer_navigation_none { compatible = "zmk,behavior-hold-tap"; label = "layer_navigation_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&to>, <&none>; }; - layer_navigation_kp: layer_navigation_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_navigation_kp"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&kp>; }; - layer_navigation_sl: layer_navigation_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_navigation_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&to>, <&sl>; }; - layer_mouse_none: layer_mouse_none { compatible = "zmk,behavior-hold-tap"; label = "layer_mouse_none"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "hold-preferred"; - bindings = <&tog>, <&none>; }; + bindings = <&mo>, <&kp>; }; layer_mouse_kp: layer_mouse_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_mouse_kp"; #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&tog>, <&kp>; }; - layer_mouse_sl: layer_mouse_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_mouse_sl"; - #binding-cells = <2>; tapping_term_ms = ; flavor = "tap-preferred"; - bindings = <&tog>, <&sl>; }; + bindings = <&mo>, <&kp>; }; }; }; @@ -277,9 +236,9 @@ label = "ARTSEY"; bindings = < LEADING_NONES - &layer_parentheticals_kp LAYER_ID_PARENTHETICALS A &kp R &kp T &layer_numbers_kp LAYER_ID_NUMBERS S + &layer_parentheticals_kp LAYER_ID_PARENTHETICALS A &kp R &kp T &layer_numbers_kp LAYER_ID_NUMBERS S MIDDLE_NONES - &layer_symbols_kp LAYER_ID_SYMBOLS E &kp Y &kp I &layer_navigation_kp LAYER_ID_NAVIGATION O + &layer_symbols_kp LAYER_ID_SYMBOLS E &kp Y &kp I &layer_custom_kp LAYER_ID_CUSTOM O TRAILING_NONES >; }; @@ -287,9 +246,9 @@ label = "Number"; bindings = < LEADING_NONES - &layer_parentheticals_kp LAYER_ID_PARENTHETICALS N1 &kp N2 &kp N3 &layer_base_sl LAYER_ID_BASE LAYER_ID_F_ONE_SIX + &kp N1 &kp N2 &kp N3 &mo LAYER_ID_NUMBERS MIDDLE_NONES - &layer_symbols_kp LAYER_ID_SYMBOLS N4 &kp N5 &kp N6 &layer_navigation_sl LAYER_ID_NAVIGATION LAYER_ID_F_SEVEN_TWELVE + &kp N4 &kp N5 &kp N6 &none TRAILING_NONES >; }; @@ -297,9 +256,9 @@ label = "Symbol"; bindings = < LEADING_NONES - &layer_parentheticals_kp LAYER_ID_PARENTHETICALS EXCL &kp BSLH &kp SEMI &layer_numbers_kp LAYER_ID_NUMBERS GRAVE + &kp EXCL &kp BSLH &kp SEMI &kp GRAVE MIDDLE_NONES - &layer_base_kp LAYER_ID_BASE QMARK &kp MINUS &kp EQUAL &layer_navigation_none LAYER_ID_NAVIGATION 0 + &mo LAYER_ID_SYMBOLS &kp QMARK &kp MINUS &kp EQUAL TRAILING_NONES >; }; @@ -307,9 +266,9 @@ label = "Paren"; bindings = < LEADING_NONES - &layer_base_none LAYER_ID_BASE 0 &kp LPAR &kp RPAR &layer_numbers_kp LAYER_ID_NUMBERS LBRC + &mo LAYER_ID_PARENTHETICALS &kp LPAR &kp RPAR &kp LBRC MIDDLE_NONES - &layer_symbols_none LAYER_ID_SYMBOLS 0 &kp LBKT &kp RBKT &layer_navigation_kp LAYER_ID_NAVIGATION RBRC + &none &kp LBKT &kp RBKT &kp RBRC TRAILING_NONES >; }; @@ -317,29 +276,9 @@ label = "Nav"; bindings = < LEADING_NONES - &layer_base_kp LAYER_ID_BASE HOME &kp UP &kp END &kp PG_UP + &kp HOME &kp UP &kp END &kp PG_UP MIDDLE_NONES - &kp LEFT &kp DOWN &kp RIGHT &kp PG_DN - TRAILING_NONES - >; - }; - f_one_to_six{ - label = "F1-F6"; - bindings = < - LEADING_NONES - &layer_parentheticals_kp LAYER_ID_PARENTHETICALS F1 &kp F2 &kp F3 &layer_numbers_none LAYER_ID_NUMBERS 0 - MIDDLE_NONES - &layer_symbols_kp LAYER_ID_SYMBOLS F4 &kp F5 &kp F6 &layer_navigation_none LAYER_ID_NAVIGATION 0 - TRAILING_NONES - >; - }; - f_seven_to_twelve { - label = "F7-F12"; - bindings = < - LEADING_NONES - &layer_parentheticals_kp LAYER_ID_PARENTHETICALS F7 &kp F8 &kp F9 &layer_numbers_none LAYER_ID_NUMBERS 0 - MIDDLE_NONES - &layer_symbols_kp LAYER_ID_SYMBOLS F10 &kp F11 &kp F12 &layer_navigation_none LAYER_ID_NAVIGATION 0 + &kp LEFT &kp DOWN &kp RIGHT &kp PG_DN TRAILING_NONES >; }; @@ -367,9 +306,9 @@ label = "ARTSEY"; bindings = < LEADING_NONES - &layer_numbers_kp LAYER_ID_NUMBERS S &kp T &kp R &layer_parentheticals_kp LAYER_ID_PARENTHETICALS A + &layer_numbers_kp LAYER_ID_NUMBERS S &kp T &kp R &layer_parentheticals_kp LAYER_ID_PARENTHETICALS A MIDDLE_NONES - &layer_navigation_kp LAYER_ID_NAVIGATION O &kp I &kp Y &layer_symbols_kp LAYER_ID_SYMBOLS E + &layer_custom_kp LAYER_ID_CUSTOM O &kp I &kp Y &layer_symbols_kp LAYER_ID_SYMBOLS E TRAILING_NONES >; }; @@ -377,9 +316,9 @@ label = "Number"; bindings = < LEADING_NONES - &layer_base_sl LAYER_ID_BASE LAYER_ID_F_ONE_SIX &kp N3 &kp N2 &layer_parentheticals_kp LAYER_ID_PARENTHETICALS N1 + &mo LAYER_ID_NUMBERS &kp N3 &kp N2 &kp N1 MIDDLE_NONES - &layer_navigation_sl LAYER_ID_NAVIGATION LAYER_ID_F_SEVEN_TWELVE &kp N6 &kp N5 &layer_symbols_kp LAYER_ID_SYMBOLS N4 + &none &kp N6 &kp N5 &kp N4 TRAILING_NONES >; }; @@ -387,9 +326,9 @@ label = "Symbol"; bindings = < LEADING_NONES - &layer_numbers_kp LAYER_ID_NUMBERS GRAVE &kp SEMI &kp BSLH &layer_parentheticals_kp LAYER_ID_PARENTHETICALS EXCL + &kp GRAVE &kp SEMI &kp BSLH &kp EXCL MIDDLE_NONES - &layer_navigation_none LAYER_ID_NAVIGATION 0 &kp EQUAL &kp MINUS &layer_base_kp LAYER_ID_BASE QMARK + &kp EQUAL &kp MINUS &kp QMARK &mo LAYER_ID_SYMBOLS TRAILING_NONES >; }; @@ -397,9 +336,9 @@ label = "Paren"; bindings = < LEADING_NONES - &layer_numbers_kp LAYER_ID_NUMBERS LBRC &kp LPAR &kp RPAR &layer_base_none LAYER_ID_BASE 0 + &kp LBRC &kp LPAR &kp RPAR &mo LAYER_ID_PARENTHETICALS MIDDLE_NONES - &layer_navigation_kp LAYER_ID_NAVIGATION RBRC &kp LBKT &kp RBKT &layer_symbols_none LAYER_ID_SYMBOLS 0 + &kp RBRC &kp LBKT &kp RBKT &none TRAILING_NONES >; }; @@ -407,29 +346,9 @@ label = "Nav"; bindings = < LEADING_NONES - &kp PG_UP &kp HOME &kp UP &layer_base_kp LAYER_ID_BASE END + &kp PG_UP &kp HOME &kp UP &kp END MIDDLE_NONES - &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT - TRAILING_NONES - >; - }; - f_one_to_six{ - label = "F1-F6"; - bindings = < - LEADING_NONES - &layer_numbers_none LAYER_ID_NUMBERS 0 &kp F3 &kp F2 &layer_parentheticals_kp LAYER_ID_PARENTHETICALS F1 - MIDDLE_NONES - &layer_navigation_none LAYER_ID_NAVIGATION 0 &kp F6 &kp F5 &layer_symbols_kp LAYER_ID_SYMBOLS F4 - TRAILING_NONES - >; - }; - f_seven_to_twelve { - label = "F7-F12"; - bindings = < - LEADING_NONES - &layer_numbers_none LAYER_ID_NUMBERS 0 &kp F9 &kp F8 &layer_parentheticals_kp LAYER_ID_PARENTHETICALS F7 - MIDDLE_NONES - &layer_navigation_none LAYER_ID_NAVIGATION 0 &kp F12 &kp F11 &layer_symbols_kp LAYER_ID_SYMBOLS F10 + &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT TRAILING_NONES >; };