Browse Source

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

QMK Bot 2 years ago
parent
commit
62f81cfcc3

+ 4 - 1
keyboards/ez_maker/directpins/promicro/keyboard.json

@@ -27,8 +27,11 @@
         "pid": "0x2320",
         "vid": "0xFEED"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
                 {"label": "D3", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "D2", "matrix": [1, 0], "x": 0, "y": 1},

+ 1 - 1
keyboards/ez_maker/directpins/promicro/keymaps/default/keymap.json

@@ -1,7 +1,7 @@
 {
     "keyboard": "ez_maker/directpins/promicro",
     "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
     "layers": [
         [
             "KC_0",

+ 4 - 1
keyboards/ez_maker/directpins/proton_c/keyboard.json

@@ -33,8 +33,11 @@
         "pid": "0x2321",
         "vid": "0xFEED"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
                 {"label": "A9", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "A10", "matrix": [1, 0], "x": 0, "y": 1},

+ 1 - 1
keyboards/ez_maker/directpins/proton_c/keymaps/default/keymap.json

@@ -1,7 +1,7 @@
 {
     "keyboard": "ez_maker/directpins/proton_c",
     "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
     "layers": [
         [
             "KC_0",

+ 4 - 1
keyboards/ez_maker/directpins/rp2040/keyboard.json

@@ -38,8 +38,11 @@
         "pid": "0x2326",
         "vid": "0xFEED"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
                 {"label": "GP0", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "GP1", "matrix": [1, 0], "x": 0, "y": 1},

+ 1 - 1
keyboards/ez_maker/directpins/rp2040/keymaps/default/keymap.json

@@ -1,7 +1,7 @@
 {
     "keyboard": "ez_maker/directpins/rp2040",
     "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
     "layers": [
         [
             "KC_0",

+ 4 - 1
keyboards/ez_maker/directpins/teensy_2/keyboard.json

@@ -30,8 +30,11 @@
         "pid": "0x2322",
         "vid": "0xFEED"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
                 {"label": "B0", "matrix": [0, 0], "x": 0, "y": 0},                                                                                                       {"label": "F0", "matrix": [0, 1], "x": 4, "y": 0},
                 {"label": "B1", "matrix": [1, 0], "x": 0, "y": 1},                                                                                                       {"label": "F1", "matrix": [1, 1], "x": 4, "y": 1},

+ 1 - 1
keyboards/ez_maker/directpins/teensy_2/keymaps/default/keymap.json

@@ -1,7 +1,7 @@
 {
     "keyboard": "ez_maker/directpins/teensy_2",
     "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
     "layers": [
         [
             "KC_0",                 "KC_1",

+ 4 - 1
keyboards/ez_maker/directpins/teensy_2pp/keyboard.json

@@ -37,8 +37,11 @@
         "pid": "0x2323",
         "vid": "0xFEED"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
                 {"label": "B7", "matrix": [0, 0], "x": 0, "y": 0},                                                                                                       {"label": "B6", "matrix": [0, 3], "x": 5, "y": 0},
                 {"label": "D0", "matrix": [1, 0], "x": 0, "y": 1},                                                                                                       {"label": "B5", "matrix": [1, 3], "x": 5, "y": 1},

+ 1 - 1
keyboards/ez_maker/directpins/teensy_2pp/keymaps/default/keymap.json

@@ -1,7 +1,7 @@
 {
     "keyboard": "ez_maker/directpins/teensy_2pp",
     "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
     "layers": [
         [
             "KC_0",                    "KC_1",

+ 4 - 1
keyboards/ez_maker/directpins/teensy_32/keyboard.json

@@ -31,8 +31,11 @@
         "pid": "0x2324",
         "vid": "0xFEED"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
                 {"label": "0", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1", "matrix": [1, 0], "x": 0, "y": 1},

+ 1 - 1
keyboards/ez_maker/directpins/teensy_32/keymaps/default/keymap.json

@@ -1,7 +1,7 @@
 {
     "keyboard": "ez_maker/directpins/teensy_32",
     "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
     "layers": [
         [
             "KC_0",

+ 4 - 1
keyboards/ez_maker/directpins/teensy_lc/keyboard.json

@@ -31,8 +31,11 @@
         "pid": "0x2325",
         "vid": "0xFEED"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
                 {"label": "0", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1", "matrix": [1, 0], "x": 0, "y": 1},

+ 1 - 1
keyboards/ez_maker/directpins/teensy_lc/keymaps/default/keymap.json

@@ -1,7 +1,7 @@
 {
     "keyboard": "ez_maker/directpins/teensy_lc",
     "keymap": "default",
-    "layout": "LAYOUT_all",
+    "layout": "LAYOUT",
     "layers": [
         [
             "KC_0",