1
0
Fork 0

Merge branch 'v0.8' into main

This commit is contained in:
KemoNine 2021-04-13 20:07:31 +00:00
commit 420a1460e4
14 changed files with 189 additions and 165 deletions

View file

@ -16,7 +16,9 @@ jobs:
- board: nice_nano - board: nice_nano
shield: corne_artsey_right shield: corne_artsey_right
- board: nice_nano - board: nice_nano
shield: the_paintbrush shield: the_paintbrush_left
- board: nice_nano
shield: the_paintbrush_right
- board: nice_nano - board: nice_nano
shield: corne_5_col_artsey_left shield: corne_5_col_artsey_left
- board: nice_nano - board: nice_nano

View file

@ -83,6 +83,41 @@
// #define MIDDLE_NONES NONE(0, 0, 3) // #define MIDDLE_NONES NONE(0, 0, 3)
// #define TRAILING_NONES NONE(0, 1, 0) // #define TRAILING_NONES NONE(0, 1, 0)
/*****************************************
* Define custom layer
*
* You can override this layer by copy/pasting the into your keymap *before* including the artsey.dtsi file
* Once added to your keymap you can adjust as you see fit
*****************************************/
#if !defined ARTSEY_LAYER_CUSTOM
#if defined ARTSEY_RIGHT
#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 \
&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
/***************************************** /*****************************************
* Layer IDs used by the ARTSEY keymap * Layer IDs used by the ARTSEY keymap
* Do NOT change these and do NOT change the order of the layers as shown below * Do NOT change these and do NOT change the order of the layers as shown below
@ -92,22 +127,22 @@
#define LAYER_ID_SYMBOLS 2 #define LAYER_ID_SYMBOLS 2
#define LAYER_ID_PARENTHETICALS 3 #define LAYER_ID_PARENTHETICALS 3
#define LAYER_ID_NAVIGATION 4 #define LAYER_ID_NAVIGATION 4
#define LAYER_ID_F_ONE_SIX 5 #define LAYER_ID_CUSTOM 5
#define LAYER_ID_F_SEVEN_TWELVE 6 #define LAYER_ID_MOUSE 6
#define LAYER_ID_MOUSE 7
/***************************************** /*****************************************
* Define how long it takes for the combos/holds to 'time out' * Define how long it takes for the combos/holds to 'time out'
* See documentation on "combos" for more detail * See documentation on "combos" for more detail
*****************************************/ *****************************************/
#if !defined TIMEOUT_COMBO
#define TIMEOUT_COMBO 250 #define TIMEOUT_COMBO 250
#endif
#if !defined TIMEOUT_LAYER_HOLD
#define TIMEOUT_LAYER_HOLD 500 #define TIMEOUT_LAYER_HOLD 500
#endif
&sk { &sk {
release-after-ms = <1000>; release-after-ms = <1000>;
}; };
&sl {
release-after-ms = <2000>;
};
/***************************************** /*****************************************
* Standard ARTSEY combo definitions * Standard ARTSEY combo definitions
@ -136,22 +171,27 @@
combo_z { layers = <LAYER_ID_BASE>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_R KEY_T KEY_S>; bindings = <&kp Z>; }; combo_z { layers = <LAYER_ID_BASE>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_R KEY_T KEY_S>; bindings = <&kp Z>; };
combo_enter { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_E>; bindings = <&kp ENTER>; }; combo_enter { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_E>; bindings = <&kp ENTER>; };
combo_esc { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_R KEY_O>; bindings = <&kp ESC>; }; combo_esc { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_R KEY_O>; bindings = <&kp ESC>; };
combo_single_quote { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_Y KEY_I>; bindings = <&kp SQT>; }; combo_single_quote { layers = <LAYER_ID_BASE>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_Y KEY_I>; bindings = <&kp SQT>; };
combo_tab { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_R KEY_T KEY_O>; bindings = <&kp TAB>; }; combo_tab { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_R KEY_T KEY_O>; bindings = <&kp TAB>; };
combo_dot { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_Y>; bindings = <&kp PERIOD>; }; combo_dot { layers = <LAYER_ID_BASE>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_Y>; bindings = <&kp PERIOD>; };
combo_control { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_E KEY_S>; bindings = <&sk LCTRL>; }; combo_control { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_E KEY_S>; bindings = <&sk LCTRL>; };
combo_comma { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_I>; bindings = <&kp COMMA>; }; combo_comma { layers = <LAYER_ID_BASE>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_I>; bindings = <&kp COMMA>; };
combo_gui { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_Y KEY_S>; bindings = <&sk LGUI>; }; combo_gui { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_Y KEY_S>; bindings = <&sk LGUI>; };
combo_slash { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_O>; bindings = <&kp SLASH>; }; combo_slash { layers = <LAYER_ID_BASE>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_O>; bindings = <&kp SLASH>; };
combo_alt { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_I KEY_S>; bindings = <&sk LALT>; }; combo_alt { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_I KEY_S>; bindings = <&sk LALT>; };
combo_exclamation { layers = <LAYER_ID_BASE>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_T KEY_I>; bindings = <&kp EXCL>; };
combo_backspace { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_E KEY_R>; bindings = <&kp BACKSPACE>; }; combo_backspace { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_E KEY_R>; bindings = <&kp BACKSPACE>; };
combo_shift { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_E KEY_R KEY_T KEY_S>; bindings = <&sk LSHFT>; }; combo_shift { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_E KEY_R KEY_T KEY_S>; bindings = <&sk LSHFT>; };
combo_space { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_E KEY_Y KEY_I KEY_O>; bindings = <&kp SPACE>; }; combo_space { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_E KEY_Y KEY_I KEY_O>; bindings = <&kp SPACE>; };
combo_shift_lock { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_Y KEY_I KEY_O>; bindings = <&kp CAPS>; }; combo_shift_lock { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_R KEY_Y>; bindings = <&kp CAPS>; };
combo_caps_lock { layers = <LAYER_ID_BASE>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_O KEY_I KEY_Y KEY_A>; bindings = <&kp CAPS>; };
combo_seven { layers = <LAYER_ID_NUMBERS>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_R>; bindings = <&kp N7>; }; combo_seven { layers = <LAYER_ID_NUMBERS>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_R>; bindings = <&kp N7>; };
combo_eight { layers = <LAYER_ID_NUMBERS>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_R KEY_T>; bindings = <&kp N8>; }; combo_eight { layers = <LAYER_ID_NUMBERS>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_R KEY_T>; bindings = <&kp N8>; };
combo_nine { layers = <LAYER_ID_NUMBERS>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_E KEY_Y>; bindings = <&kp N9>; }; combo_nine { layers = <LAYER_ID_NUMBERS>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_E KEY_Y>; bindings = <&kp N9>; };
combo_zero { layers = <LAYER_ID_NUMBERS>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_Y KEY_I>; bindings = <&kp N0>; }; combo_zero { layers = <LAYER_ID_NUMBERS>; timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_Y KEY_I>; bindings = <&kp N0>; };
combo_bt_nxt { key-positions = <KEY_A KEY_E KEY_S KEY_O>; bindings = <&bt BT_NXT>; };
combo_bt_clr { key-positions = <KEY_R KEY_Y KEY_T KEY_I>; bindings = <&bt BT_CLR>; };
combo_layer_navigation { key-positions = <KEY_R KEY_E KEY_I>; bindings = <&tog LAYER_ID_NAVIGATION>; };
/* TODO: Setup/Enable once Mouse Keys feature(s) are added to ZMK */ /* TODO: Setup/Enable once Mouse Keys feature(s) are added to ZMK */
//combo_mouse { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_T KEY_Y>; bindings = <&none>; }; //combo_mouse { timeout-ms = <TIMEOUT_COMBO>; key-positions = <KEY_A KEY_T KEY_Y>; bindings = <&none>; };
}; };
@ -163,60 +203,24 @@
*****************************************/ *****************************************/
/ { / {
behaviors { behaviors {
layer_base_none: layer_base_none { compatible = "zmk,behavior-hold-tap"; label = "layer_base_none";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "hold-preferred";
bindings = <&to>, <&none>; };
layer_base_kp: layer_base_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_base_kp"; layer_base_kp: layer_base_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_base_kp";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred"; #binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
bindings = <&to>, <&kp>; }; bindings = <&mo>, <&kp>; };
layer_base_sl: layer_base_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_base_sl";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; 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 = <TIMEOUT_LAYER_HOLD>; flavor = "hold-preferred";
bindings = <&to>, <&none>; };
layer_numbers_kp: layer_numbers_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_numbers_kp"; layer_numbers_kp: layer_numbers_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_numbers_kp";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred"; #binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
bindings = <&to>, <&kp>; }; bindings = <&mo>, <&kp>; };
layer_numbers_sl: layer_numbers_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_numbers_sl";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; 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 = <TIMEOUT_LAYER_HOLD>; flavor = "hold-preferred";
bindings = <&to>, <&none>; };
layer_symbols_kp: layer_symbols_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_symbols_kp"; layer_symbols_kp: layer_symbols_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_symbols_kp";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred"; #binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
bindings = <&to>, <&kp>; }; bindings = <&mo>, <&kp>; };
layer_symbols_sl: layer_symbols_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_symbols_sl";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; 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 = <TIMEOUT_LAYER_HOLD>; flavor = "hold-preferred";
bindings = <&to>, <&none>; };
layer_parentheticals_kp: layer_parentheticals_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_parentheticals_kp"; layer_parentheticals_kp: layer_parentheticals_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_parentheticals_kp";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred"; #binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
bindings = <&to>, <&kp>; }; bindings = <&mo>, <&kp>; };
layer_parentheticals_sl: layer_parentheticals_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_parentheticals_sl"; layer_custom_kp: layer_custom_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_custom_kp";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred"; #binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
bindings = <&to>, <&sl>; }; bindings = <&mo>, <&kp>; };
layer_navigation_none: layer_navigation_none { compatible = "zmk,behavior-hold-tap"; label = "layer_navigation_none";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; 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 = <TIMEOUT_LAYER_HOLD>; 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 = <TIMEOUT_LAYER_HOLD>; 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 = <TIMEOUT_LAYER_HOLD>; flavor = "hold-preferred";
bindings = <&tog>, <&none>; };
layer_mouse_kp: layer_mouse_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_mouse_kp"; layer_mouse_kp: layer_mouse_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_mouse_kp";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred"; #binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
bindings = <&tog>, <&kp>; }; bindings = <&mo>, <&kp>; };
layer_mouse_sl: layer_mouse_sl { compatible = "zmk,behavior-hold-tap"; label = "layer_mouse_sl";
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
bindings = <&tog>, <&sl>; };
}; };
}; };
@ -234,7 +238,7 @@
LEADING_NONES 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 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 TRAILING_NONES
>; >;
}; };
@ -242,9 +246,9 @@
label = "Number"; label = "Number";
bindings = < bindings = <
LEADING_NONES 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 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 TRAILING_NONES
>; >;
}; };
@ -252,9 +256,9 @@
label = "Symbol"; label = "Symbol";
bindings = < bindings = <
LEADING_NONES LEADING_NONES
&layer_parentheticals_none LAYER_ID_PARENTHETICALS 0 &kp BSLH &kp SEMI &layer_numbers_kp LAYER_ID_NUMBERS GRAVE &kp EXCL &kp BSLH &kp SEMI &kp GRAVE
MIDDLE_NONES MIDDLE_NONES
&layer_base_none LAYER_ID_BASE 0 &kp MINUS &kp EQUAL &layer_navigation_none LAYER_ID_NAVIGATION 0 &mo LAYER_ID_SYMBOLS &kp QMARK &kp MINUS &kp EQUAL
TRAILING_NONES TRAILING_NONES
>; >;
}; };
@ -262,9 +266,9 @@
label = "Paren"; label = "Paren";
bindings = < bindings = <
LEADING_NONES 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 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 TRAILING_NONES
>; >;
}; };
@ -272,32 +276,13 @@
label = "Nav"; label = "Nav";
bindings = < bindings = <
LEADING_NONES LEADING_NONES
&layer_parentheticals_kp LAYER_ID_PARENTHETICALS HOME &kp UP &kp END &layer_numbers_none LAYER_ID_NUMBERS PG_UP &kp HOME &kp UP &kp END &kp PG_UP
MIDDLE_NONES MIDDLE_NONES
&layer_symbols_kp LAYER_ID_SYMBOLS LEFT &kp DOWN &kp RIGHT &layer_base_none LAYER_ID_BASE PG_DN &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
TRAILING_NONES TRAILING_NONES
>; >;
}; };
ARTSEY_LAYER_CUSTOM
// mouse { /* TODO: Not implemented yet, needs mouse keys in upstream */ // mouse { /* TODO: Not implemented yet, needs mouse keys in upstream */
// label = "Mouse"; // label = "Mouse";
// bindings = < // bindings = <
@ -323,7 +308,7 @@
LEADING_NONES 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 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 TRAILING_NONES
>; >;
}; };
@ -331,9 +316,9 @@
label = "Number"; label = "Number";
bindings = < bindings = <
LEADING_NONES 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 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 TRAILING_NONES
>; >;
}; };
@ -341,9 +326,9 @@
label = "Symbol"; label = "Symbol";
bindings = < bindings = <
LEADING_NONES LEADING_NONES
&layer_numbers_kp LAYER_ID_NUMBERS GRAVE &kp SEMI &kp BSLH &layer_parentheticals_none LAYER_ID_PARENTHETICALS 0 &kp GRAVE &kp SEMI &kp BSLH &kp EXCL
MIDDLE_NONES MIDDLE_NONES
&layer_navigation_none LAYER_ID_NAVIGATION 0 &kp EQUAL &kp MINUS &layer_base_none LAYER_ID_BASE 0 &kp EQUAL &kp MINUS &kp QMARK &mo LAYER_ID_SYMBOLS
TRAILING_NONES TRAILING_NONES
>; >;
}; };
@ -351,9 +336,9 @@
label = "Paren"; label = "Paren";
bindings = < bindings = <
LEADING_NONES 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 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 TRAILING_NONES
>; >;
}; };
@ -361,32 +346,13 @@
label = "Nav"; label = "Nav";
bindings = < bindings = <
LEADING_NONES LEADING_NONES
&layer_numbers_kp LAYER_ID_NUMBERS PG_UP &kp HOME &kp UP &layer_parentheticals_kp LAYER_ID_PARENTHETICALS END &kp PG_UP &kp HOME &kp UP &kp END
MIDDLE_NONES MIDDLE_NONES
&layer_base_kp LAYER_ID_BASE PG_DN &kp LEFT &kp DOWN &layer_symbols_kp LAYER_ID_SYMBOLS RIGHT &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
TRAILING_NONES TRAILING_NONES
>; >;
}; };
ARTSEY_LAYER_CUSTOM
// mouse { /* TODO: Not implemented yet, needs mouse keys in upstream */ // mouse { /* TODO: Not implemented yet, needs mouse keys in upstream */
// label = "Mouse"; // label = "Mouse";
// bindings = < // bindings = <

View file

@ -34,12 +34,3 @@
// Include main artsey.io keymap // Include main artsey.io keymap
#include "../../../artsey.dtsi" #include "../../../artsey.dtsi"
/ {
combos {
compatible = "zmk,combos";
chord_bt_clr { key-positions = <THUMB_1 THUMB_3>; bindings = <&bt BT_CLR>; };
chord_bt_prv { key-positions = <THUMB_1 THUMB_2>; bindings = <&bt BT_PRV>; };
chord_bt_nxt { key-positions = <THUMB_2 THUMB_3>; bindings = <&bt BT_NXT>; };
};
};

View file

@ -34,12 +34,3 @@
// Include main artsey.io keymap // Include main artsey.io keymap
#include "../../../artsey.dtsi" #include "../../../artsey.dtsi"
/ {
combos {
compatible = "zmk,combos";
chord_bt_clr { key-positions = <THUMB_1 THUMB_3>; bindings = <&bt BT_CLR>; };
chord_bt_prv { key-positions = <THUMB_1 THUMB_2>; bindings = <&bt BT_PRV>; };
chord_bt_nxt { key-positions = <THUMB_2 THUMB_3>; bindings = <&bt BT_NXT>; };
};
};

View file

@ -34,12 +34,3 @@
// Include main artsey.io keymap // Include main artsey.io keymap
#include "../../../artsey.dtsi" #include "../../../artsey.dtsi"
/ {
combos {
compatible = "zmk,combos";
chord_bt_clr { key-positions = <THUMB_1 THUMB_3>; bindings = <&bt BT_CLR>; };
chord_bt_prv { key-positions = <THUMB_1 THUMB_2>; bindings = <&bt BT_PRV>; };
chord_bt_nxt { key-positions = <THUMB_2 THUMB_3>; bindings = <&bt BT_NXT>; };
};
};

View file

@ -34,12 +34,3 @@
// Include main artsey.io keymap // Include main artsey.io keymap
#include "../../../artsey.dtsi" #include "../../../artsey.dtsi"
/ {
combos {
compatible = "zmk,combos";
chord_bt_clr { key-positions = <THUMB_1 THUMB_3>; bindings = <&bt BT_CLR>; };
chord_bt_prv { key-positions = <THUMB_1 THUMB_2>; bindings = <&bt BT_PRV>; };
chord_bt_nxt { key-positions = <THUMB_2 THUMB_3>; bindings = <&bt BT_NXT>; };
};
};

View file

@ -1,4 +1,4 @@
if SHIELD_THE_PAINTBRUSH if SHIELD_THE_PAINTBRUSH_LEFT || SHIELD_THE_PAINTBRUSH_RIGHT
config ZMK_KEYBOARD_NAME config ZMK_KEYBOARD_NAME
default "The Paintbrush" default "The Paintbrush"

View file

@ -1,5 +1,8 @@
# Copyright (c) 2021 Mike "KemoNine" Crosson # Copyright (c) 2021 Mike "KemoNine" Crosson
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
config SHIELD_THE_PAINTBRUSH config SHIELD_THE_PAINTBRUSH_LEFT
def_bool $(shields_list_contains,the_paintbrush) def_bool $(shields_list_contains,the_paintbrush_left)
config SHIELD_THE_PAINTBRUSH_RIGHT
def_bool $(shields_list_contains,the_paintbrush_right)

View file

@ -0,0 +1,31 @@
/*
* Copyright (c) 2021 Mike "KemoNine" Crosson
*
* SPDX-License-Identifier: MIT
*/
#include <behaviors.dtsi>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/bt.h>
// Left/Right
#define ARTSEY_LEFT 1
// ARTS Row
#define KEY_A 3
#define KEY_R 2
#define KEY_T 1
#define KEY_S 0
// EYIO Row
#define KEY_E 7
#define KEY_Y 6
#define KEY_I 5
#define KEY_O 4
// Define Offsets
#define LEADING_NONES NONE(0,0,0)
#define MIDDLE_NONES NONE(0, 0, 0)
#define TRAILING_NONES NONE(0, 0, 0)
// Include main artsey.io keymap
#include "../../../artsey.dtsi"

View file

@ -0,0 +1,50 @@
/*
* Copyright (c) 2021 Mike "KemoNine" Crosson
*
* SPDX-License-Identifier: MIT
*/
#include <dt-bindings/zmk/matrix_transform.h>
/ {
chosen {
zmk,kscan = &kscan0;
};
kscan0: kscan_0 {
compatible = "zmk,kscan-gpio-direct";
label = "KSCAN";
input-gpios
= <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_a 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_d 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_d 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
;
};
};
&pro_micro_i2c {
status = "okay";
oled: ssd1306@3c {
compatible = "solomon,ssd1306fb";
reg = <0x3c>;
label = "DISPLAY";
width = <128>;
height = <32>;
segment-offset = <0>;
page-offset = <0>;
display-offset = <0>;
multiplex-ratio = <31>;
segment-remap;
com-invdir;
com-sequential;
prechargep = <0x22>;
};
};

View file

@ -0,0 +1,17 @@
# Copyright (c) 2021 Mike "KemoNine" Crosson
# SPDX-License-Identifier: MIT
# Tune combos to allow proper ARTSEY support
CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=16
CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=8
CONFIG_ZMK_COMBO_MAX_PRESSED_COMBOS=8
# Enable display (layer in use is helpful)
CONFIG_ZMK_DISPLAY=y
# Turn on deep sleep
CONFIG_ZMK_SLEEP=y
CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000
# Set screen blanking to 15s instead of 30s
#CONFIG_ZMK_IDLE_TIMEOUT=15000

View file

@ -8,7 +8,7 @@
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/bt.h> #include <dt-bindings/zmk/bt.h>
// THE BOARD IS FLIPPED FOR LEFT BUT STILL WIRED RIGHT! // Left/Right
#define ARTSEY_RIGHT 1 #define ARTSEY_RIGHT 1
// ARTS Row // ARTS Row
@ -29,12 +29,3 @@
// Include main artsey.io keymap // Include main artsey.io keymap
#include "../../../artsey.dtsi" #include "../../../artsey.dtsi"
// Manage bluetooth profiles
/ {
combos {
compatible = "zmk,combos";
chord_bt_nxt { key-positions = <KEY_A KEY_E KEY_S KEY_O>; bindings = <&bt BT_NXT>; };
chord_bt_clr { key-positions = <KEY_R KEY_Y KEY_T KEY_I>; bindings = <&bt BT_CLR>; };
};
};