From 20d00eff7cbf0defff5d795fd77b8e106bd03f8d Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Mon, 9 May 2022 02:43:15 +0800
Subject: [PATCH 1/3] Add support for yandrstudio/zhou65 keyboard

---
 src/yandrstudio/zhou65/zhou65lite.json | 174 +++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 src/yandrstudio/zhou65/zhou65lite.json

diff --git a/src/yandrstudio/zhou65/zhou65lite.json b/src/yandrstudio/zhou65/zhou65lite.json
new file mode 100644
index 0000000000..c625228e7d
--- /dev/null
+++ b/src/yandrstudio/zhou65/zhou65lite.json
@@ -0,0 +1,174 @@
+{
+    "name": "zhou65_Y&R",
+    "vendorId": "0xAA96",
+    "productId": "0xAAAD",
+    "lighting": "none",
+    "matrix": {
+        "rows": 5,
+        "cols": 15
+    },
+    "layouts": {
+        "keymap":
+        [
+            [
+              {
+                "c": "#777777"
+              },
+              "0,0",
+              {
+                "c": "#cccccc"
+              },
+              "0,1",
+              "0,2",
+              "0,3",
+              "0,4",
+              "0,5",
+              "0,6",
+              "0,7",
+              "0,8",
+              "0,9",
+              "0,10",
+              "0,11",
+              "0,12",
+              {
+                "c": "#aaaaaa",
+                "w": 2
+              },
+              "0,13",
+              {
+                "c": "#cccccc"
+              },
+              "0,14"
+            ],
+            [
+              {
+                "c": "#aaaaaa",
+                "w": 1.5
+              },
+              "1,0",
+              {
+                "c": "#cccccc"
+              },
+              "1,1",
+              "1,2",
+              "1,3",
+              "1,4",
+              "1,5",
+              "1,6",
+              "1,7",
+              "1,8",
+              "1,9",
+              "1,10",
+              "1,11",
+              "1,12",
+              {
+                "c": "#aaaaaa",
+                "w": 1.5
+              },
+              "1,13",
+              {
+                "c": "#cccccc"
+              },
+              "1,14"
+            ],
+            [
+              {
+                "c": "#aaaaaa",
+                "w": 1.75
+              },
+              "2,0",
+              {
+                "c": "#cccccc"
+              },
+              "2,1",
+              "2,2",
+              "2,3",
+              "2,4",
+              "2,5",
+              "2,6",
+              "2,7",
+              "2,8",
+              "2,9",
+              "2,10",
+              "2,11",
+              {
+                "c": "#777777",
+                "w": 2.25
+              },
+              "2,13",
+              {
+                "c": "#cccccc"
+              },
+              "2,14"
+            ],
+            [
+              {
+                "c": "#aaaaaa",
+                "w": 2.25
+              },
+              "3,0",
+              {
+                "c": "#cccccc"
+              },
+              "3,1",
+              "3,2",
+              "3,3",
+              "3,4",
+              "3,5",
+              "3,6",
+              "3,7",
+              "3,8",
+              "3,9",
+              "3,10",
+              {
+                "c": "#aaaaaa",
+                "f": 1,
+                "w": 1.75
+              },
+              "3,12",
+              {
+                "c": "#cccccc",
+                "f": 3
+              },
+              "3,13",
+              "3,14"
+            ],
+            [
+              {
+                "c": "#aaaaaa",
+                "w": 1.25
+              },
+              "4,0",
+              {
+                "w": 1.25
+              },
+              "4,1",
+              {
+                "w": 1.25
+              },
+              "4,2",
+              {
+                "c": "#cccccc",
+                "w": 6.25
+              },
+              "4,5",
+              {
+                "c": "#aaaaaa",
+                "w": 1.25
+              },
+              "4,9",
+              {
+                "w": 1.25
+              },
+              "4,10",
+              {
+                "x": 0.5,
+                "c": "#cccccc"
+              },
+              "4,12",
+              "4,13",
+              "4,14"
+            ]
+          ]
+      }
+}

From 85223d7b867fd785fc7f68c55f0eceb6744381d4 Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Mon, 9 May 2022 02:57:35 +0800
Subject: [PATCH 2/3] Update zhou65lite.json

---
 src/yandrstudio/zhou65/zhou65lite.json | 346 +++++++++++++------------
 1 file changed, 174 insertions(+), 172 deletions(-)

diff --git a/src/yandrstudio/zhou65/zhou65lite.json b/src/yandrstudio/zhou65/zhou65lite.json
index c625228e7d..7a87b3605e 100644
--- a/src/yandrstudio/zhou65/zhou65lite.json
+++ b/src/yandrstudio/zhou65/zhou65lite.json
@@ -1,174 +1,176 @@
 {
-    "name": "zhou65_Y&R",
-    "vendorId": "0xAA96",
-    "productId": "0xAAAD",
-    "lighting": "none",
-    "matrix": {
-        "rows": 5,
-        "cols": 15
-    },
-    "layouts": {
-        "keymap":
-        [
-            [
-              {
-                "c": "#777777"
-              },
-              "0,0",
-              {
-                "c": "#cccccc"
-              },
-              "0,1",
-              "0,2",
-              "0,3",
-              "0,4",
-              "0,5",
-              "0,6",
-              "0,7",
-              "0,8",
-              "0,9",
-              "0,10",
-              "0,11",
-              "0,12",
-              {
-                "c": "#aaaaaa",
-                "w": 2
-              },
-              "0,13",
-              {
-                "c": "#cccccc"
-              },
-              "0,14"
-            ],
-            [
-              {
-                "c": "#aaaaaa",
-                "w": 1.5
-              },
-              "1,0",
-              {
-                "c": "#cccccc"
-              },
-              "1,1",
-              "1,2",
-              "1,3",
-              "1,4",
-              "1,5",
-              "1,6",
-              "1,7",
-              "1,8",
-              "1,9",
-              "1,10",
-              "1,11",
-              "1,12",
-              {
-                "c": "#aaaaaa",
-                "w": 1.5
-              },
-              "1,13",
-              {
-                "c": "#cccccc"
-              },
-              "1,14"
-            ],
-            [
-              {
-                "c": "#aaaaaa",
-                "w": 1.75
-              },
-              "2,0",
-              {
-                "c": "#cccccc"
-              },
-              "2,1",
-              "2,2",
-              "2,3",
-              "2,4",
-              "2,5",
-              "2,6",
-              "2,7",
-              "2,8",
-              "2,9",
-              "2,10",
-              "2,11",
-              {
-                "c": "#777777",
-                "w": 2.25
-              },
-              "2,13",
-              {
-                "c": "#cccccc"
-              },
-              "2,14"
-            ],
-            [
-              {
-                "c": "#aaaaaa",
-                "w": 2.25
-              },
-              "3,0",
-              {
-                "c": "#cccccc"
-              },
-              "3,1",
-              "3,2",
-              "3,3",
-              "3,4",
-              "3,5",
-              "3,6",
-              "3,7",
-              "3,8",
-              "3,9",
-              "3,10",
-              {
-                "c": "#aaaaaa",
-                "f": 1,
-                "w": 1.75
-              },
-              "3,12",
-              {
-                "c": "#cccccc",
-                "f": 3
-              },
-              "3,13",
-              "3,14"
-            ],
-            [
-              {
-                "c": "#aaaaaa",
-                "w": 1.25
-              },
-              "4,0",
-              {
-                "w": 1.25
-              },
-              "4,1",
-              {
-                "w": 1.25
-              },
-              "4,2",
-              {
-                "c": "#cccccc",
-                "w": 6.25
-              },
-              "4,5",
-              {
-                "c": "#aaaaaa",
-                "w": 1.25
-              },
-              "4,9",
-              {
-                "w": 1.25
-              },
-              "4,10",
-              {
-                "x": 0.5,
-                "c": "#cccccc"
-              },
-              "4,12",
-              "4,13",
-              "4,14"
-            ]
-          ]
-      }
+  "name": "zhou65_Y&R",
+  "vendorId": "0xAA96",
+  "productId": "0xAAAD",
+  "lighting": "none",
+  "matrix": {
+    "rows": 5,
+    "cols": 15
+  },
+  "layouts": {
+    "keymap": [
+      [
+        {
+          "c": "#777777"
+        },
+        "0,0",
+        {
+          "c": "#cccccc"
+        },
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        "0,5",
+        "0,6",
+        "0,7",
+        "0,8",
+        "0,9",
+        "0,10",
+        "0,11",
+        "0,12",
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "0,13",
+        {
+          "c": "#cccccc"
+        },
+        "0,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "1,0",
+        {
+          "c": "#cccccc"
+        },
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10",
+        "1,11",
+        "1,12",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "1,13",
+        {
+          "c": "#cccccc"
+        },
+        "1,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "2,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        {
+          "c": "#777777",
+          "w": 2.25
+        },
+        "2,13",
+        {
+          "c": "#cccccc"
+        },
+        "2,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 2.25
+        },
+        "3,0",
+        {
+          "c": "#cccccc"
+        },
+        "3,1",
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6",
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        {
+          "c": "#aaaaaa",
+          "f": 1,
+          "w": 1.75
+        },
+        "3,12",
+        {
+          "c": "#777777",
+          "f": 3
+        },
+        "3,13",
+        {
+          "c": "#cccccc"
+        },
+        "3,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,0",
+        {
+          "w": 1.25
+        },
+        "4,1",
+        {
+          "w": 1.25
+        },
+        "4,2",
+        {
+          "c": "#cccccc",
+          "w": 6.25
+        },
+        "4,5",
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,9",
+        {
+          "w": 1.25
+        },
+        "4,10",
+        {
+          "x": 0.5,
+          "c": "#777777"
+        },
+        "4,12",
+        "4,13",
+        "4,14"
+      ]
+    ]
+  }
 }

From 26edd99e4fa92c93ed38ff7b3bd325fd697b6805 Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Thu, 7 Jul 2022 03:24:39 +0800
Subject: [PATCH 3/3] Update zhou65lite.json

---
 src/yandrstudio/zhou65/zhou65lite.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/yandrstudio/zhou65/zhou65lite.json b/src/yandrstudio/zhou65/zhou65lite.json
index 7a87b3605e..83987ac745 100644
--- a/src/yandrstudio/zhou65/zhou65lite.json
+++ b/src/yandrstudio/zhou65/zhou65lite.json
@@ -61,13 +61,9 @@
         "1,11",
         "1,12",
         {
-          "c": "#aaaaaa",
           "w": 1.5
         },
         "1,13",
-        {
-          "c": "#cccccc"
-        },
         "1,14"
       ],
       [