Skip to content

Commit

Permalink
Merge pull request #4 from kumamuk-git/modify-zmk-branch
Browse files Browse the repository at this point in the history 
keymap-editorでの編集後に発生するビルドエラーを修正
  • Loading branch information
@kumamuk-git
kumamuk-git authored Dec 18, 2024
2 parents eb99578 + 56aa9ca commit f82fe61
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
58 changes: 29 additions & 29 deletions config/roBa.keymap
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <behaviors.dtsi>
#include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/mouse.h>
#include <dt-bindings/zmk/pointing.h>

#define MOUSE 4
#define SCROLL 5
Expand Down Expand Up @@ -67,68 +67,68 @@

default_layer {
bindings = <
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &lt 5 I &kp O &kp P
&kp A &kp S &kp D &kp F &kp G &kp LS(LG(S)) &kp MINUS &kp H &kp J &kp K &kp L &kp SQT
&mt LEFT_SHIFT Z &kp X &kp C &kp V &kp B &kp COLON &kp SEMICOLON &kp N &kp M &kp COMMA &kp DOT &kp SLASH
&kp LCTRL &kp LEFT_WIN &kp LEFT_ALT &lt_to_layer_0 6 INT_HENKAN &lt 2 SPACE &lt_to_layer_0 3 INT_MUHENKAN &kp BACKSPACE &lt 1 ENTER &kp DEL
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &lt 5 I &kp O &kp P
&kp A &kp S &kp D &kp F &kp G &kp LS(LG(S)) &kp MINUS &kp H &kp J &kp K &kp L &kp SQT
&mt LEFT_SHIFT Z &kp X &kp C &kp V &kp B &kp COLON &kp SEMICOLON &kp N &kp M &kp COMMA &kp DOT &kp SLASH
&kp LCTRL &kp LEFT_WIN &kp LEFT_ALT &lt_to_layer_0 6 INT_HENKAN &lt 2 SPACE &lt_to_layer_0 3 INT_MUHENKAN &kp BACKSPACE &lt 1 ENTER &kp DEL
>;

sensor-bindings = <&inc_dec_kp PG_UP PAGE_DOWN>;
};

FUNCTION {
bindings = <
&trans &trans &trans &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5
&trans &trans &trans &trans &trans &trans &trans &kp F6 &kp F7 &kp F8 &kp F9 &kp F10
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F11
&trans &trans &trans &trans &trans &trans &trans &trans &kp F12
&trans &trans &trans &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5
&trans &trans &trans &trans &trans &trans &kp F13 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F11
&trans &trans &trans &trans &trans &trans &trans &trans &kp F12
>;
};

NUM {
bindings = <
&kp MINUS &kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp PLUS &kp CARET &kp AMPERSAND &kp TILDE &kp LEFT_PARENTHESIS &kp RIGHT_PARENTHESIS
&kp SLASH &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp ASTERISK &kp LC(LA(KP_NUMBER_0)) &kp UNDERSCORE &kp EXCLAMATION &kp AT_SIGN &kp HASH &kp DOLLAR &kp PERCENT
&mt LEFT_SHIFT KP_NUMBER_0 &kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &kp PERIOD &kp EQUAL &trans &kp LEFT_BRACKET &kp RIGHT_BRACKET &kp LEFT_BRACE &kp RIGHT_BRACE &kp BACKSLASH
&trans &trans &trans &trans &trans &trans &trans &trans &kp PIPE
&kp MINUS &kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp PLUS &kp CARET &kp AMPERSAND &kp TILDE &kp LEFT_PARENTHESIS &kp RIGHT_PARENTHESIS
&kp SLASH &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp ASTERISK &kp LC(LA(KP_NUMBER_0)) &kp UNDERSCORE &kp EXCLAMATION &kp AT_SIGN &kp HASH &kp DOLLAR &kp PERCENT
&mt LEFT_SHIFT KP_NUMBER_0 &kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &kp PERIOD &kp EQUAL &trans &kp LEFT_BRACKET &kp RIGHT_BRACKET &kp LEFT_BRACE &kp RIGHT_BRACE &kp BACKSLASH
&trans &trans &trans &trans &trans &trans &trans &trans &kp PIPE
>;
};

ARROW {
bindings = <
&kp ESCAPE &kp LC(LS(TAB)) &kp UP_ARROW &kp LC(TAB) &trans &trans &trans &trans &trans &trans
&kp HOME &kp LEFT_ARROW &kp DOWN_ARROW &kp RIGHT_ARROW &kp END &trans &trans &trans &trans &trans &trans &trans
&kp LEFT_SHIFT &kp LG(LS(LEFT_ARROW)) &trans &kp LG(LS(RIGHT_ARROW)) &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans
&kp ESCAPE &kp LC(LS(TAB)) &kp UP_ARROW &kp LC(TAB) &trans &trans &trans &trans &trans &trans
&kp HOME &kp LEFT_ARROW &kp DOWN_ARROW &kp RIGHT_ARROW &kp END &trans &trans &trans &trans &trans &trans &trans
&kp LEFT_SHIFT &kp LG(LS(LEFT_ARROW)) &trans &kp LG(LS(RIGHT_ARROW)) &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans
>;

sensor-bindings = <&inc_dec_kp LC(PAGE_UP) LC(PAGE_DOWN)>;
};

MOUSE {
bindings = <
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &mkp MB1 &mkp MB3 &mkp MB2 &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &mkp MB1 &mkp MB3 &mkp MB2 &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans
>;
};

SCROLL {
bindings = <
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans
>;
};

layer_6 {
bindings = <
&trans &trans &trans &trans &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &trans &trans &bootloader &trans &trans &trans &trans &bt BT_CLR
&trans &trans &trans &trans &trans &trans &trans &trans &bt BT_CLR_ALL
&trans &trans &trans &trans &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &trans &trans &bootloader &trans &trans &trans &trans &bt BT_CLR
&trans &trans &trans &trans &trans &trans &trans &trans &bt BT_CLR_ALL
>;
};
};
Expand Down
4 changes: 2 additions & 2 deletions config/west.yml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
manifest:
remotes:
- name: zmkfirmware
url-base: https://github.com/petejohanson
url-base: https://github.com/zmkfirmware
- name: kumamuk-git
url-base: https://github.com/kumamuk-git
projects:
- name: zmk
remote: zmkfirmware
revision: feat/pointers-move-scroll
revision: main
import: app/west.yml
- name: zmk-pmw3610-driver
remote: kumamuk-git
Expand Down

0 comments on commit f82fe61

Please sign in to comment.