🚸 merged game layer with keypad && removed redundent defs

RamezAkasheh · Jun 25, 2024 · 019a70d · 019a70d
1 parent 10ad93f
commit 019a70d
Showing 1 changed file with 24 additions and 34 deletions.
diff --git a/config/adv360.keymap b/config/adv360.keymap
@@ -6,15 +6,9 @@
 
 #define DEFAULT_LAYER 0
 #define FN_LAYER 1
-#define GAME_LAYER 2
-#define KEYPAD 3
-#define MOD_LAYER 4
-#define MACRO_LAYER 5
-
-#define L_A_C LA(LCTRL)
-#define L_A_S LA(LSFT)
-#define L_C_S LC(LSFT)
-#define L_A_C_S LA(LC(LSFT))
+#define KEYPAD 2
+#define MOD_LAYER 3
+#define MACRO_LAYER 4
 
 / {
  behaviors {
@@ -43,15 +37,17 @@
  keymap {
  compatible = "zmk,keymap";
 
+// 0
  default_layer {
  bindings = <
- &kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &tog KEYPAD &mo MOD_LAYER &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS
- &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp LG(LC(LEFT)) &kp LG(LC(RIGHT)) &kp Y &kp U &kp I &kp O &kp P &kp BSLH
- &kp ESC &kp A &kp S &kp D &kp F &kp G &kp LG(LS(LEFT)) &kp LCTRL &kp LALT &kp LGUI &kp RCTRL &kp LG(LS(RIGHT)) &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 L_A_C &kp L_A_S &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
- &to FN_LAYER &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp BSPC &kp DEL &kp L_A_C_S &kp L_C_S &kp ENTER &kp SPACE &kp DOWN &kp UP &kp LBKT &kp RBKT &to FN_LAYER
+ &kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &tog KEYPAD  &mo MOD_LAYER &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS
+ &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp LG(LC(LEFT))  &kp LG(LC(RIGHT)) &kp Y &kp U &kp I &kp O &kp P &kp BSLH
+ &kp ESC &kp A &kp S &kp D &kp F &kp G &kp LG(LS(LEFT)) &kp LCTRL &kp LALT  &kp LGUI &kp RCTRL  &kp LG(LS(RIGHT)) &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 LA(LCTRL)  &kp LA(LSFT) &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
+ &to FN_LAYER &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp BSPC &kp DEL &kp LA(LC(LSFT)) &kp LC(LSFT) &kp ENTER &kp SPACE &kp DOWN &kp UP &kp LBKT &kp RBKT &to FN_LAYER
  >;
  };
+// 1
  fn {
  bindings = <
  &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &tog KEYPAD &mo MOD_LAYER &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
@@ -61,32 +57,26 @@
  &to DEFAULT_LAYER &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &to DEFAULT_LAYER
  >;
  };
- game_layer {
- bindings = <
- &kp EQUAL &kp N5 &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &mo MOD_LAYER &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS
- &none &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp LG(LC(RIGHT)) &kp Y &kp U &kp I &kp O &kp P &kp BSLH
- &none &kp LSHFT &kp A &kp S &kp D &kp F &kp G &kp LCTRL &kp LALT &kp LGUI &kp RCTRL &kp LG(LS(RIGHT)) &kp H &kp J &kp K &kp L &kp SEMI &kp SQT
- &none &kp LCTRL &kp Z &kp X &kp C &kp B &kp L_A_C &kp L_A_S &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
- &mo FN_LAYER &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp SPACE &kp DEL &kp L_A_C_S &kp L_C_S &kp ENTER &kp SPACE &kp DOWN &kp UP &kp LBKT &kp RBKT &mo FN_LAYER 
- >;
- };
- keypad {
+// 2
+ keypad-game {
  bindings = <
- &kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &trans &mo MOD_LAYER &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 &trans &trans &trans &trans &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 &trans &trans &kp N &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_ENTER &kp RSHFT
- &trans &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT  &trans &trans &trans &trans &trans &kp KP_N0 &kp DOWN &kp UP &kp KP_DOT &kp RBKT &trans
+ &kp F1 &kp N5 &kp N1 &kp N2 &kp N3 &kp N4 &trans    &mo MOD_LAYER &kp SLCK &kp KP_NUM &kp KP_EQUAL &kp KP_DIVIDE &kp KP_MULTIPLY &kp MINUS
+ &kp F2 &kp TAB &kp Q &kp W &kp E &kp R &kp T    &none &kp Y  &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp BSLH
+ &kp F3 &kp LSHFT &kp A &kp S &kp D &kp F &kp G  &trans  &trans &trans &trans &none &kp H  &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp SQT
+ &kp F4 &kp LCTRL &kp Z  &kp X &kp C &kp B   &trans &trans &kp N  &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_ENTER &kp RSHFT
+ &kp F5 &kp GRAVE &kp CAPS &kp LEFT &kp LALT &kp SPACE &kp BSPC &trans &trans &trans &kp KP_N0  &kp DOWN &kp UP &kp KP_DOT &kp RBKT &trans
  >;
  };
+// 3
  mod {
  bindings = <
- &none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4  &none &trans &none &none &none &none &none &none
- &none &none &none &none &none &none  &bootloader &bootloader &none &none &none &none &none &none
- &none &none &none &none &none &to GAME_LAYER &none &none &none &bt BT_CLR &none &rgb_ug RGB_MEFS_CMD 5 &none &none &none &none &none &none
- &none &none &none &none &macro_ver &to DEFAULT_LAYER &none &none &none &none &none &none &none &none
- &none &none &none &none &none  &none &none &none &none &bl BL_TOG &rgb_ug RGB_TOG &bl BL_INC &bl BL_DEC &none &none &none
+ &none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none &trans &none &none &none &none &none &none
+ &none &none &none &none &none &none &bootloader &bootloader &none &none &none &none &none &none
+ &none &none &none &none &none &none  &none &none &none &bt BT_CLR &none &rgb_ug RGB_MEFS_CMD 5 &none &none &none &none &none &none
+ &none &none &none &none &macro_ver &none  &none &none &none &none &none &none &none &none
+ &none &none &none &none &none &none &none &none &none &bl BL_TOG &rgb_ug RGB_TOG &bl BL_DEC &bl BL_INC &none &none &none
  >;
  };
+// 4
  };
 };