ficd/zmk
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade to Zephyr 3.5

Browse source
This commit is contained in:
urob 2024-02-09 21:47:15 -05:00
parent 9f9fc0600e
commit b5212cbba5
7 changed files with 19 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/base.keymap
View file

@ -297,13 +297,13 @@ ZMK_LAYER(uc,
ZMK_LAYER(mouse,
//╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮
X_LT ___ ___ ___ ___ ___ X_MT ___ U_WH_D U_MS_U U_WH_U ___ X_RT
X_LT ___ ___ ___ ___ ___ X_MT U_WH_L U_WH_D U_MS_U U_WH_U U_WH_R X_RT
//├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
X_LM ___ ___ ___ ___ ___ X_MM ___ U_MS_L U_MS_D U_MS_R ___ X_RM
//├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
X_LB ___ ___ ___ ___ ___ X_MB ___ ___ ___ ___ ___ X_RB
X_LB ___ ___ ___ ___ ___ X_MB ___ &mkp MB4 &mkp MCLK &mkp MB5 ___ X_RB
//├──────┤ ╰─────────────┼─────────────┴─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┴───────────────────────────╯ ├──────┤
X_LH ___ ___ X_MH U_BTN2 U_BTN1 X_RH
X_LH ___ ___ X_MH &mkp LCLK &mkp RCLK X_RH
//╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯
)

17
config/corneish_zen.conf
View file

@ -7,21 +7,12 @@ CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300
CONFIG_ZMK_DISPLAY_HIDE_MOMENTARY_LAYERS=y
CONFIG_CUSTOM_WIDGET_LAYER_STATUS_HIDE_HEADING=y
# Mouse config, requires PR #778
CONFIG_ZMK_MOUSE=y
CONFIG_ZMK_MOUSE_TICK_DURATION=8
# Combo config, automated by build script
CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6
CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3
# Windows battery reporting fix
# CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
# Clear all bluetooth bonds on start up
# CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=y
# Turn on logging
# CONFIG_ZMK_USB_LOGGING=y
# CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000
# Bluetooth tweaks
CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y
CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
CONFIG_BT_CTLR_TX_PWR_PLUS_8=y

39
config/mouse.dtsi
View file

@ -1,47 +1,26 @@
#define ZMK_MOUSE_DEFAULT_MOVE_VAL 1500 // 600
#define ZMK_MOUSE_DEFAULT_SCRL_VAL 20 // 10
#include <dt-bindings/zmk/mouse.h>
&mmv {
acceleration-exponent = <1>; // 1
time-to-max-speed-ms = <1500>; // 40
time-to-max-speed-ms = <500>; // 40
delay-ms = <0>; // 0
};
&msc {
acceleration-exponent = <1>; // 0
time-to-max-speed-ms = <5000>; // 40
time-to-max-speed-ms = <40>; // 500
delay-ms = <0>; // 10
};
#define U_MOUSE_MOVE_MAX 1250 // 600
#define U_MOUSE_SCROLL_MAX 100 // 10
#undef MOVE_UP
#undef MOVE_DOWN
#undef MOVE_LEFT
#undef MOVE_RIGHT
#define MOVE_UP MOVE_Y(-U_MOUSE_MOVE_MAX)
#define MOVE_DOWN MOVE_Y(U_MOUSE_MOVE_MAX)
#define MOVE_LEFT MOVE_X(-U_MOUSE_MOVE_MAX)
#define MOVE_RIGHT MOVE_X(U_MOUSE_MOVE_MAX)
#undef SCROLL_UP
#undef SCROLL_DOWN
#undef SCROLL_LEFT
#undef SCROLL_RIGHT
#define SCROLL_UP SCRL_Y(U_MOUSE_SCROLL_MAX)
#define SCROLL_DOWN SCRL_Y(-U_MOUSE_SCROLL_MAX)
#define SCROLL_LEFT SCRL_X(-U_MOUSE_SCROLL_MAX)
#define SCROLL_RIGHT SCRL_X(U_MOUSE_SCROLL_MAX)
#define U_BTN1 &mkp MB1
#define U_BTN2 &mkp MB2
#define U_BTN3 &mkp MB3
#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 SCROLL_UP
#define U_WH_D &msc SCROLL_DOWN
#define U_WH_L &msc SCROLL_LEFT
#define U_WH_R &msc SCROLL_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

4
config/planck_rev6.conf
View file

@ -1,9 +1,5 @@
CONFIG_ZMK_KEYBOARD_NAME="Planck Rev6"
# Mouse config, requires PR #778
CONFIG_ZMK_MOUSE=y
CONFIG_ZMK_MOUSE_TICK_DURATION=8
# Combo config, automated by build script
CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6
CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3

2
config/west.yml
View file

@ -7,7 +7,7 @@ manifest:
projects:
- name: zmk
remote: urob
revision: main-with-native-mouse
revision: main
import: app/west.yml
self:
path: config

2
scripts/zmk_build.sh
View file

@ -77,7 +77,7 @@ while [[ $# -gt 0 ]]; do
done
# Set defaults
[[ -z $ZEPHYR_VERSION ]] && ZEPHYR_VERSION="3.2"
[[ -z $ZEPHYR_VERSION ]] && ZEPHYR_VERSION="3.5"
[[ -z $RUNWITH_DOCKER ]] && RUNWITH_DOCKER="true"
[[ -z $OUTPUT_DIR ]] && OUTPUT_DIR="$WINHOME/Downloads"

2
scripts/zmk_run_docker.sh
View file

@ -55,7 +55,7 @@ while [[ $# -gt 0 ]]; do
done
# Set defaults
[[ -z $ZEPHYR_VERSION ]] && ZEPHYR_VERSION="3.0"
[[ -z $ZEPHYR_VERSION ]] && ZEPHYR_VERSION="3.5"
[[ -z $HOST_ZMK_DIR ]] && HOST_ZMK_DIR="$HOME/zmk"
[[ -z $HOST_CONFIG_DIR ]] && HOST_CONFIG_DIR="$HOME/zmk-config"