Correct encoder map definition spelling

4 files changed, 122 insertions, 122 deletions

diff --git a/keyboards/keychron/q6_pro/ansi_encoder/info.json b/keyboards/keychron/q6_pro/ansi_encoder/info.json
index 668610b5cf..70d32029e4 100755
--- a/keyboards/keychron/q6_pro/ansi_encoder/info.json
+++ b/keyboards/keychron/q6_pro/ansi_encoder/info.json
@@ -3,126 +3,6 @@
     	"pid": "0x0660",
     	"device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0,10], "x":10.75, "y":0},
-                {"matrix":[0,11], "x":11.75, "y":0},
-                {"matrix":[0,12], "x":12.75, "y":0},
-                {"matrix":[0,13], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-                {"matrix":[0,17], "x":18.5, "y":0},
-                {"matrix":[0,18], "x":19.5, "y":0},
-                {"matrix":[0,19], "x":20.5, "y":0},
-                {"matrix":[0,20], "x":21.5, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-                {"matrix":[1,17], "x":18.5, "y":1.25},
-                {"matrix":[1,18], "x":19.5, "y":1.25},
-                {"matrix":[1,19], "x":20.5, "y":1.25},
-                {"matrix":[1,20], "x":21.5, "y":1.25},
-
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-                {"matrix":[2,17], "x":18.5, "y":2.25},
-                {"matrix":[2,18], "x":19.5, "y":2.25},
-                {"matrix":[2,19], "x":20.5, "y":2.25},
-                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
-
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,17], "x":18.5, "y":3.25},
-                {"matrix":[3,18], "x":19.5, "y":3.25},
-                {"matrix":[3,19], "x":20.5, "y":3.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25},
-                {"matrix":[4,18], "x":19.5, "y":4.25},
-                {"matrix":[4,19], "x":20.5, "y":4.25},
-                {"matrix":[4,20], "x":21.5, "y":4.25, "h":2},
-
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25},
-                {"matrix":[5,18], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5,19], "x":20.5, "y":5.25}
-            ]
-        }
-    },
     "rgb_matrix": {
         "layout": [
             {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk
index 98eb98e882..ee32568148 100644
--- a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk
+++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk
@@ -1 +1 @@
-ENCODER_MAP = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk
index b8c56c84c0..f1adcab005 100644
--- a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk
+++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-ENCODER_MAP = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q6_pro/info.json b/keyboards/keychron/q6_pro/info.json
index 02eef80f89..b94b557345 100755
--- a/keyboards/keychron/q6_pro/info.json
+++ b/keyboards/keychron/q6_pro/info.json
@@ -59,5 +59,125 @@
         "rotary": [
             {"pin_a": "A0", "pin_b": "A10"}
         ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[0,17], "x":18.5, "y":0},
+                {"matrix":[0,18], "x":19.5, "y":0},
+                {"matrix":[0,19], "x":20.5, "y":0},
+                {"matrix":[0,20], "x":21.5, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[1,17], "x":18.5, "y":1.25},
+                {"matrix":[1,18], "x":19.5, "y":1.25},
+                {"matrix":[1,19], "x":20.5, "y":1.25},
+                {"matrix":[1,20], "x":21.5, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25},
+                {"matrix":[2,18], "x":19.5, "y":2.25},
+                {"matrix":[2,19], "x":20.5, "y":2.25},
+                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3,17], "x":18.5, "y":3.25},
+                {"matrix":[3,18], "x":19.5, "y":3.25},
+                {"matrix":[3,19], "x":20.5, "y":3.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25},
+                {"matrix":[4,18], "x":19.5, "y":4.25},
+                {"matrix":[4,19], "x":20.5, "y":4.25},
+                {"matrix":[4,20], "x":21.5, "y":4.25, "h":2},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25},
+                {"matrix":[5,18], "x":18.5, "y":5.25, "w":2},
+                {"matrix":[5,19], "x":20.5, "y":5.25}
+            ]
+        }
     }
 }