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

keyboards/handwired/dactyl_lightcycle/info.json

@@ -71,6 +71,12 @@
                 {"matrix": [2, 4], "x": 4, "y": 2},
                 {"matrix": [2, 5], "x": 5, "y": 2},
 
+                {"matrix": [3, 5], "x": 6, "y": 2, "h": 1.25},
+                {"matrix": [4, 5], "x": 7, "y": 2, "h": 1.5},
+
+                {"matrix": [9, 0], "x": 9, "y": 2, "h": 1.5},
+                {"matrix": [8, 0], "x": 10, "y": 2, "h": 1.25},
+
                 {"matrix": [7, 0], "x": 11, "y": 2},
                 {"matrix": [7, 1], "x": 12, "y": 2},
                 {"matrix": [7, 2], "x": 13, "y": 2},
@@ -78,12 +84,6 @@
                 {"matrix": [7, 4], "x": 15, "y": 2},
                 {"matrix": [7, 5], "x": 16, "y": 2},
 
-                {"matrix": [3, 5], "x": 6, "y": 2, "h": 1.25},
-                {"matrix": [4, 5], "x": 7, "y": 2, "h": 1.5},
-
-                {"matrix": [9, 0], "x": 9, "y": 2, "h": 1.5},
-                {"matrix": [8, 0], "x": 10, "y": 2, "h": 1.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3},
                 {"matrix": [3, 1], "x": 1, "y": 3},
                 {"matrix": [3, 2], "x": 2, "y": 3},

keyboards/handwired/dactyl_lightcycle/keymaps/via/keymap.json

@@ -3,6 +3,11 @@
     "version": 1,
     "author": "dunk2k",
     "notes": "This file is a keymap(.json) file for handwired/dactyl_lightcycle",
+    "config": {
+        "features": {
+            "via": true
+        }
+    },
     "keymap": "via",
     "layout": "LAYOUT",
     "layers": [

keyboards/handwired/dactyl_lightcycle/keymaps/via/rules.mk

@@ -1 +0,0 @@
-VIA_ENABLE = yes