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

keyboards/cradio/info.json

@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Cradio",
     "manufacturer": "DPB",
-    "url": "https://github.com/davidphilipbarr/Sweep",
+    "url": "https://github.com/davidphilipbarr/hypergolic",
     "maintainer": "@davidphilipbarr",
     "usb": {
       "vid": "0xC88B",
@@ -58,33 +58,33 @@
                 { "label": "L03", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
                 { "label": "L04", "matrix": [0, 3], "w": 1, "x": 3, "y": 0.28 },
                 { "label": "L05", "matrix": [0, 4], "w": 1, "x": 4, "y": 0.42 },
-                { "label": "L06", "matrix": [1, 0], "w": 1, "x": 0, "y": 2.27 },
-                { "label": "L07", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.31 },
-                { "label": "L08", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
-                { "label": "L09", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.28 },
-                { "label": "L10", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.42 },
-                { "label": "L11", "matrix": [2, 0], "w": 1, "x": 0, "y": 3.27 },
-                { "label": "L12", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.31 },
-                { "label": "L13", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
-                { "label": "L14", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.28 },
-                { "label": "L15", "matrix": [2, 4], "w": 1, "x": 4, "y": 2.42 },
-                { "label": "L16", "matrix": [3, 0], "w": 1, "x": 4, "y": 3.9 },
-                { "label": "L17", "matrix": [3, 1], "w": 1, "x": 5, "y": 3.7 },
                 { "label": "R01", "matrix": [4, 0], "w": 1, "x": 8, "y": 0.42 },
                 { "label": "R02", "matrix": [4, 1], "w": 1, "x": 9, "y": 0.28 },
                 { "label": "R03", "matrix": [4, 2], "w": 1, "x": 10, "y": 0 },
                 { "label": "R04", "matrix": [4, 3], "w": 1, "x": 11, "y": 0.31 },
                 { "label": "R05", "matrix": [4, 4], "w": 1, "x": 12, "y": 1.27 },
+                { "label": "L06", "matrix": [1, 0], "w": 1, "x": 0, "y": 2.27 },
+                { "label": "L07", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.31 },
+                { "label": "L08", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
+                { "label": "L09", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.28 },
+                { "label": "L10", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.42 },
                 { "label": "R06", "matrix": [5, 0], "w": 1, "x": 8, "y": 1.42 },
                 { "label": "R07", "matrix": [5, 1], "w": 1, "x": 9, "y": 1.28 },
                 { "label": "R08", "matrix": [5, 2], "w": 1, "x": 10, "y": 1 },
                 { "label": "R09", "matrix": [5, 3], "w": 1, "x": 11, "y": 1.31 },
                 { "label": "R10", "matrix": [5, 4], "w": 1, "x": 12, "y": 2.27 },
+                { "label": "L11", "matrix": [2, 0], "w": 1, "x": 0, "y": 3.27 },
+                { "label": "L12", "matrix": [2, 1], "w": 1, "x": 1, "y": 2.31 },
+                { "label": "L13", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
+                { "label": "L14", "matrix": [2, 3], "w": 1, "x": 3, "y": 2.28 },
+                { "label": "L15", "matrix": [2, 4], "w": 1, "x": 4, "y": 2.42 },
                 { "label": "R11", "matrix": [6, 0], "w": 1, "x": 8, "y": 2.42 },
                 { "label": "R12", "matrix": [6, 1], "w": 1, "x": 9, "y": 2.28 },
                 { "label": "R13", "matrix": [6, 2], "w": 1, "x": 10, "y": 2 },
                 { "label": "R14", "matrix": [6, 3], "w": 1, "x": 11, "y": 2.31 },
                 { "label": "R15", "matrix": [6, 4], "w": 1, "x": 12, "y": 3.27 },
+                { "label": "L16", "matrix": [3, 0], "w": 1, "x": 4, "y": 3.9 },
+                { "label": "L17", "matrix": [3, 1], "w": 1, "x": 5, "y": 3.7 },
                 { "label": "R16", "matrix": [7, 0], "w": 1, "x": 7, "y": 3.7 },
                 { "label": "R17", "matrix": [7, 1], "w": 1, "x": 8, "y": 3.9 }
             ]