From 503a27b8c370e1142036047974972f49c45b0c48 Mon Sep 17 00:00:00 2001 From: KemoNine Date: Sun, 10 Jan 2021 02:03:30 +0000 Subject: [PATCH] Rework navigation blocks, deep sleep and similar --- .../shields/pockettype/pockettype.keymap | 4 +- .../pockettype_dongle.keymap | 4 +- .../pockettype_peripheral.conf | 3 ++ zmk-config/config/lily58.keymap | 1 - zmk-config/config/m60.keymap | 4 +- zmk-config/config/pockettype.conf | 37 +++---------------- zmk-config/config/tg4x.keymap | 6 +-- zmk-config/config/tidbit.conf | 4 ++ zmk-config/config/tidbit.keymap | 14 +++++-- 9 files changed, 33 insertions(+), 44 deletions(-) diff --git a/zmk-config/config/boards/shields/pockettype/pockettype.keymap b/zmk-config/config/boards/shields/pockettype/pockettype.keymap index 39b86d40..2d1ee013 100644 --- a/zmk-config/config/boards/shields/pockettype/pockettype.keymap +++ b/zmk-config/config/boards/shields/pockettype/pockettype.keymap @@ -33,8 +33,8 @@ raise_layer { bindings = < &trans &trans &kp PG_UP &kp UP &kp PG_DN &trans &trans &trans &trans &trans &trans &kp DEL - &trans &kp HOME &kp LEFT &kp DOWN &kp RIGHT &kp END &trans &trans &trans &trans &trans &kp INSERT - &trans &trans &trans &trans &trans &trans &trans &trans &trans &bootloader &reset &kp PSCRN + &trans &trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp INSERT + &trans &trans &kp HOME &trans &kp END &trans &trans &trans &trans &bootloader &reset &kp PSCRN &bt BT_CLR &bt BT_NXT &bt BT_PRV &trans &trans &trans &trans &trans &kp C_PLAY_PAUSE &kp C_VOL_UP &kp C_VOL_DN &kp C_MUTE >; }; diff --git a/zmk-config/config/boards/shields/pockettype_dongle/pockettype_dongle.keymap b/zmk-config/config/boards/shields/pockettype_dongle/pockettype_dongle.keymap index a9f3ec51..f39650ef 100644 --- a/zmk-config/config/boards/shields/pockettype_dongle/pockettype_dongle.keymap +++ b/zmk-config/config/boards/shields/pockettype_dongle/pockettype_dongle.keymap @@ -47,8 +47,8 @@ bindings = < &none &trans &trans &kp PG_UP &kp UP &kp PG_DN &trans &trans &trans &trans &trans &trans &kp DEL - &trans &kp HOME &kp LEFT &kp DOWN &kp RIGHT &kp END &trans &trans &trans &trans &trans &kp INSERT - &trans &trans &trans &trans &trans &trans &trans &trans &trans &bootloader &reset &kp PSCRN + &trans &trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp INSERT + &trans &trans &kp HOME &trans &kp END &trans &trans &trans &trans &bootloader &reset &kp PSCRN &bt BT_CLR &bt BT_NXT &bt BT_PRV &trans &trans &trans &trans &trans &kp C_PLAY_PAUSE &kp C_VOL_UP &kp C_VOL_DN &kp C_MUTE >; }; diff --git a/zmk-config/config/boards/shields/pockettype_dongle/pockettype_peripheral.conf b/zmk-config/config/boards/shields/pockettype_dongle/pockettype_peripheral.conf index e69de29b..14bb2853 100644 --- a/zmk-config/config/boards/shields/pockettype_dongle/pockettype_peripheral.conf +++ b/zmk-config/config/boards/shields/pockettype_dongle/pockettype_peripheral.conf @@ -0,0 +1,3 @@ +# Turn on deep sleep +CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=600000 \ No newline at end of file diff --git a/zmk-config/config/lily58.keymap b/zmk-config/config/lily58.keymap index 708e9818..1d9269fe 100644 --- a/zmk-config/config/lily58.keymap +++ b/zmk-config/config/lily58.keymap @@ -16,7 +16,6 @@ / { keymap { compatible = "zmk,keymap"; - default_layer { bindings = < &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC diff --git a/zmk-config/config/m60.keymap b/zmk-config/config/m60.keymap index c7dcd782..6fdbe0b1 100644 --- a/zmk-config/config/m60.keymap +++ b/zmk-config/config/m60.keymap @@ -26,8 +26,8 @@ bindings = < &kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp DEL &kp CLCK &trans &kp PG_UP &kp UP &kp PG_DN &trans &trans &trans &trans &trans &trans &trans &trans &kp INSERT -&trans &kp HOME &kp LEFT &kp DOWN &kp RIGHT &kp END &trans &trans &trans &trans &trans &trans &kp PSCRN -&trans &trans &trans &trans &trans &trans &trans &trans &trans &bootloader &reset &kp C_PLAY_PAUSE +&trans &trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &trans &kp PSCRN +&trans &trans &kp HOME &trans &kp END &trans &trans &trans &trans &bootloader &reset &kp C_PLAY_PAUSE &trans &trans &trans &trans &trans &kp C_VOL_UP &kp C_VOL_DN &kp C_MUTE >; }; diff --git a/zmk-config/config/pockettype.conf b/zmk-config/config/pockettype.conf index eb075fcc..59d1145c 100644 --- a/zmk-config/config/pockettype.conf +++ b/zmk-config/config/pockettype.conf @@ -1,6 +1,10 @@ # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT +# Turn on deep sleep +CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=600000 + # Number of BT Profiles CONFIG_BT_MAX_CONN=6 @@ -10,34 +14,5 @@ CONFIG_ZMK_IDLE_TIMEOUT=15000 # Save settings after 10s instaed of 60s #CONFIG_ZMK_SETTINGS_SAVE_DEBOUNCE=10000 -################################################################################ -# Debugging -################################################################################ - -# Turn on logging, and set ZMK logging to debug output -CONFIG_LOG=y -CONFIG_ZMK_LOG_LEVEL_DBG=y - -# Turn on USB CDC ACM device -CONFIG_USB=y -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_CDC_ACM=y -CONFIG_USB_CDC_ACM_RINGBUF_SIZE=1024 -CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM" -CONFIG_USB_CDC_ACM_DEVICE_COUNT=1 - -# Enable serial console -CONFIG_SERIAL=y -CONFIG_CONSOLE=y -CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_UART_LINE_CTRL=y - -# Enable USB UART, and set the console device -CONFIG_UART_CONSOLE=y -CONFIG_USB_UART_CONSOLE=y -CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0" - -# Sensor logging -CONFIG_SENSOR_LOG_LEVEL_DBG=y -#CONFIG_SENSOR_LOG_LEVEL=4 -CONFIG_SENSOR_INIT_PRIORITY=90 \ No newline at end of file +# Add debug logging +CONFIG_ZMK_USB_LOGGING=y diff --git a/zmk-config/config/tg4x.keymap b/zmk-config/config/tg4x.keymap index a7bb022d..2e4f769d 100644 --- a/zmk-config/config/tg4x.keymap +++ b/zmk-config/config/tg4x.keymap @@ -47,9 +47,9 @@ other_layer { bindings = < -&trans &trans &trans &kp PG_UP &kp UP &kp PG_DN &trans &trans &trans &trans &trans &none &kp C_PLAY_PAUSE -&trans &kp HOME &kp LEFT &kp DOWN &kp RIGHT &kp END &trans &trans &trans &trans &trans &kp INSERT -&none &trans &trans &trans &trans &trans &trans &trans &bootloader &reset &kp PSCRN +&trans &trans &kp PG_UP &kp UP &kp PG_DN &trans &trans &trans &trans &trans &trans &none &kp C_PLAY_PAUSE +&trans &trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp INSERT +&none &trans &kp HOME &trans &kp END &trans &trans &trans &bootloader &reset &kp PSCRN &bt BT_CLR &bt BT_NXT &bt BT_PRV &trans &trans &trans &kp C_VOL_UP &kp C_VOL_DN &kp C_MUTE >; }; diff --git a/zmk-config/config/tidbit.conf b/zmk-config/config/tidbit.conf index c7d7e4c2..d2f8905b 100644 --- a/zmk-config/config/tidbit.conf +++ b/zmk-config/config/tidbit.conf @@ -13,6 +13,10 @@ # Display CONFIG_ZMK_DISPLAY=y +# Turn on deep sleep +#CONFIG_ZMK_SLEEP=y +#CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=600000 + # Number of BT Profiles CONFIG_BT_MAX_CONN=6 diff --git a/zmk-config/config/tidbit.keymap b/zmk-config/config/tidbit.keymap index fc7c30ca..f048965a 100644 --- a/zmk-config/config/tidbit.keymap +++ b/zmk-config/config/tidbit.keymap @@ -38,11 +38,19 @@ navigation_layer { // &rgb_ug RGB_COLOR_HSB(215, 100, 50) label = "Nav"; + // activate-behaviors = < + // &rgb_ug RGB_COLOR_HSB(215, 100, 50) + // >; + + // deactivate-behaviors = < + // &rgb_ug RGB_COLOR_HSB(0, 100, 50) + // >; + bindings = < &to 1 &to 2 &to 3 &kp PG_UP &kp UP &kp PG_DN &none - &kp LEFT &kp DOWN &kp RIGHT &kp END - &kp HOME &none &kp BSPC &kp ENTER + &kp LEFT &kp DOWN &kp RIGHT &trans + &kp HOME &kp BSPC &kp END &kp ENTER &kp C_MUTE &none &none &kp LA(F4) >; @@ -53,7 +61,7 @@ label = "Mouse"; bindings = < &to 0 &to 2 &to 3 - &none &none &none &kp LC(LA(TAB)) + &rgb_ug RGB_COLOR_HSB(215, 100, 50) &rgb_ug RGB_COLOR_HSB(275, 100, 50) &none &kp LC(LA(TAB)) &none &none &none &kp LG(DOWN_ARROW) &kp ESCAPE &none &none &none &kp C_MUTE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &none