Compare commits

..

No commits in common. 'cbe0c6b731cb50fc4762e652248ce61eab711b43' and '24e737446baa9d2511c0e6415f6b0b12dcce4657' have entirely different histories.

@ -1,8 +1,25 @@
# this is read by app/build.py to pass arguments to west # This file generates the GitHub Actions matrix.
targets: # For simple board + shield combinations, add them to the top level board and
# shield arrays, for more control, add individual board + shield combinations
# to the `include` property. You can also use the `cmake-args` property to
# pass flags to the build command, `snippet` to add a Zephyr snippet, and
# `artifact-name` to assign a name to distinguish build outputs from each other:
#
# board: [ "nice_nano_v2" ]
# shield: [ "corne_left", "corne_right" ]
# include:
# - board: bdn9_rev2
# - board: nice_nano_v2
# shield: reviung41
# - board: nice_nano_v2
# shield: corne_left
# snippet: studio-rpc-usb-uart
# cmake-args: -DCONFIG_ZMK_STUDIO=y
# artifact-name: corne_left_with_studio
#
---
include:
- board: nice_nano_v2 - board: nice_nano_v2
shield: cradio_left shield: cradio_left
snippet: studio-rpc-usb-uart
# cmake-args: -DCONFIG_ZMK_STUDIO=y -DCONFIG_ZMK_POINTING=y
- board: nice_nano_v2 - board: nice_nano_v2
shield: cradio_right shield: cradio_right

@ -1,2 +0,0 @@
CONFIG_ZMK_STUDIO=y
CONFIG_ZMK_POINTING=y

@ -4,83 +4,86 @@
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/bt.h> #include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/pointing.h>
// Home row mods macro
#define HRML(k1,k2,k3,k4) &ht LSHFT k1 &ht LALT k2 &ht LCTRL k3 &ht LGUI k4
#define HRMR(k1,k2,k3,k4) &ht RGUI k1 &ht RCTRL k2 &ht RALT k3 &ht RSHFT k4
/ { / {
behaviors { behaviors {
esc_mod: esc_mod { ht: hold_tap {
compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>;
tapping-term-ms = <200>;
bindings = <&kp ESC>, <&kp LCTRL>;
};
esc_3mod: esc_shift_ctrl {
compatible = "zmk,behavior-hold-tap"; compatible = "zmk,behavior-hold-tap";
#binding-cells = <2>; #binding-cells = <2>;
flavor = "tap-preferred"; flavor = "tap-preferred";
tapping-term-ms = <220>;
quick-tap-ms = <150>;
require-prior-idle-ms = <100>;
bindings = <&kp>, <&kp>;
};
esc_shct: tap_dance_mod_tap {
compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>;
tapping-term-ms = <200>; tapping-term-ms = <200>;
quick-tap-ms = <200>; bindings = <&mt LSHIFT ESC>, <&kp LCTRL>;
bindings = <&kp>, <&esc_mod>;
retro-tap;
}; };
eq_dot: equal_dot { eq_dot: tap_dance_mod_tap {
compatible = "zmk,behavior-tap-dance"; compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>; #binding-cells = <0>;
tapping-term-ms = <200>; tapping-term-ms = <200>;
bindings = <&kp EQUAL>, <&kp DOT>; bindings = <&kp EQUAL>, <&kp DOT>;
}; };
dash_slsh: dash_slash { dash_slsh: tap_dance_mod_tap {
compatible = "zmk,behavior-tap-dance"; compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>; #binding-cells = <0>;
tapping-term-ms = <200>; tapping-term-ms = <200>;
bindings = <&kp MINUS>, <&kp SLASH>; bindings = <&kp MINUS>, <&kp SLASH>;
}; };
tab_ret: tab_return { tab_ret: tap_dance_mod_tap {
compatible = "zmk,behavior-tap-dance"; compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>; #binding-cells = <0>;
tapping-term-ms = <200>; tapping-term-ms = <200>;
bindings = <&kp TAB>, <&kp RET>; bindings = <&kp TAB>, <&kp RET>;
}; };
f1_f7: function1 { f1_f7: tap_dance_mod_tap {
compatible = "zmk,behavior-tap-dance"; compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>; #binding-cells = <0>;
tapping-term-ms = <200>; tapping-term-ms = <200>;
bindings = <&kp F1>, <&kp F7>; bindings = <&kp F1>, <&kp F7>;
}; };
f2_f8: function2 { f2_f8: tap_dance_mod_tap {
compatible = "zmk,behavior-tap-dance"; compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>; #binding-cells = <0>;
tapping-term-ms = <200>; tapping-term-ms = <200>;
bindings = <&kp F2>, <&kp F8>; bindings = <&kp F2>, <&kp F8>;
}; };
f3_f9: function3 { f3_f9: tap_dance_mod_tap {
compatible = "zmk,behavior-tap-dance"; compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>; #binding-cells = <0>;
tapping-term-ms = <200>; tapping-term-ms = <200>;
bindings = <&kp F3>, <&kp F9>; bindings = <&kp F3>, <&kp F9>;
}; };
f4_f10: function4 { f4_f10: tap_dance_mod_tap {
compatible = "zmk,behavior-tap-dance"; compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>; #binding-cells = <0>;
tapping-term-ms = <200>; tapping-term-ms = <200>;
bindings = <&kp F4>, <&kp F10>; bindings = <&kp F4>, <&kp F10>;
}; };
f5_f11: function5 { f5_f11: tap_dance_mod_tap {
compatible = "zmk,behavior-tap-dance"; compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>; #binding-cells = <0>;
tapping-term-ms = <200>; tapping-term-ms = <200>;
bindings = <&kp F5>, <&kp F11>; bindings = <&kp F5>, <&kp F11>;
}; };
f6_f12: function6 { f6_f12: tap_dance_mod_tap {
compatible = "zmk,behavior-tap-dance"; compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>; #binding-cells = <0>;
tapping-term-ms = <200>; tapping-term-ms = <200>;
@ -88,20 +91,21 @@
}; };
}; };
conditional_layers {
compatible = "zmk,conditional-layers";
tri_layer {
if-layers = <1 2>;
then-layer = <3>;
};
};
combos { combos {
compatible = "zmk,combos"; compatible = "zmk,combos";
combo_act { combo_act {
timeout-ms = <50>; timeout-ms = <50>;
key-positions = <14 31>; key-positions = <14 31>;
bindings = <&tog 3>; bindings = <&tog act>;
layers = <0>; layers = <default_layer>;
};
combo_altspc {
timeout-ms = <50>;
key-positions = <24 31>;
bindings = <&kp LA(SPACE)>;
layers = <0>;
}; };
}; };
@ -109,37 +113,37 @@
compatible = "zmk,keymap"; compatible = "zmk,keymap";
base { base {
bindings = < bindings = <
&lt 1 Q &kp W &kp F &kp P &kp G &kp J &kp L &kp U &kp Y &kp SEMI &lt sym Q &kp W &kp F &kp P &kp G &kp J &kp L &kp U &kp Y &kp SEMI;
&kp A &kp R &kp S &kp T &kp D &kp H &kp N &kp E &kp I &kp O &kp A &kp R &kp S &kp T &kp D &kp H &kp N &kp E &kp I &kp O;
&kp Z &kp X &kp C &kp V &kp B &kp K &kp M &kp COMMA &kp DOT &kp FSLH &kp Z &kp X &kp C &kp V &kp B &kp K &kp M &kp COMMA &kp DOT &kp FSLH;
&esc_3mod LSHIFT 0 &kp SPACE &kp BSPC &lt 1 ENTER &esc_shct &kp SPACE &kp BSPC &kp ENTER
>; >;
}; };
sym { sym {
bindings = < bindings = <
&none &kp N7 &kp N8 &kp N9 &kp N0 &kp BSLH &kp GRAVE &kp LBKT &kp RBKT &kp APOS &none &kp N7 &kp N8 &kp N9 &kp N0 &kp BSLH &kp GRAVE &kp LBKT &kp RBKT &kp APOS;
&none &kp N4 &kp N5 &kp N6 &eq_dot &kp HOME &kp LEFT &kp DOWN &kp UP &kp RIGHT &none &kp N4 &kp N5 &kp N6 &eq_dot &kp HOME &kp LEFT &kp DOWN &kp UP &kp RIGHT;
&none &kp N1 &kp N2 &kp N3 &dash_slsh &kp END &kp LC(LEFT) &kp PG_DN &kp PG_UP &kp LC(RIGHT) &none &kp N1 &kp N2 &kp N3 &dash_slsh &kp END &kp LC(LEFT) &kp PG_DN &kp PG_UP &kp LC(RIGHT);
&mt LSHIFT ESC &tab_ret &lt 2 DEL &mo 2 &mt LSHIFT ESC &tab_ret &lt mnav DEL &none
>; >;
}; };
mnav { mnav {
bindings = < bindings = <
&trans &trans &msc SCRL_UP &trans &trans &trans &mkp LCLK &msc SCRL_DOWN &msc SCRL_UP &mkp RCLK &trans &trans &msc SCRL_UP &trans &trans &trans &mkp LCLK &msc SCRL_DOWN &msc SCRL_UP &mkp RCLK;
&trans &mkp LCLK &mkp MCLK &mkp RCLK &trans &trans &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_UP &mmv MOVE_RIGHT &trans &mkp LCLK &mkp MCLK &mkp RCLK &trans &trans &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_UP &mmv MOVE_RIGHT;
&trans &trans &msc SCRL_DOWN &trans &trans &trans &trans &trans &trans &trans &trans &trans &msc SCRL_DOWN &trans &trans &trans &trans &trans &trans &trans;
&trans &trans &trans &trans &trans &trans &trans &trans
>; >;
}; };
act { act {
bindings = < bindings = <
&f1_f7 &f2_f8 &f3_f9 &kp TAB &studio_unlock &studio_unlock &bt BT_PRV &bt BT_NXT &bt BT_CLR &bt BT_CLR_ALL &f1_f7 &f2_f8 &f3_f9 &kp TAB &trans &studio_unlock &trans &trans &trans &trans;
&f4_f10 &f5_f11 &f6_f12 &kp LS(TAB) &tog 3 &bootloader &kp C_PREV &kp C_PP &kp C_STOP &kp C_NEXT &f4_f10 &f5_f11 &f6_f12 &kp LS(TAB) &tog act &bootloader &kp C_PREV &kp C_PP &kp C_STOP &kp C_NEXT;
&sk LCTRL &sk LSHIFT &sk LALT &sk LGUI &kp PSCRN &trans &kp C_MUTE &kp C_VOL_DN &kp C_VOL_UP &trans &sk LCTRL &sk LSHIFT &sk LALT &sk LGUI &kp PRSCRN &trans &kp C_MUTE &kp C_VOL_DN &kp C_VOL_UP &trans;
&trans &tog 3 &trans &trans &trans &tog act &trans &trans
>; >;
}; };
}; };

Binary file not shown.

Binary file not shown.
Loading…
Cancel
Save