From b85964cf009b33e2793e1c2c345cb4efce56be25 Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Sun, 17 Nov 2024 15:55:04 -0500 Subject: [PATCH] refactor: consolidate encoder config --- config/boards/arm/corne/corne.dtsi | 23 ++++++++++++----------- config/boards/arm/corne/corne.zmk.yml | 1 + config/boards/arm/corne/corne_left.dts | 2 -- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/boards/arm/corne/corne.dtsi b/config/boards/arm/corne/corne.dtsi index 1a1c9cc..643cf56 100644 --- a/config/boards/arm/corne/corne.dtsi +++ b/config/boards/arm/corne/corne.dtsi @@ -24,19 +24,20 @@ zmk,backlight = &backlight; }; - left_encoder: encoder_left { - compatible = "alps,ec11"; - label = "LEFT_ENCODER"; - resolution = <4>; - steps = <40>; - status = "disabled"; - }; + 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)>; + steps = <40>; + status = "disabled"; + }; sensors { - compatible = "zmk,keymap-sensors"; - sensors = <&left_encoder>; - }; - + compatible = "zmk,keymap-sensors"; + triggers-per-rotation = <20>; + sensors = <&left_encoder>; + }; + default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; columns = <14>; diff --git a/config/boards/arm/corne/corne.zmk.yml b/config/boards/arm/corne/corne.zmk.yml index 090232d..fe01392 100644 --- a/config/boards/arm/corne/corne.zmk.yml +++ b/config/boards/arm/corne/corne.zmk.yml @@ -7,6 +7,7 @@ arch: arm features: - keys - display + - encoder outputs: - usb - ble diff --git a/config/boards/arm/corne/corne_left.dts b/config/boards/arm/corne/corne_left.dts index 564150f..3103028 100644 --- a/config/boards/arm/corne/corne_left.dts +++ b/config/boards/arm/corne/corne_left.dts @@ -48,8 +48,6 @@ }; &left_encoder { - a-gpios = <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&gpio1 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; status = "okay"; }; };