From e4aad8344300d7d3431dfab2565f7570395c17c0 Mon Sep 17 00:00:00 2001 From: Jamie Ding Date: Tue, 4 Jan 2022 05:18:25 +0000 Subject: [PATCH] [Keymap 3Jan2022 21:03] reorder Win/Apl, so that Win is default --- app/boards/shields/mercury/mercury.keymap | 48 +++++++++++------------ app/boards/shields/mercury/readme.txt | 4 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/boards/shields/mercury/mercury.keymap b/app/boards/shields/mercury/mercury.keymap index 24f02ebe..25141008 100644 --- a/app/boards/shields/mercury/mercury.keymap +++ b/app/boards/shields/mercury/mercury.keymap @@ -3,8 +3,8 @@ #include #include -#define APL 0 -#define WIN 1 +#define WIN 0 +#define APL 1 #define NUM 2 #define FUN 3 #define NAV 4 @@ -12,7 +12,7 @@ #define SYS 6 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -// [Keymap 11Nov2021 10:25] +// [Keymap 3Jan2022 21:03] // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% / { @@ -68,21 +68,21 @@ keymap { compatible = "zmk,keymap"; - apple_layer { - bindings = < -&hlt FUN TAB &pht LSFT Q &kp W &kp E &kp R &kp T /**/ &kp Y &kp U &kp I &kp O &kp P &kp BKSP -&hlt NUM ESC &kp A &kp S &kp D &pht LSFT F &kp G /**/ &kp H &kp J &kp K &kp L &kp SCLN &cht RET QUOT - &kp LSFT &kp Z &kp X &kp C &kp V &kp B /**/ &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT - &kp LCTL &kp LALT &kp LGUI /**/ &kp SPC &mo NAV &mo MED - >; - }; - windows_layer { 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 - &kp LGUI &kp LALT &kp LCTL /**/ &trans &trans &trans +&hlt FUN TAB &pht LSFT Q &kp W &kp E &kp R &kp T /**/ &kp Y &kp U &kp I &kp O &kp P &kp BKSP +&hlt NUM ESC &kp A &kp S &kp D &pht LSFT F &kp G /**/ &kp H &kp J &kp K &kp L &kp SCLN &cht RET QUOT + &kp LSFT &kp Z &kp X &kp C &kp V &kp B /**/ &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT + &kp LGUI &kp LALT &kp LCTL /**/ &kp SPC &mo NAV &mo MED + >; + }; + + apple_layer { + 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 + &kp LCTL &kp LALT &kp LGUI /**/ &kp SPC &mo NAV &mo MED >; }; @@ -92,16 +92,16 @@ &mo SYS &kp LSFT &trans &trans &trans &trans /**/ &trans &kp NUM_7 &kp NUM_8 &kp NUM_9 &trans &trans &trans &trans &kp GRAV &kp TILDE &kp LSFT &trans /**/ &kp EQL &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp LBKT &kp RBKT &trans &trans &trans &trans &trans &trans /**/ &kp MINUS &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp BSLH &trans - &trans &trans &trans /**/ &trans &kp NUM_0 &trans + &trans &trans &trans /**/ &trans &kp NUM_0 &trans >; }; function_layer { bindings = < -&trans &kp LSFT &trans &trans &trans &trans /**/ &kp F12 &kp F7 &kp F8 &kp F9 &trans &trans -&mo SYS &trans &trans &trans &kp LSFT &trans /**/ &kp F11 &kp F4 &kp F5 &kp F6 &kp LBKT &kp RBKT -&trans &trans &trans &trans &trans &trans /**/ &kp F10 &kp F1 &kp F2 &kp F3 &trans &trans - &trans &trans &trans /**/ &trans &trans &trans +&trans &kp LSFT &trans &trans &trans &trans /**/ &kp F12 &kp F7 &kp F8 &kp F9 &trans &trans +&mo SYS &trans &trans &trans &kp LSFT &trans /**/ &kp F11 &kp F4 &kp F5 &kp F6 &kp LBKT &kp RBKT +&trans &trans &trans &trans &trans &trans /**/ &kp F10 &kp F1 &kp F2 &kp F3 &trans &trans + &trans &trans &trans /**/ &trans &trans &trans >; }; @@ -125,9 +125,9 @@ system_layer { bindings = < -&trans &trans &to WIN &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans -&trans &to APL &out OUT_USB &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans -&trans &trans &trans &bt BT_CLR &trans &out OUT_BLE /**/ &trans &trans &trans &trans &trans &trans +&trans &trans &to WIN &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans +&trans &to APL &out OUT_USB &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans +&trans &trans &trans &bt BT_CLR &trans &out OUT_BLE /**/ &trans &trans &trans &trans &trans &trans &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 /**/ &trans &trans &trans >; }; diff --git a/app/boards/shields/mercury/readme.txt b/app/boards/shields/mercury/readme.txt index 70190662..4ed99419 100644 --- a/app/boards/shields/mercury/readme.txt +++ b/app/boards/shields/mercury/readme.txt @@ -1,7 +1,7 @@ from Windows CMD: cd zmk\app -west build -d build/left -p -b nice_nano -- -DSHIELD=mercury_left +west build -d build/left -p -b nice_nano -- -DSHIELD=mercury_left west build -d build/right -p -b nice_nano -- -DSHIELD=mercury_right -west build -d build/left -p -b nice_nano_v2 -- -DSHIELD=mercury_left +west build -d build/left -p -b nice_nano_v2 -- -DSHIELD=mercury_left west build -d build/right -p -b nice_nano_v2 -- -DSHIELD=mercury_right \ No newline at end of file