diff --git a/app/boards/arm/dao/dao.dtsi b/app/boards/arm/dao/dao.dtsi
index 4d6d3e15..5cd5ab0b 100644
--- a/app/boards/arm/dao/dao.dtsi
+++ b/app/boards/arm/dao/dao.dtsi
@@ -24,23 +24,6 @@
};
default_transform: keymap_transform_0 {
- compatible = "zmk,matrix-transform";
- columns = <14>;
- rows = <4>;
-
- // | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 |
- // | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | |
- // | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | |
- // | | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | |
- map = <
- RC(3,0) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6) RC(3,6)
- RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)
- RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)
- RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9)
- >;
- };
-
- less_key_transform: keymap_transform_1 {
compatible = "zmk,matrix-transform";
columns = <12>;
rows = <4>;
@@ -57,6 +40,23 @@
>;
};
+ extra_keys_transform: keymap_transform_1 {
+ compatible = "zmk,matrix-transform";
+ columns = <14>;
+ rows = <4>;
+
+ // | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 |
+ // | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | |
+ // | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | |
+ // | | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | |
+ map = <
+ RC(3,0) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6) RC(3,6)
+ RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)
+ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)
+ RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9)
+ >;
+ };
+
kscan0: kscan {
compatible = "zmk,kscan-gpio-matrix";
label = "KSCAN";
@@ -150,4 +150,4 @@
reg = <0x000f4000 0x0000c000>;
};
};
-};
\ No newline at end of file
+};
diff --git a/app/boards/arm/dao/dao.keymap b/app/boards/arm/dao/dao.keymap
index b2d7e141..e550f8af 100644
--- a/app/boards/arm/dao/dao.keymap
+++ b/app/boards/arm/dao/dao.keymap
@@ -13,10 +13,18 @@
#define RSE 2
#define ADJ 3
+< {
+ quick_tap_ms = <220>;
+};
+
+&mt {
+ quick_tap_ms = <220>;
+};
+
/ {
chosen {
zmk,matrix_transform = &default_transform;
- //zmk,matrix_transform = &less_key_transform;
+ //zmk,matrix_transform = &extra_keys_transform;
};
};
@@ -25,59 +33,59 @@
compatible = "zmk,keymap";
default_layer {
- // | | CMD/[ | Q | W | E | R | T | | Y | U | I | O | P | [ | |
- // | CTRL/` | A | S | D | F | G | | H | J | K | L | ; | CTRL/' |
- // | ALT/- | Z | X | C | V | B | | N | M | , | . | / | ALT/\ |
- // | RSE/TAB | SHFT/SPC | LWR/RET | | LWR/ESC | SHFT/BKSP | RSE/DEL |
+ // | CMD/[ | Q | W | E | R | T | | Y | U | I | O | P | [ |
+ // | CTRL/` | A | S | D | F | G | | H | J | K | L | ; | CTRL/' |
+ // | ALT/- | Z | X | C | V | B | | N | M | , | . | / | ALT/\ |
+ // | RSE/TAB | SHFT/SPC | LWR/RET | | LWR/ESC | SHFT/BKSP | RSE/DEL |
bindings = <
- &none &mt LGUI RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &none
- &mt LCTRL GRAVE &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT
- &mt LALT MINUS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH
- < 2 TAB &mt LSHFT SPACE < 1 RET < 1 ESC &mt RSHFT BSPC < 2 DEL
+ &mt LGUI RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT
+ &mt LCTRL GRAVE &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT
+ &mt LALT MINUS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH
+ < 2 TAB &mt LSHFT SPACE < 1 RET < 1 ESC &mt RSHFT BSPC < 2 DEL
>;
};
lower_layer {
- // | | CMD/F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | |
- // | CTRL/+ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | CTRL/- |
- // | ALT/= | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ALT |
- // | ADJ/TAB | | | | | | ADJ/DEL |
+ // | CMD/F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
+ // | CTRL/+ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | CTRL/- |
+ // | ALT/= | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ALT |
+ // | ADJ/TAB | | | | | | ADJ/DEL |
bindings = <
- &none &mt LGUI F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &none
- &mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS
- &mt LALT EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp RALT
- < 3 TAB &trans &trans &trans &trans < 3 DEL
+ &mt LGUI F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
+ &mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS
+ &mt LALT EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp RALT
+ < 3 TAB &trans &trans &trans &trans < 3 DEL
>;
};
raise_layer {
- // | | CMD/NLCK | / | 7 | 8 | 9 | - | | VOL_UP | HOME | PSCRN | PGUP | SLCK | CAPS | |
- // | CTRL/= | * | 4 | 5 | 6 | + | | MUTE | LEFT | UP | RHGT | INS |CTRL/CTXMENU|
- // | ALT | 0 | 1 | 2 | 3 | . | | VOL_DN | END | DOWN | PGDN | PAUS | ALT |
- // | | | ADJ/ENT | | ADJ/ESC | | |
+ // | CMD/NLCK | / | 7 | 8 | 9 | - | | VOL_UP | HOME | PSCRN | PGUP | SLCK | CAPS |
+ // | CTRL/= | * | 4 | 5 | 6 | + | | MUTE | LEFT | UP | RHGT | INS |CTRL/CTXMENU|
+ // | ALT | 0 | 1 | 2 | 3 | . | | VOL_DN | END | DOWN | PGDN | PAUS | ALT |
+ // | | | ADJ/ENT | | ADJ/ESC | | |
bindings = <
- &none &mt LGUI KP_NUM &kp KP_SLASH &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CLCK &none
- &mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &mt RCTRL K_APP
- &kp LALT &kp KP_N0 &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp PAUSE_BREAK &kp RALT
- &trans &trans < 3 RET < 3 ESC &trans &trans
+ &mt LGUI KP_NUM &kp KP_SLASH &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CLCK
+ &mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &mt RCTRL K_APP
+ &kp LALT &kp KP_N0 &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp PAUSE_BREAK &kp RALT
+ &trans &trans < 3 RET < 3 ESC &trans &trans
>;
};
adjust_layer {
- // | | BTLDR | | | | | | | | | | | | BTLDR | |
- // | BT_CLR | BT0 | BT1 | BT2 | BT3 | BT4 | | BT4 | BT3 | BT2 | BT1 | BT0 | BT_CLR |
- // | RST | | | | | | | | | | | | RST |
- // | | | | | | | |
+ // | BTLDR | | | | | | | | | | | | BTLDR |
+ // | BT_CLR | BT0 | BT1 | BT2 | BT3 | BT4 | | BT4 | BT3 | BT2 | BT1 | BT0 | BT_CLR |
+ // | RST | | | | | | | | | | | | RST |
+ // | | | | | | | |
bindings = <
- &none &bootloader &reset &none &none &none &none &none &none &none &none &none &bootloader &none
- &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_SEL 4 &bt BT_SEL 3 &bt BT_SEL 2 &bt BT_SEL 1 &bt BT_SEL 0 &bt BT_CLR
- &reset &none &none &none &none &none &none &none &none &none &none &reset
- &trans &none &trans &none &trans &trans
+ &bootloader &reset &none &none &none &none &none &none &none &none &none &bootloader
+ &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_SEL 4 &bt BT_SEL 3 &bt BT_SEL 2 &bt BT_SEL 1 &bt BT_SEL 0 &bt BT_CLR
+ &reset &none &none &none &none &none &none &none &none &none &none &reset
+ &trans &none &trans &none &trans &trans
>;
};
};
-};
\ No newline at end of file
+};
diff --git a/app/boards/arm/dao/dao_right.dts b/app/boards/arm/dao/dao_right.dts
index 0684efeb..786c62b8 100644
--- a/app/boards/arm/dao/dao_right.dts
+++ b/app/boards/arm/dao/dao_right.dts
@@ -10,7 +10,7 @@
col-offset = <6>;
};
-&less_key_transform {
+&extra_keys_transform {
col-offset = <6>;
};