Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from Eloy98:main #14

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
---
include:
- board: nice_nano_v2
shield: cygnus_left
shield: cygnus_left prospector_adapter
- board: nice_nano_v2
shield: cygnus_right
shield: cygnus_right rgbled_adapter
- board: nice_nano_v2
shield: settings_reset
shield: settings_reset
6 changes: 0 additions & 6 deletions config/cygnus.conf
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
# 电池电量报告间隔时间单位是秒
CONFIG_ZMK_BATTERY_REPORT_INTERVAL=60
# 不活动 15 分钟后进入深度睡眠,深度睡眠纯在屏幕无法唤醒问题,是zmk固件本身问题已经在解决了
CONFIG_ZMK_SLEEP=y
# 1800000 毫秒 = 30 分钟 * 60 秒 * 1000
CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=3600000
# 进入空闲状态前的不活动毫秒数
CONFIG_ZMK_IDLE_TIMEOUT=15000
# 增加键盘消抖
CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=5
CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=5
Expand Down
16 changes: 8 additions & 8 deletions config/cygnus.keymap
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@
compatible = "zmk,behavior-hold-tap";
label = "LTQ";
#binding-cells = <2>;
tapping-term-ms = <200>;
tapping-term-ms = <250>;
quick_tap_ms = <0>;
flavor = "hold-preferred";
bindings = <&mo>, <&kp>;

quick-tap-ms = <180>;
quick-tap-ms = <200>;
global-quick-tap;
};
};
Expand All @@ -101,10 +101,10 @@

default_layer {
bindings = <
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
&hm LEFT_GUI A &hm LEFT_ALT S &hm LCTRL D &hm LEFT_SHIFT F &kp G &kp H &hm RIGHT_SHIFT J &hm RCTRL K &hm RIGHT_ALT L &hm RIGHT_GUI SEMI
&kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp PERIOD &kp FSLH
&kp TAB &lt 1 SPACE &lt 2 ENTER &mo 3 &ltq 2 BACKSPACE &mo 4
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
&hm LEFT_GUI A &hm LEFT_ALT S &hm LCTRL D &hm LEFT_SHIFT F &kp G &kp H &hm RIGHT_SHIFT J &hm RCTRL K &hm RIGHT_ALT L &hm RIGHT_GUI SEMI
&kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp PERIOD &kp FSLH
&kp TAB &lt 1 SPACE &lt 2 ENTER &mo 3 &ltq 2 BACKSPACE &kp BACKSPACE
>;
};

Expand All @@ -120,9 +120,9 @@
raise_layer {
bindings = <
&kp ESC &kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_NUMBER_0 &kp HOME &kp PAGE_UP &kp UP &kp PAGE_DOWN &trans
&kp CAPSLOCK &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp AT &kp END &kp LEFT_ARROW &kp DOWN &kp RIGHT &trans
&kp CAPSLOCK &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp AT &kp END &kp LEFT_ARROW &kp DOWN &kp RIGHT &bootloader
&kp DEL &kp KP_N1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &kp DOT &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &mo 4 &trans
>;
};

Expand Down
22 changes: 13 additions & 9 deletions config/west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@ manifest:
remotes:
- name: zmkfirmware
url-base: https://github.com/zmkfirmware
- name: kuolemax
url-base: https://github.com/kuolemax
- name: caksoylar
url-base: https://github.com/caksoylar
- name: Eloy98 # <--- add this
url-base: https://github.com/Eloy98 # <--- and this
projects:
- name: zmk
remote: kuolemax
revision: encoder-fix
remote: zmkfirmware
revision: main
import: app/west.yml
# - name: zmk
# remote: zmkfirmware
# revision: main
# import: app/west.yml
- name: zmk-rgbled-widget
remote: caksoylar
revision: main
- name: prospector-zmk-module # <--- and these
remote: Eloy98 # <---
revision: main
self:
path: config
path: config