diff --git a/.gitignore b/.gitignore index f231cd4..4efbe97 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ .west modules firmware +zephyr zmk # Ignore keymap-drawer output for now draw/base.svg diff --git a/config/base.keymap b/config/base.keymap index e08a482..db2a636 100644 --- a/config/base.keymap +++ b/config/base.keymap @@ -235,7 +235,7 @@ ZMK_LAYER(nav, ZMK_LAYER(fn, //╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮ - X_LT &kp F12 &kp F7 &kp F8 &kp F9 ___ X_MT ___ &kp C_PREV &kp C_VOL_UP &kp C_NEXT &kp SYSTEM_SLEEP X_RT + X_LT &kp F12 &kp F7 &kp F8 &kp F9 ___ X_MT ___ &kp C_PREV &kp C_VOL_UP &kp C_NEXT ___ X_RT //├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ X_LM &hml LGUI F11 &hml LALT F4 &hml LSHFT F5 &hml LCTRL F6 ___ X_MM ___ DSK_PREV VOL_DOWN DSK_NEXT ___ X_RM //├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ diff --git a/config/corneish_zen.conf b/config/corneish_zen.conf index 416e88f..a0816ac 100644 --- a/config/corneish_zen.conf +++ b/config/corneish_zen.conf @@ -3,20 +3,16 @@ CONFIG_ZMK_SLEEP=y CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000 # Enable mouse -CONFIG_ZMK_MOUSE=y -CONFIG_ZMK_MOUSE_SMOOTH_SCROLLING=y - -# Enable generic desktop usages -CONFIG_ZMK_HID_GENERIC_DESKTOP_USAGES_BASIC=y +CONFIG_ZMK_POINTING=y +CONFIG_ZMK_POINTING_SMOOTH_SCROLLING=y # Combo config, automated by build script CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6 CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3 -# Zen display tweaks, requires patches by caksoylar -CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300 -CONFIG_ZMK_DISPLAY_HIDE_MOMENTARY_LAYERS=y -CONFIG_CUSTOM_WIDGET_LAYER_STATUS_HIDE_HEADING=y +# Don't show layer status +#CONFIG_CUSTOM_WIDGET_BATTERY_STATUS=n +CONFIG_CUSTOM_WIDGET_LAYER_STATUS=n # Bluetooth tweaks CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y diff --git a/config/glove80.conf b/config/glove80.conf index f6a5ea3..fa40b25 100644 --- a/config/glove80.conf +++ b/config/glove80.conf @@ -3,11 +3,8 @@ CONFIG_ZMK_SLEEP=y CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000 # Enable mouse -CONFIG_ZMK_MOUSE=y -CONFIG_ZMK_MOUSE_SMOOTH_SCROLLING=y - -# Generic desktop usages -CONFIG_ZMK_HID_GENERIC_DESKTOP_USAGES_BASIC=y +CONFIG_ZMK_POINTING=y +CONFIG_ZMK_POINTING_SMOOTH_SCROLLING=y # Combo config, automated by build script CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6 diff --git a/config/mouse.dtsi b/config/mouse.dtsi index 67ac133..a86c30b 100644 --- a/config/mouse.dtsi +++ b/config/mouse.dtsi @@ -1,7 +1,7 @@ #define ZMK_MOUSE_DEFAULT_MOVE_VAL 1500 // 600 #define ZMK_MOUSE_DEFAULT_SCRL_VAL 20 // 10 -#include +#include // Config from @caksoylar, defaults in comments &mmv { @@ -24,4 +24,3 @@ #define U_WH_D &msc SCRL_DOWN #define U_WH_L &msc SCRL_LEFT #define U_WH_R &msc SCRL_RIGHT - diff --git a/config/planck_rev6.conf b/config/planck_rev6.conf index 406c7d7..60c1cf1 100644 --- a/config/planck_rev6.conf +++ b/config/planck_rev6.conf @@ -1,11 +1,8 @@ CONFIG_ZMK_KEYBOARD_NAME="Planck Rev6" # Enable mouse -CONFIG_ZMK_MOUSE=y -CONFIG_ZMK_MOUSE_SMOOTH_SCROLLING=y - -# Enable generic desktop usages -CONFIG_ZMK_HID_GENERIC_DESKTOP_USAGES_BASIC=y +CONFIG_ZMK_POINTING=y +CONFIG_ZMK_POINTING_SMOOTH_SCROLLING=y # Combo config, automated by build script CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6 diff --git a/config/west.yml b/config/west.yml index 478a10c..1a51851 100644 --- a/config/west.yml +++ b/config/west.yml @@ -1,13 +1,12 @@ # This file specifies the build dependencies for Github Action workflows and -# for local build environments. The workspace has three toplevel directories -# containing the user config, user modules and ZMK. Zephyr and its dependencies -# are namespaced under /zmk to keep the toplevel clean. +# for local build environments. The workspace has four toplevel directories +# containing the user config, modules, zephy and ZMK. # # ZMK-Workspace # ├── config -# ├── modules (user modules) +# ├── modules +# ├── zephyr # └── zmk -# └── modules (Zephyr modules) # # To create a local build environment, clone this repository and then run the # following commands from its toplevel directory: @@ -23,28 +22,56 @@ manifest: revision: v0.1 remotes: - - name: upstream - url-base: https://github.com/zmkfirmware - name: urob url-base: https://github.com/urob + - name: zmkfirmware + url-base: https://github.com/zmkfirmware projects: - - name: zmk-auto-layer - path: modules/auto-layer - - name: zmk-helpers - path: modules/helpers - - name: zmk-leader-key - path: modules/leader-key - - name: zmk-tri-state - path: modules/tri-state - - # ZMK with Zephyr namespaced under /zmk. This requires that ZMK imports - # Zephyr with a path other than `zephyr` (as in `going-modular`). + # This is vanilla ZMK - just using my remote to pin the current state of main, + # as upstream hasn't yet released a version with mouse. - name: zmk - path: . + revision: v0.1+mouse + import: app/west.yml + + # ZMK modules + - name: zmk-adaptive-key + path: modules/zmk/adaptive-key + - name: zmk-auto-layer + path: modules/zmk/auto-layer + - name: zmk-helpers + path: modules/zmk/helpers + - name: zmk-leader-key + revision: v0.1+locality + path: modules/zmk/leader-key + - name: zmk-tri-state + path: modules/zmk/tri-state + + # Temporarily overload Zephyr until + # https://github.com/zmkfirmware/zephyr/pull/40 is merged. + - name: zephyr + revision: v3.5.0+zmk-fixes + clone-depth: 1 import: - file: app/west.yml - path-prefix: zmk + name-blocklist: + - ci-tools + - hal_altera + - hal_cypress + - hal_infineon + - hal_microchip + - hal_nxp + - hal_openisa + - hal_silabs + - hal_xtensa + - hal_st + - hal_ti + - loramac-node + - mcuboot + - mcumgr + - net-tools + - openthread + - edtt + - trusted-firmware-m self: path: config