Merge branch 'master' into taamas

4 files changed, 35 insertions, 28 deletions

diff --git a/keyboards/eu_isolation/config.h b/keyboards/eu_isolation/config.h
index e1564b8d6b..0681896cb9 100644
--- a/keyboards/eu_isolation/config.h
+++ b/keyboards/eu_isolation/config.h
@@ -16,13 +16,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x4373
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    TuckTuckFloof
-#define PRODUCT         EU ISOlation
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 14
@@ -30,7 +23,6 @@
 /* NIU Mini PCB default pin-out */
 #define MATRIX_ROW_PINS { D2, D3, F1, F0 }
 #define MATRIX_COL_PINS { D0, D1, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4}
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eu_isolation/eu_isolation.h b/keyboards/eu_isolation/eu_isolation.h
index f4c9f11085..90ff29e69f 100644
--- a/keyboards/eu_isolation/eu_isolation.h
+++ b/keyboards/eu_isolation/eu_isolation.h
@@ -20,10 +20,10 @@
 #define ___ KC_NO
 
 #define LAYOUT_euiso_mit( \
-    k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+              k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k32, k33, k34, k35, k36,      k37, k39, k3a, k3b, k3c, k3d \
+              k32, k33, k34, k35, k36,      k37, k39, k3a, k3b, k3c, k3d \
 ) \
 { \
     { ___, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
@@ -33,10 +33,10 @@
 }
 
 #define LAYOUT_euiso_ortho( \
-    k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+              k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d  \
+              k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d  \
 ) \
 { \
     { ___, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
@@ -46,10 +46,10 @@
 }
 
 #define LAYOUT_euiso_bigspace( \
-    k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+              k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k32, k33,                    k37,                 k3c, k3d \
+              k32, k33,                    k37,                 k3c, k3d \
 ) \
 { \
     { ___, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
diff --git a/keyboards/eu_isolation/info.json b/keyboards/eu_isolation/info.json
index 03de853c42..5d82ca333b 100644
--- a/keyboards/eu_isolation/info.json
+++ b/keyboards/eu_isolation/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "EUISOlation",
+    "keyboard_name": "EU ISOlation",
+    "manufacturer": "TuckTuckFloof",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x4373",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_euiso_ortho": {
             "layout": [
@@ -17,6 +23,9 @@
                 {"x":11, "y":0},
                 {"x":12, "y":0},
                 {"x":13, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
                 {"x":2, "y":1},
                 {"x":3, "y":1},
                 {"x":4, "y":1},
@@ -29,8 +38,9 @@
                 {"x":11, "y":1},
                 {"x":12, "y":1},
                 {"x":13, "y":1},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
                 {"x":2, "y":2},
                 {"x":3, "y":2},
                 {"x":4, "y":2},
@@ -43,8 +53,7 @@
                 {"x":11, "y":2},
                 {"x":12, "y":2},
                 {"x":13, "y":2},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
+
                 {"x":2, "y":3},
                 {"x":3, "y":3},
                 {"x":4, "y":3},
@@ -74,6 +83,9 @@
                 {"x":11, "y":0},
                 {"x":12, "y":0},
                 {"x":13, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
                 {"x":2, "y":1},
                 {"x":3, "y":1},
                 {"x":4, "y":1},
@@ -86,8 +98,9 @@
                 {"x":11, "y":1},
                 {"x":12, "y":1},
                 {"x":13, "y":1},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
                 {"x":2, "y":2},
                 {"x":3, "y":2},
                 {"x":4, "y":2},
@@ -100,8 +113,7 @@
                 {"x":11, "y":2},
                 {"x":12, "y":2},
                 {"x":13, "y":2},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
+
                 {"x":2, "y":3},
                 {"x":3, "y":3},
                 {"x":4, "y":3},
@@ -130,6 +142,9 @@
                 {"x":11, "y":0},
                 {"x":12, "y":0},
                 {"x":13, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
                 {"x":2, "y":1},
                 {"x":3, "y":1},
                 {"x":4, "y":1},
@@ -142,8 +157,9 @@
                 {"x":11, "y":1},
                 {"x":12, "y":1},
                 {"x":13, "y":1},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
                 {"x":2, "y":2},
                 {"x":3, "y":2},
                 {"x":4, "y":2},
@@ -156,8 +172,7 @@
                 {"x":11, "y":2},
                 {"x":12, "y":2},
                 {"x":13, "y":2},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
+
                 {"x":2, "y":3, "w":1.25},
                 {"x":3.25, "y":3, "w":1.25},
                 {"x":4.5, "y":3, "w":7},
diff --git a/keyboards/eu_isolation/readme.md b/keyboards/eu_isolation/readme.md
index 711981ff02..c1272ea6a9 100644
--- a/keyboards/eu_isolation/readme.md
+++ b/keyboards/eu_isolation/readme.md
@@ -16,7 +16,7 @@ enters from you collection of keyboard kits.
 Enter the bootloader in 3 ways:
 
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 
 ## Information