From 7f16f9a4c31cd1ff60eca6c108fea8d871c8907a Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 23 Jan 2026 12:54:40 +0100 Subject: [PATCH] Use new config format --- config/.editorconfig => .editorconfig | 0 build.yaml | 2 ++ config/abyss.keymap | 19 ++++++++-------- config/boards/shields/abyss/abyss.dtsi | 22 ++++++++----------- .../boards/shields/abyss/abyss_left.overlay | 12 ++++++++++ .../boards/shields/abyss/abyss_right.overlay | 14 +++++++++++- config/west.yml | 4 ++-- 7 files changed, 48 insertions(+), 25 deletions(-) rename config/.editorconfig => .editorconfig (100%) diff --git a/config/.editorconfig b/.editorconfig similarity index 100% rename from config/.editorconfig rename to .editorconfig diff --git a/build.yaml b/build.yaml index 21ca2c6..cdd2629 100644 --- a/build.yaml +++ b/build.yaml @@ -24,3 +24,5 @@ include: shield: abyss_right - board: xiao_ble shield: settings_reset + - board: xiao_ble + shield: tester_xiao diff --git a/config/abyss.keymap b/config/abyss.keymap index 9f7f28c..87f8852 100644 --- a/config/abyss.keymap +++ b/config/abyss.keymap @@ -22,15 +22,6 @@ #define ALPHA_COMBO_REQUIRE_DELAY 100 #define COMBO_REQUIRE_DELAY 150 -capslock_word: behavior_capslock_word { - compatible = "zmk,behavior-capslock"; - #binding-cells = <0>; - capslock-press-ms = <5>; - enable-on-press; - disable-on-next-release; - disable-on-keys = ; -}; - &sk { quick-release; /delete-property/ ignore-modifiers; @@ -123,6 +114,16 @@ capslock_word: behavior_capslock_word { hold-trigger-on-release; }; + capslock_word: cplkwrd { + compatible = "zmk,behavior-capslock"; + #binding-cells = <0>; + capslock-press-duration = <95>; + enable-on-press; + disable-on-next-release; + disable-on-keys = ; + display-name = "Capslock word"; + }; + caps_lshift: lmod_morph_hold_tap { compatible = "zmk,behavior-mod-morph"; #binding-cells = <0>; diff --git a/config/boards/shields/abyss/abyss.dtsi b/config/boards/shields/abyss/abyss.dtsi index c331700..a926ecf 100644 --- a/config/boards/shields/abyss/abyss.dtsi +++ b/config/boards/shields/abyss/abyss.dtsi @@ -2,13 +2,21 @@ / { chosen { + zmk,physical-layout = &physical_layout; zmk,kscan = &kscan0; zmk,matrix-transform = &default_transform; }; + physical_layout: physical_layout_0 { + compatible = "zmk,physical-layout"; + display-name = "Default Layout"; + kscan = <&kscan0>; + transform = <&default_transform>; + }; + default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; - columns = <12>; + columns = <8>; rows = <4>; map = < RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,7) RC(0,6) RC(0,5) RC(0,4) @@ -23,17 +31,5 @@ wakeup-source; diode-direction = "col2row"; - row-gpios - = <&xiao_d 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&xiao_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - col-gpios - = <&xiao_d 10 GPIO_ACTIVE_HIGH> - , <&xiao_d 9 GPIO_ACTIVE_HIGH> - , <&xiao_d 8 GPIO_ACTIVE_HIGH> - , <&xiao_d 7 GPIO_ACTIVE_HIGH> - ; }; }; diff --git a/config/boards/shields/abyss/abyss_left.overlay b/config/boards/shields/abyss/abyss_left.overlay index cce450d..ac37ef4 100644 --- a/config/boards/shields/abyss/abyss_left.overlay +++ b/config/boards/shields/abyss/abyss_left.overlay @@ -1,6 +1,18 @@ #include "abyss.dtsi" &kscan0 { + row-gpios + = <&xiao_d 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + col-gpios + = <&xiao_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; }; // vim: ft=dts diff --git a/config/boards/shields/abyss/abyss_right.overlay b/config/boards/shields/abyss/abyss_right.overlay index 7a1ca4f..973053c 100644 --- a/config/boards/shields/abyss/abyss_right.overlay +++ b/config/boards/shields/abyss/abyss_right.overlay @@ -4,8 +4,20 @@ col-offset = <4>; }; - &kscan0 { + row-gpios + = <&xiao_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + col-gpios + = <&xiao_d 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; }; + // vim: ft=dts diff --git a/config/west.yml b/config/west.yml index f3b98f6..7e72634 100644 --- a/config/west.yml +++ b/config/west.yml @@ -1,4 +1,6 @@ manifest: + defaults: + revision: v0.3 remotes: - name: zmkfirmware url-base: https://github.com/zmkfirmware @@ -7,8 +9,6 @@ manifest: projects: - name: zmk remote: zmkfirmware - # remote: zoriya - revision: main import: app/west.yml - name: zmk-behavior-capslock remote: snoyer