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

keyboards/cospad/info.json

@@ -5,8 +5,7 @@
     "width": 4,
     "height": 6,
     "layouts": {
-        "LAYOUT_numpad_6x4": {
-            "key_count": 21,
+        "LAYOUT_ortho_6x4": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -21,23 +20,25 @@
                 {"x":0, "y":2},
                 {"x":1, "y":2},
                 {"x":2, "y":2},
+                {"x":3, "y":2},
 
                 {"x":0, "y":3},
                 {"x":1, "y":3},
                 {"x":2, "y":3},
-                {"x":3, "y":2, "h":2},
+                {"x":3, "y":3},
 
                 {"x":0, "y":4},
                 {"x":1, "y":4},
                 {"x":2, "y":4},
+                {"x":3, "y":4},
 
-                {"x":0, "y":5, "w":2},
+                {"x":0, "y":5},
+                {"x":1, "y":5},
                 {"x":2, "y":5},
-                {"x":3, "y":4, "h":2}
+                {"x":3, "y":5}
             ]
         },
         "LAYOUT_gamepad_6x4": {
-            "key_count": 23,
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -69,8 +70,37 @@
                 {"x":3, "y":5}
             ]
         },
-        "LAYOUT_ortho_6x4": {
-            "key_count": 24,
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":2, "h":2},
+
+                {"x":0, "y":4},
+                {"x":1, "y":4},
+                {"x":2, "y":4},
+
+                {"x":0, "y":5, "w":2},
+                {"x":2, "y":5},
+                {"x":3, "y":4, "h":2}
+            ]
+        },
+        "LAYOUT_numpad_6x4_split_plus": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -95,16 +125,13 @@
                 {"x":0, "y":4},
                 {"x":1, "y":4},
                 {"x":2, "y":4},
-                {"x":3, "y":4},
 
-                {"x":0, "y":5},
-                {"x":1, "y":5},
+                {"x":0, "y":5, "w":2},
                 {"x":2, "y":5},
-                {"x":3, "y":5}
+                {"x":3, "y":4, "h":2}
             ]
         },
         "LAYOUT_numpad_6x4_split_plus_zero": {
-            "key_count": 23,
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -137,7 +164,6 @@
             ]
         },
         "LAYOUT_numpad_6x4_split_zero": {
-            "key_count": 22,
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -167,6 +193,6 @@
                 {"x":2, "y":5},
                 {"x":3, "y":4, "h":2}
             ]
-        }        
+        }
     }
 }