Skip to content

Commit

Permalink
Merge branch 'My2.0' into MyV3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Kuanju Chen committed Dec 30, 2023
2 parents 1728a66 + bba2734 commit 4dff498
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 16 deletions.
2 changes: 2 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ all:
-e TIMESTAMP=$(TIMESTAMP) \
-e COMMIT=$(COMMIT) \
zmk
cp firmware/$(TIMESTAMP)-$(COMMIT)-left.uf2 firmware/left.uf2
cp firmware/$(TIMESTAMP)-$(COMMIT)-right.uf2 firmware/right.uf2

clean:
rm -f firmware/*.uf2
Expand Down
2 changes: 1 addition & 1 deletion UPGRADE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ This assumes you already have [GitHub desktop](https://desktop.github.com/) down
Once the merge is complete you should be able to click the "push origin" button in the top bar. At this point your changes should be uploaded to GitHub servers and the build should start
9. Test your firmware

When the build succeeds download the uf2 files and flash them as normal. Test the keymap, if keys are shifted one way or the other it's likely you deleted too many or not enough behaviours.
When the build succeeds download the uf2 files and flash them as normal. Test the keymap, if keys are shifted one way or the other it's likely you deleted too many or not enough behaviours.
95 changes: 80 additions & 15 deletions config/adv360.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@
#include <dt-bindings/zmk/rgb.h>
#include <dt-bindings/zmk/backlight.h>

#define DVORAK_WIN 0
#define QWERTY_WIN 1
#define DVORAK_MAC 2
#define QWERTY_MAC 3
#define DVORAK_MAC_CTRL_CMD_SWAP 4
#define QWERTY_MAC_CTRL_CMD_SWAP 5
#define BUILTIN_QWERTY 6
#define NUM 7
#define FN 8
#define SYS 9

/ {
behaviors {
#include "macros.dtsi"
Expand Down Expand Up @@ -33,29 +44,83 @@

default_layer {
bindings = <
&kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &tog 1 &mo 3 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS
&kp TAB &kp Q &kp W &kp E &kp R &kp T &none &none &kp Y &kp U &kp I &kp O &kp P &kp BSLH
&kp ESC &kp A &kp S &kp D &kp F &kp G &none &kp LCTRL &kp LALT &kp LGUI &kp RCTRL &none &kp H &kp J &kp K &kp L &kp SEMI &kp SQT
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp HOME &kp PG_UP &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
&mo 2 &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp BSPC &kp DEL &kp END &kp PG_DN &kp ENTER &kp SPACE &kp UP &kp DOWN &kp LBKT &kp RBKT &mo 2
&kp LC(S) &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp LGUI &kp RGUI &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp LC(S)
&lt FN TAB &kp SQT &kp COMMA &kp DOT &kp P &kp Y &kp MINUS &kp LBKT &kp F &kp G &kp C &kp R &kp L &kp GRAVE
&kp LSHFT &kp A &kp O &kp E &kp U &kp I &kp EQUAL &kp LCTRL &kp LALT &kp RALT &kp RCTRL &kp RBKT &kp D &kp H &kp T &kp N &kp S &kp RSHFT
&kp LC(LSHFT) &kp SEMI &kp Q &kp J &kp K &kp X &kp PG_UP &kp HOME &kp B &kp M &kp W &kp V &kp Z &kp RCTRL
&kp LG(LCTRL) &kp DOWN &kp LEFT &kp RIGHT &kp UP &kp SPACE &kp ESC &kp PG_DN &kp END &kp BSPC &kp ENTER &kp FSLH &kp BSLH &to QWERTY_WIN &to DVORAK_MAC &mo SYS
>;
};
qwerty_win {
bindings = <
&kp LC(S) &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp LGUI &kp RGUI &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp LC(S)
&lt FN TAB &kp Q &kp W &kp E &kp R &kp T &kp MINUS &kp LBKT &kp Y &kp U &kp I &kp O &kp P &kp GRAVE
&kp LSHFT &kp A &kp S &kp D &kp F &kp G &kp EQUAL &kp LCTRL &kp LALT &kp RALT &kp RCTRL &kp RBKT &kp H &kp J &kp K &kp L &kp SEMI &kp RSHFT
&kp LC(LSHFT) &kp Z &kp X &kp C &kp V &kp B &kp PG_UP &kp HOME &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RCTRL
&kp LG(LCTRL) &kp DOWN &kp LEFT &kp RIGHT &kp UP &kp SPACE &kp ESC &kp PG_DN &kp END &kp BSPC &kp ENTER &kp SQT &kp BSLH &to DVORAK_WIN &to QWERTY_MAC &mo SYS
>;
};
dvorak_mac {
bindings = <
&kp LC(S) &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp LALT &kp RALT &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp LC(S)
&lt FN TAB &kp SQT &kp COMMA &kp DOT &kp P &kp Y &kp MINUS &kp LBKT &kp F &kp G &kp C &kp R &kp L &kp GRAVE
&kp LSHFT &kp A &kp O &kp E &kp U &kp I &kp EQUAL &kp LGUI &kp LCTRL &kp RCTRL &kp RGUI &kp RBKT &kp D &kp H &kp T &kp N &kp S &kp RSHFT
&kp LC(LSHFT) &kp SEMI &kp Q &kp J &kp K &kp X &kp PG_UP &kp HOME &kp B &kp M &kp W &kp V &kp Z &to DVORAK_MAC_CTRL_CMD_SWAP
&kp LG(LCTRL) &kp DOWN &kp LEFT &kp RIGHT &kp UP &kp SPACE &kp ESC &kp PG_DN &kp END &kp BSPC &kp ENTER &kp FSLH &kp BSLH &to QWERTY_MAC &to DVORAK_WIN &mo SYS
>;
};
qwerty_mac {
bindings = <
&kp LC(S) &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp LALT &kp RALT &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp LC(S)
&lt FN TAB &kp Q &kp W &kp E &kp R &kp T &kp MINUS &kp LBKT &kp Y &kp U &kp I &kp O &kp P &kp GRAVE
&kp LSHFT &kp A &kp S &kp D &kp F &kp G &kp EQUAL &kp LGUI &kp LCTRL &kp RCTRL &kp RGUI &kp RBKT &kp H &kp J &kp K &kp L &kp SEMI &kp RSHFT
&kp LC(LSHFT) &kp Z &kp X &kp C &kp V &kp B &kp PG_UP &kp HOME &kp N &kp M &kp COMMA &kp DOT &kp FSLH &to QWERTY_MAC_CTRL_CMD_SWAP
&kp LG(LCTRL) &kp DOWN &kp LEFT &kp RIGHT &kp UP &kp SPACE &kp ESC &kp PG_DN &kp END &kp BSPC &kp ENTER &kp SQT &kp BSLH &to DVORAK_MAC &to QWERTY_WIN &mo SYS
>;
};
dvorak_mac_ctrl_cmd_swap {
bindings = <
&kp LC(S) &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp LALT &kp RALT &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp LC(S)
&lt FN TAB &kp SQT &kp COMMA &kp DOT &kp P &kp Y &kp MINUS &kp LBKT &kp F &kp G &kp C &kp R &kp L &kp GRAVE
&kp LSHFT &kp A &kp O &kp E &kp U &kp I &kp EQUAL &kp LCTRL &kp LGUI &kp RGUI &kp RCTRL &kp RBKT &kp D &kp H &kp T &kp N &kp S &kp RSHFT
&kp LC(LSHFT) &kp SEMI &kp Q &kp J &kp K &kp X &kp PG_UP &kp HOME &kp B &kp M &kp W &kp V &kp Z &to DVORAK_MAC
&kp LG(LCTRL) &kp DOWN &kp LEFT &kp RIGHT &kp UP &kp SPACE &kp ESC &kp PG_DN &kp END &kp BSPC &kp ENTER &kp FSLH &kp BSLH &to QWERTY_MAC &to DVORAK_WIN &mo SYS
>;
};
qwerty_mac_ctrl_cmd_swap {
bindings = <
&kp LC(S) &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp LALT &kp RALT &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp LC(S)
&lt FN TAB &kp Q &kp W &kp E &kp R &kp T &kp MINUS &kp LBKT &kp Y &kp U &kp I &kp O &kp P &kp GRAVE
&kp LSHFT &kp A &kp S &kp D &kp F &kp G &kp EQUAL &kp LCTRL &kp LGUI &kp RGUI &kp RCTRL &kp RBKT &kp H &kp J &kp K &kp L &kp SEMI &kp RSHFT
&kp LC(LSHFT) &kp Z &kp X &kp C &kp V &kp B &kp PG_UP &kp HOME &kp N &kp M &kp COMMA &kp DOT &kp FSLH &to QWERTY_MAC
&kp LG(LCTRL) &kp DOWN &kp LEFT &kp RIGHT &kp UP &kp SPACE &kp ESC &kp PG_DN &kp END &kp BSPC &kp ENTER &kp SQT &kp BSLH &to DVORAK_MAC &to QWERTY_WIN &mo SYS
>;
};
builtin_qwerty {
bindings = <
&kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &tog NUM &mo SYS &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS
&kp TAB &kp Q &kp W &kp E &kp R &kp T &none &none &kp Y &kp U &kp I &kp O &kp P &kp BSLH
&kp ESC &kp A &kp S &kp D &kp F &kp G &none &kp LCTRL &kp LALT &kp LGUI &kp RCTRL &none &kp H &kp J &kp K &kp L &kp SEMI &kp SQT
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp HOME &kp PG_UP &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
&mo FN &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp BSPC &kp DEL &kp END &kp PG_DN &kp ENTER &kp SPACE &kp UP &kp DOWN &kp LBKT &kp RBKT &mo FN
>;
};
keypad {
bindings = <
&kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &trans &mo 3 &kp N6 &kp KP_NUM &kp KP_EQUAL &kp KP_DIVIDE &kp KP_MULTIPLY &kp MINUS
&kp TAB &kp Q &kp W &kp E &kp R &kp T &none &none &kp Y &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp BSLH
&kp ESC &kp A &kp S &kp D &kp F &kp G &none &kp LCTRL &kp LALT &kp LGUI &kp RCTRL &none &kp H &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp SQT
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp HOME &kp PG_UP &kp N &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_ENTER &kp RSHFT
&mo 2 &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp BSPC &kp DEL &kp END &kp PG_DN &kp ENTER &kp KP_N0 &kp UP &kp DOWN &kp KP_DOT &kp RBKT &mo 2
&trans &trans &trans &trans &trans &trans &trans &trans &trans &kp KP_NUM &kp KP_EQUAL &kp KP_DIVIDE &kp KP_MULTIPLY &trans
&trans &trans &trans &trans &trans &trans &none &none &trans &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &trans
&trans &trans &trans &trans &trans &trans &none &trans &trans &trans &trans &none &trans &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_ENTER &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp KP_N0 &trans &trans &kp KP_DOT &trans &trans
>;
};
fn {
bindings = <
&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &tog 1 &mo 3 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
&trans &trans &trans &trans &trans &trans &none &none &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &none &trans &trans &trans &trans &none &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
&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &tog NUM &mo SYS &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
&trans &trans &trans &trans &trans &trans &none &none &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &trans &none &trans &trans &trans &trans &none &trans &to DVORAK_WIN &to DVORAK_MAC &to BUILTIN_QWERTY &to QWERTY_MAC &trans
&trans &trans &trans &trans &trans &trans &kp C_MUTE &kp C_VOL_UP &trans &trans &trans &trans &trans &trans
&trans &trans &trans &trans &trans &kp LC(LA(LS(F))) &kp LC(LA(PAUSE_BREAK)) &trans &kp C_VOL_DN &kp DEL &trans &trans &trans &trans &trans &trans
>;
};
mod {
Expand Down
1 change: 1 addition & 0 deletions config/boards/arm/adv360/adv360_left_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ CONFIG_LED_PWM=y
CONFIG_ZMK_BACKLIGHT=y
CONFIG_ZMK_BACKLIGHT_BRT_START=20
CONFIG_ZMK_BACKLIGHT_AUTO_OFF_IDLE=y
CONFIG_ZMK_BACKLIGHT_BRT_SCALE=0

#BT configuration
CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
Expand Down
1 change: 1 addition & 0 deletions config/boards/arm/adv360/adv360_right_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ CONFIG_LED_PWM=y
CONFIG_ZMK_BACKLIGHT=y
CONFIG_ZMK_BACKLIGHT_BRT_START=20
CONFIG_ZMK_BACKLIGHT_AUTO_OFF_IDLE=y
CONFIG_ZMK_BACKLIGHT_BRT_SCALE=0

#Misc configuration
CONFIG_USB_DEVICE_VID=0x29EA
Expand Down
7 changes: 7 additions & 0 deletions config/version.dtsi
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#define VERSION_MACRO
macro_ver: macro_ver {
compatible = "zmk,behavior-macro";
label = "macro_ver";
#binding-cells = <0>;
bindings = <&kp N2>, <&kp N0>, <&kp N2>, <&kp N3>, <&kp N1>, <&kp N2>, <&kp N3>, <&kp N0>, <&kp MINUS>, <&kp M>, <&kp Y>, <&kp V>, <&kp N3>, <&kp MINUS>, <&kp N1>, <&kp N7>, <&kp N2>, <&kp N8>, <&kp A>, <&kp N6>, <&kp N6>, <&kp RET>;
};

0 comments on commit 4dff498

Please sign in to comment.