From fec89691d8252ed87b6880e8e05d64b9179ae610 Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Wed, 11 May 2022 14:58:13 +1000
Subject: [PATCH] Add per layer mapping macros

---
 miryoku/miryoku.dtsi                  | 20 +++++++++---------
 miryoku/miryoku_babel/miryoku_layer.h | 30 +++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/miryoku/miryoku.dtsi b/miryoku/miryoku.dtsi
index aaa0f95..392fb98 100644
--- a/miryoku/miryoku.dtsi
+++ b/miryoku/miryoku.dtsi
@@ -18,43 +18,43 @@
     compatible = "zmk,keymap";
     BASE_layer {
       label = "Base";
-      bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_BASE) >;
+      bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_BASE, MIRYOKU_LAYER_BASE) >;
     };
     EXTRA_layer {
       label = "Extra";
-      bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_EXTRA) >;
+      bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_EXTRA, MIRYOKU_LAYER_EXTRA) >;
     };
     TAP_layer {
       label = "Tap";
-      bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_TAP) >;
+      bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_TAP, MIRYOKU_LAYER_TAP) >;
     };
     BUTTON_layer {
       label = "Button";
-      bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_BUTTON) >;
+      bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_BUTTON, MIRYOKU_LAYER_BUTTON) >;
     };
     NAV_layer {
       label = "Nav";
-      bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_NAV) >;
+      bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_NAV, MIRYOKU_LAYER_NAV) >;
     };
     MOUSE_layer {
       label = "Mouse";
-      bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_MOUSE) >;
+      bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_MOUSE, MIRYOKU_LAYER_MOUSE) >;
     };
     MEDIA_layer {
       label = "Media";
-      bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_MEDIA) >;
+      bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_MEDIA, MIRYOKU_LAYER_MEDIA) >;
     };
     NUM_layer {
       label = "Num";
-      bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_NUM) >;
+      bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_NUM, MIRYOKU_LAYER_NUM) >;
     };
     SYM_layer {
       label = "Sym";
-      bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_SYM) >;
+      bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_SYM, MIRYOKU_LAYER_SYM) >;
     };
     FUN_layer {
       label = "Fun";
-      bindings = < U_MACRO_VA_ARGS(MIRYOKU_MAPPING, MIRYOKU_LAYER_FUN) >;
+      bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_FUN, MIRYOKU_LAYER_FUN) >;
     };
   };
 };
diff --git a/miryoku/miryoku_babel/miryoku_layer.h b/miryoku/miryoku_babel/miryoku_layer.h
index 341e538..7189f9a 100644
--- a/miryoku/miryoku_babel/miryoku_layer.h
+++ b/miryoku/miryoku_babel/miryoku_layer.h
@@ -57,6 +57,9 @@
     #endif
   #endif
 #endif
+#if !defined(MIRYOKU_LAYERMAPPING_BASE)
+  #define MIRYOKU_LAYERMAPPING_BASE MIRYOKU_MAPPING
+#endif
 
 #if !defined(MIRYOKU_LAYER_EXTRA)
   #if defined (MIRYOKU_LAYERS_FLIP)
@@ -109,6 +112,9 @@
     #endif
   #endif
 #endif
+#if !defined(MIRYOKU_LAYERMAPPING_EXTRA)
+  #define MIRYOKU_LAYERMAPPING_EXTRA MIRYOKU_MAPPING
+#endif
 
 #if !defined(MIRYOKU_LAYER_TAP)
   #if defined (MIRYOKU_LAYERS_FLIP)
@@ -161,10 +167,16 @@
     #endif
   #endif
 #endif
+#if !defined(MIRYOKU_LAYERMAPPING_TAP)
+  #define MIRYOKU_LAYERMAPPING_TAP MIRYOKU_MAPPING
+#endif
 
 #if !defined(MIRYOKU_LAYER_BUTTON)
   #define MIRYOKU_LAYER_BUTTON MIRYOKU_ALTERNATIVES_BUTTON
 #endif
+#if !defined(MIRYOKU_LAYERMAPPING_BUTTON)
+  #define MIRYOKU_LAYERMAPPING_BUTTON MIRYOKU_MAPPING
+#endif
 
 #if !defined(MIRYOKU_LAYER_NAV)
   #if defined (MIRYOKU_LAYERS_FLIP)
@@ -183,6 +195,9 @@
     #endif
   #endif
 #endif
+#if !defined(MIRYOKU_LAYERMAPPING_NAV)
+  #define MIRYOKU_LAYERMAPPING_NAV MIRYOKU_MAPPING
+#endif
 
 #if !defined(MIRYOKU_LAYER_MOUSE)
   #if defined (MIRYOKU_LAYERS_FLIP)
@@ -201,6 +216,9 @@
     #endif
   #endif
 #endif
+#if !defined(MIRYOKU_LAYERMAPPING_MOUSE)
+  #define MIRYOKU_LAYERMAPPING_MOUSE MIRYOKU_MAPPING
+#endif
 
 #if !defined(MIRYOKU_LAYER_MEDIA)
   #if defined (MIRYOKU_LAYERS_FLIP)
@@ -219,6 +237,9 @@
     #endif
   #endif
 #endif
+#if !defined(MIRYOKU_LAYERMAPPING_MEDIA)
+  #define MIRYOKU_LAYERMAPPING_MEDIA MIRYOKU_MAPPING
+#endif
 
 #if !defined(MIRYOKU_LAYER_NUM)
   #if defined (MIRYOKU_LAYERS_FLIP)
@@ -227,6 +248,9 @@
     #define MIRYOKU_LAYER_NUM MIRYOKU_ALTERNATIVES_NUM
   #endif
 #endif
+#if !defined(MIRYOKU_LAYERMAPPING_NUM)
+  #define MIRYOKU_LAYERMAPPING_NUM MIRYOKU_MAPPING
+#endif
 
 #if !defined(MIRYOKU_LAYER_SYM)
   #if defined (MIRYOKU_LAYERS_FLIP)
@@ -235,6 +259,9 @@
     #define MIRYOKU_LAYER_SYM MIRYOKU_ALTERNATIVES_SYM
   #endif
 #endif
+#if !defined(MIRYOKU_LAYERMAPPING_SYM)
+  #define MIRYOKU_LAYERMAPPING_SYM MIRYOKU_MAPPING
+#endif
 
 #if !defined(MIRYOKU_LAYER_FUN)
   #if defined (MIRYOKU_LAYERS_FLIP)
@@ -243,3 +270,6 @@
     #define MIRYOKU_LAYER_FUN MIRYOKU_ALTERNATIVES_FUN
   #endif
 #endif
+#if !defined(MIRYOKU_LAYERMAPPING_FUN)
+  #define MIRYOKU_LAYERMAPPING_FUN MIRYOKU_MAPPING
+#endif