Skip to content

sync: 同步上游 a741725193/zmk-sofle 更新，还原 settings_reset board #2

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.

Sign up for GitHub

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

sync: 同步上游 a741725193/zmk-sofle 更新，还原 settings_reset board #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b33d17
sync: 同步上游4项代码更新
Copilot Apr 3, 2026
955b0ae
revert: settings_reset 还原为 eyelash_sofle_left
Copilot Apr 3, 2026
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
21 changes: 10 additions & 11 deletions boards/arm/eyelash_sofle/eyelash_sofle.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,19 @@
zmk,backlight = &backlight;
};

left_encoder: encoder_left {
compatible = "alps,ec11";
label = "LEFT_ENCODER";
resolution = <4>;
steps = <40>;
left_encoder: encoder_left {
compatible = "alps,ec11";
a-gpios = <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
b-gpios = <&gpio1 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
status = "disabled";
};
b-gpios = <&gpio1 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
steps = <40>;
status = "disabled";
};

sensors {
compatible = "zmk,keymap-sensors";
sensors = <&left_encoder>;
};
compatible = "zmk,keymap-sensors";
triggers-per-rotation = <20>;
sensors = <&left_encoder>;
};

kscan0: kscan {
compatible = "zmk,kscan-gpio-matrix";
Expand Down
2 changes: 1 addition & 1 deletion config/eyelash_sofle.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_WS2812_STRIP=y
CONFIG_ZMK_RGB_UNDERGLOW=y
CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=y
CONFIG_ZMK_RGB_UNDERGLOW_ON_START=n
CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX=90
CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX=60

CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB=y
Expand Down
2 changes: 1 addition & 1 deletion config/west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ manifest:
revision: main
- name: zmk
remote: zmkfirmware
revision: main
revision: v0.3.0
import: app/west.yml
self:
path: boards
Loading