Merge remote-tracking branch 'origin/master' into develop

1 files changed, 110 insertions, 7 deletions

diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json
index f5d4253faa..8f119fe002 100644
--- a/keyboards/wuque/promise87/wkl/info.json
+++ b/keyboards/wuque/promise87/wkl/info.json
@@ -2,8 +2,15 @@
     "keyboard_name": "promise87",
     "url": "https://shop.wuquestudio.com/",
     "maintainer": "spbgzh",
+    "layout_aliases": {
+        "LAYOUT_all_wkl": "LAYOUT_all",
+        "LAYOUT_87_wkl": "LAYOUT_tkl_f13_ansi_wkl",
+        "LAYOUT_87_wkl_split_bs": "LAYOUT_tkl_f13_ansi_wkl_split_bs",
+        "LAYOUT_87_wkl_split_lshift": "LAYOUT_tkl_f13_ansi_wkl_split_lshift",
+        "LAYOUT_87_wkl_split_rshift": "LAYOUT_tkl_f13_ansi_wkl_split_rshift"
+    },
     "layouts": {
-        "LAYOUT_all_wkl": {
+        "LAYOUT_all": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "F1", "x": 1.25, "y": 0 },
@@ -37,6 +44,7 @@
                 { "label": "-", "x": 11, "y": 1.25 },
                 { "label": "=", "x": 12, "y": 1.25 },
                 { "label": "Backspace", "x": 13, "y": 1.25 },
+                { "label": "Backspace1", "x": 14, "y": 1.25 },
                 { "label": "Insert", "x": 15.25, "y": 1.25 },
                 { "label": "Home", "x": 16.25, "y": 1.25 },
                 { "label": "PageUp", "x": 17.25, "y": 1.25 },
@@ -72,7 +80,6 @@
                 { "label": ";", "x": 10.75, "y": 3.25 },
                 { "label": "'", "x": 11.75, "y": 3.25 },
                 { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
 
                 { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
                 { "label": "Shift2", "x": 1.25, "y": 4.25 },
@@ -100,7 +107,7 @@
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
         },
-        "LAYOUT_87_wkl": {
+        "LAYOUT_tkl_f13_ansi_wkl": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "F1", "x": 1.25, "y": 0 },
@@ -194,7 +201,7 @@
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
         },
-        "LAYOUT_87_wkl_split_bs": {
+        "LAYOUT_tkl_f13_ansi_wkl_split_bs": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "F1", "x": 1.25, "y": 0 },
@@ -228,6 +235,7 @@
                 { "label": "-", "x": 11, "y": 1.25 },
                 { "label": "=", "x": 12, "y": 1.25 },
                 { "label": "Backspace", "x": 13, "y": 1.25 },
+                { "label": "Backspace1", "x": 14, "y": 1.25 },
                 { "label": "Insert", "x": 15.25, "y": 1.25 },
                 { "label": "Home", "x": 16.25, "y": 1.25 },
                 { "label": "PageUp", "x": 17.25, "y": 1.25 },
@@ -263,7 +271,6 @@
                 { "label": ";", "x": 10.75, "y": 3.25 },
                 { "label": "'", "x": 11.75, "y": 3.25 },
                 { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
 
                 { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
                 { "label": "Z", "x": 2.25, "y": 4.25 },
@@ -289,7 +296,7 @@
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
         },
-        "LAYOUT_87_wkl_split_lshift": {
+        "LAYOUT_tkl_f13_ansi_wkl_split_lshift": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "F1", "x": 1.25, "y": 0 },
@@ -384,7 +391,7 @@
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
         },
-        "LAYOUT_87_wkl_split_rshift": {
+        "LAYOUT_tkl_f13_ansi_wkl_split_rshift": {
             "layout": [
                 { "label": "Esc", "x": 0, "y": 0 },
                 { "label": "F1", "x": 1.25, "y": 0 },
@@ -478,6 +485,102 @@
                 { "label": "\u2193", "x": 16.25, "y": 5.25 },
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
+        },
+        "LAYOUT_tkl_f13_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 1.25, "y": 0 },
+                { "label": "F2", "x": 2.25, "y": 0 },
+                { "label": "F3", "x": 3.25, "y": 0 },
+                { "label": "F4", "x": 4.25, "y": 0 },
+                { "label": "F5", "x": 5.5, "y": 0 },
+                { "label": "F6", "x": 6.5, "y": 0 },
+                { "label": "F7", "x": 7.5, "y": 0 },
+                { "label": "F8", "x": 8.5, "y": 0 },
+                { "label": "F9", "x": 9.75, "y": 0 },
+                { "label": "F10", "x": 10.75, "y": 0 },
+                { "label": "F11", "x": 11.75, "y": 0 },
+                { "label": "F12", "x": 12.75, "y": 0 },
+                { "label": "F13", "x": 14, "y": 0 },
+                { "label": "Print", "x": 15.25, "y": 0 },
+                { "label": "Scroll", "x": 16.25, "y": 0 },
+                { "label": "Pause", "x": 17.25, "y": 0 },
+
+                { "label": "~", "x": 0, "y": 1.25 },
+                { "label": "1", "x": 1, "y": 1.25 },
+                { "label": "2", "x": 2, "y": 1.25 },
+                { "label": "3", "x": 3, "y": 1.25 },
+                { "label": "4", "x": 4, "y": 1.25 },
+                { "label": "5", "x": 5, "y": 1.25 },
+                { "label": "6", "x": 6, "y": 1.25 },
+                { "label": "7", "x": 7, "y": 1.25 },
+                { "label": "8", "x": 8, "y": 1.25 },
+                { "label": "9", "x": 9, "y": 1.25 },
+                { "label": "0", "x": 10, "y": 1.25 },
+                { "label": "-", "x": 11, "y": 1.25 },
+                { "label": "=", "x": 12, "y": 1.25 },
+                { "label": "Backspace", "x": 13, "y": 1.25 },
+                { "label": "Backspace1", "x": 14, "y": 1.25 },
+                { "label": "Insert", "x": 15.25, "y": 1.25 },
+                { "label": "Home", "x": 16.25, "y": 1.25 },
+                { "label": "PageUp", "x": 17.25, "y": 1.25 },
+
+                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 2.25 },
+                { "label": "W", "x": 2.5, "y": 2.25 },
+                { "label": "E", "x": 3.5, "y": 2.25 },
+                { "label": "R", "x": 4.5, "y": 2.25 },
+                { "label": "T", "x": 5.5, "y": 2.25 },
+                { "label": "Y", "x": 6.5, "y": 2.25 },
+                { "label": "U", "x": 7.5, "y": 2.25 },
+                { "label": "I", "x": 8.5, "y": 2.25 },
+                { "label": "O", "x": 9.5, "y": 2.25 },
+                { "label": "P", "x": 10.5, "y": 2.25 },
+                { "label": "[", "x": 11.5, "y": 2.25 },
+                { "label": "]", "x": 12.5, "y": 2.25 },
+                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
+                { "label": "Delete", "x": 15.25, "y": 2.25 },
+                { "label": "End", "x": 16.25, "y": 2.25 },
+                { "label": "PageDown", "x": 17.25, "y": 2.25 },
+
+                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 3.25 },
+                { "label": "S", "x": 2.75, "y": 3.25 },
+                { "label": "D", "x": 3.75, "y": 3.25 },
+                { "label": "F", "x": 4.75, "y": 3.25 },
+                { "label": "G", "x": 5.75, "y": 3.25 },
+                { "label": "H", "x": 6.75, "y": 3.25 },
+                { "label": "J", "x": 7.75, "y": 3.25 },
+                { "label": "K", "x": 8.75, "y": 3.25 },
+                { "label": "L", "x": 9.75, "y": 3.25 },
+                { "label": ";", "x": 10.75, "y": 3.25 },
+                { "label": "'", "x": 11.75, "y": 3.25 },
+                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+
+                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 4.25 },
+                { "label": "X", "x": 3.25, "y": 4.25 },
+                { "label": "C", "x": 4.25, "y": 4.25 },
+                { "label": "V", "x": 5.25, "y": 4.25 },
+                { "label": "B", "x": 6.25, "y": 4.25 },
+                { "label": "N", "x": 7.25, "y": 4.25 },
+                { "label": "M", "x": 8.25, "y": 4.25 },
+                { "label": ",", "x": 9.25, "y": 4.25 },
+                { "label": ".", "x": 10.25, "y": 4.25 },
+                { "label": "/", "x": 11.25, "y": 4.25 },
+                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
+                { "label": "Shift2", "x": 14, "y": 4.25 },
+                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+
+                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 },
+                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 },
+                { "label": "Space","x": 4, "y": 5.25, "w": 7 },
+                { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 },
+                { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 },
+                { "label": "\u2190", "x": 15.25, "y": 5.25 },
+                { "label": "\u2193", "x": 16.25, "y": 5.25 },
+                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+            ]
         }
     }
 }