From ef2c4f7b45c3a0f50a0f2802734b1dca79e53866 Mon Sep 17 00:00:00 2001 From: DeBasti Date: Sun, 14 Jul 2024 20:08:28 +0200 Subject: [PATCH] finished mac default layer & finished mac nav layer --- boards/arm/zaphod/zaphod.keymap | 14 +++++++------- boards/shields/zaphod_lite/zaphod_lite.keymap | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/boards/arm/zaphod/zaphod.keymap b/boards/arm/zaphod/zaphod.keymap index e54ea116..5d12c57a 100644 --- a/boards/arm/zaphod/zaphod.keymap +++ b/boards/arm/zaphod/zaphod.keymap @@ -9,8 +9,8 @@ #include #include -#define HRML(k1,k2,k3,k4) &ht LGUI k1 &ht LALT k2 &ht LCTRL k3 &ht LSHIFT k4 -#define AC(keycode) &ac LC(keycode) keycode +#define HRML(k1,k2,k3,k4) &ht LCTRL k1 &ht LALT k2 &ht LGUI k3 &ht LSHIFT k4 +#define AC(keycode) &ac LG(keycode) keycode #define LTR 0 #define MAC 1 @@ -145,7 +145,7 @@ &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Z &kp LS(NON_US_HASH) //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ //│ A │ R │ S │ T │ G │ │ M │ N │ E │ I │ O │ - HRML(A, R, S, T) &kp G &kp M &ht RSHIFT N &ht RCTRL E < SON I &ht RGUI O + HRML(A, R, S, T) &kp G &kp M &ht RSHIFT N &ht RGUI E < SON I &ht RCTRL O //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ //│ Z │ X │ C │ D │ V │ │ K │ H │ , < │ . > │ ? │ &kp Y &kp X AC(C) &kp D AC(V) &kp K &kp H &kp COMMA &kp DOT &kp LS(MINUS) @@ -191,7 +191,7 @@ >; }; -//TODO: macsym & macnav anpassen +//TODO: macsym anpassen macsym_layer { bindings = < @@ -204,9 +204,9 @@ macnav_layer { bindings = < - &none &none &none &teamsMute &none &none &kp INS &kp DEL &kp PG_UP &none - &kp RC(LEFT) &none &none &kp C_VOL_UP &none &kp PSCRN &kp LEFT &kp UP &kp RIGHT &none - &kp RC(RIGHT) &vsCodeFormat &kp LC(C) &kp C_VOL_DN &kp LC(V) &none &kp HOME &kp DOWN &kp PG_DN &kp END + &none &none &none &kp LG(LS(M)) &none &none &kp INS &kp DEL &kp PG_UP &none + &kp RC(LEFT) &none &kp LG(S) &kp C_VOL_UP &none &kp PSCRN &kp LEFT &kp UP &kp RIGHT &none + &kp RC(RIGHT) &vsCodeFormat &kp LG(C) &kp C_VOL_DN &kp LG(V) &none &kp LG(LEFT) &kp DOWN &kp PG_DN &kp LG(RIGHT) &kp SPACE &kp TAB &none &trans >; }; diff --git a/boards/shields/zaphod_lite/zaphod_lite.keymap b/boards/shields/zaphod_lite/zaphod_lite.keymap index e54ea116..5d12c57a 100644 --- a/boards/shields/zaphod_lite/zaphod_lite.keymap +++ b/boards/shields/zaphod_lite/zaphod_lite.keymap @@ -9,8 +9,8 @@ #include #include -#define HRML(k1,k2,k3,k4) &ht LGUI k1 &ht LALT k2 &ht LCTRL k3 &ht LSHIFT k4 -#define AC(keycode) &ac LC(keycode) keycode +#define HRML(k1,k2,k3,k4) &ht LCTRL k1 &ht LALT k2 &ht LGUI k3 &ht LSHIFT k4 +#define AC(keycode) &ac LG(keycode) keycode #define LTR 0 #define MAC 1 @@ -145,7 +145,7 @@ &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Z &kp LS(NON_US_HASH) //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ //│ A │ R │ S │ T │ G │ │ M │ N │ E │ I │ O │ - HRML(A, R, S, T) &kp G &kp M &ht RSHIFT N &ht RCTRL E < SON I &ht RGUI O + HRML(A, R, S, T) &kp G &kp M &ht RSHIFT N &ht RGUI E < SON I &ht RCTRL O //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ //│ Z │ X │ C │ D │ V │ │ K │ H │ , < │ . > │ ? │ &kp Y &kp X AC(C) &kp D AC(V) &kp K &kp H &kp COMMA &kp DOT &kp LS(MINUS) @@ -191,7 +191,7 @@ >; }; -//TODO: macsym & macnav anpassen +//TODO: macsym anpassen macsym_layer { bindings = < @@ -204,9 +204,9 @@ macnav_layer { bindings = < - &none &none &none &teamsMute &none &none &kp INS &kp DEL &kp PG_UP &none - &kp RC(LEFT) &none &none &kp C_VOL_UP &none &kp PSCRN &kp LEFT &kp UP &kp RIGHT &none - &kp RC(RIGHT) &vsCodeFormat &kp LC(C) &kp C_VOL_DN &kp LC(V) &none &kp HOME &kp DOWN &kp PG_DN &kp END + &none &none &none &kp LG(LS(M)) &none &none &kp INS &kp DEL &kp PG_UP &none + &kp RC(LEFT) &none &kp LG(S) &kp C_VOL_UP &none &kp PSCRN &kp LEFT &kp UP &kp RIGHT &none + &kp RC(RIGHT) &vsCodeFormat &kp LG(C) &kp C_VOL_DN &kp LG(V) &none &kp LG(LEFT) &kp DOWN &kp PG_DN &kp LG(RIGHT) &kp SPACE &kp TAB &none &trans >; };