diff --git a/build.yaml b/build.yaml index 188138a..80c3246 100644 --- a/build.yaml +++ b/build.yaml @@ -20,6 +20,8 @@ include: - board: nice_nano_v2 shield: cradio_left + snippet: studio-rpc-usb-uart + #snippet: zmk-usb-logging - board: nice_nano_v2 shield: cradio_right - board: nice_nano_v2 diff --git a/config/cradio.conf b/config/cradio.conf index c09a5bb..3d8580f 100644 --- a/config/cradio.conf +++ b/config/cradio.conf @@ -1,6 +1,3 @@ -# Turn on logging, and set ZMK logging to debug output -CONFIG_ZMK_USB_LOGGING=n - # Bluetooth CONFIG_BT_MAX_CONN=5 CONFIG_BT_MAX_PAIRED=5 @@ -17,13 +14,14 @@ CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000 # MOUSE CONFIG_ZMK_MOUSE=y -# WPM: inacurate, disabled by default -CONFIG_ZMK_WPM=n - # REPORT CONFIG_ZMK_BEHAVIORS_QUEUE_SIZE=512 -CONFIG_ZMK_SEND_STRING_DEFAULT_WAIT_MS=10 -CONFIG_ZMK_SEND_STRING_DEFAULT_TAP_MS=10 +# CONFIG_ZMK_SEND_STRING_DEFAULT_WAIT_MS=10 +# CONFIG_ZMK_SEND_STRING_DEFAULT_TAP_MS=10 + +# zmk studio +CONFIG_ZMK_STUDIO=y +CONFIG_ZMK_STUDIO_LOCK_IDLE_TIMEOUT_SEC=300 # System # length <= 16 diff --git a/config/cradio.keymap b/config/cradio.keymap index b9ecf4d..66a48c6 100644 --- a/config/cradio.keymap +++ b/config/cradio.keymap @@ -17,15 +17,6 @@ #define TRI 4 #define MOUSE 5 -#define U_MS_U &mmv MOVE_UP -#define U_MS_D &mmv MOVE_DOWN -#define U_MS_L &mmv MOVE_LEFT -#define U_MS_R &mmv MOVE_RIGHT -#define U_WH_U &msc SCRL_UP -#define U_WH_D &msc SCRL_DOWN -#define U_WH_L &msc SCRL_LEFT -#define U_WH_R &msc SCRL_RIGHT - / { chosen { zmk,charmap = &charmap_us; @@ -104,12 +95,11 @@ tri_layer { bindings = < &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 2 &out OUT_TOG &tog WIN &kp C_MUTE &kp C_PREV -&kp F5 &kp F6 &kp F7 &kp F8 &bt BT_SEL 1 &bt BT_SEL 3 &kp C_BRI_UP &trans &kp C_VOL_UP &kp C_PP +&kp F5 &kp F6 &kp F7 &kp F8 &bt BT_SEL 1 &bt BT_SEL 3 &kp C_BRI_UP &studio_unlock &kp C_VOL_UP &kp C_PP &kp F9 &kp F10 &kp F11 &kp F12 &bt BT_CLR &bt BT_SEL 4 &kp C_BRI_DEC &trans &kp C_VOL_DN &kp C_NEXT &trans &trans &trans &trans >; }; - mouse { bindings = < &tog MOUSE &mkp MB4 &mkp MCLK &mkp MB5 &trans &msc SCRL_LEFT &msc SCRL_DOWN &msc SCRL_UP &msc SCRL_RIGHT &tog MOUSE