Merge branch 'master' into taamas

4 files changed, 47 insertions, 51 deletions

diff --git a/keyboards/pierce/config.h b/keyboards/pierce/config.h
index 242b2ebf92..0855427bcd 100644
--- a/keyboards/pierce/config.h
+++ b/keyboards/pierce/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    durken
-#define PRODUCT         pierce
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10
diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json
index 7179076794..850741cd9d 100644
--- a/keyboards/pierce/info.json
+++ b/keyboards/pierce/info.json
@@ -1,50 +1,57 @@
 {
-    "keyboard_name": "pierce", 
-    "url": "https://github.com/durken1/pierce", 
-    "maintainer": "durken1", 
+    "keyboard_name": "pierce",
+    "manufacturer": "durken",
+    "url": "https://github.com/durken1/pierce",
+    "maintainer": "durken1",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"x":0, "y":1}, 
-                {"x":1, "y":0.63}, 
-                {"x":2, "y":0.5}, 
-                {"x":3, "y":0.63}, 
-                {"x":4, "y":0.75}, 
-                {"x":7, "y":0.75}, 
-                {"x":8, "y":0.63}, 
-                {"x":9, "y":0.5}, 
-                {"x":10, "y":0.63}, 
-                {"x":11, "y":1}, 
+                {"x":0, "y":0.5},
+                {"x":1, "y":0.13},
+                {"x":2, "y":0.0},
+                {"x":3, "y":0.13},
+                {"x":4, "y":0.25},
+                {"x":7, "y":0.25},
+                {"x":8, "y":0.13},
+                {"x":9, "y":0.0},
+                {"x":10, "y":0.13},
+                {"x":11, "y":0.5},
 
-                {"x":0, "y":2}, 
-                {"x":1, "y":1.63}, 
-                {"x":2, "y":1.5}, 
-                {"x":3, "y":1.63}, 
-                {"x":4, "y":1.75}, 
-                {"x":7, "y":1.75}, 
-                {"x":8, "y":1.63},
-                {"x":9, "y":1.5}, 
-                {"x":10, "y":1.63}, 
-                {"x":11, "y":2}, 
+                {"x":0, "y":1.5},
+                {"x":1, "y":1.13},
+                {"x":2, "y":1.0},
+                {"x":3, "y":1.13},
+                {"x":4, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.13},
+                {"x":9, "y":1.0},
+                {"x":10, "y":1.13},
+                {"x":11, "y":1.5},
 
-                {"x":0, "y":3}, 
-                {"x":1, "y":2.63}, 
-                {"x":2, "y":2.5}, 
-                {"x":3, "y":2.63}, 
-                {"x":4, "y":2.75}, 
-                {"x":7, "y":2.75}, 
-                {"x":8, "y":2.63}, 
-                {"x":9, "y":2.5}, 
-                {"x":10, "y":2.63}, 
-                {"x":11, "y":3}, 
+                {"x":0, "y":2.5},
+                {"x":1, "y":2.13},
+                {"x":2, "y":2.0},
+                {"x":3, "y":2.13},
+                {"x":4, "y":2.25},
+                {"x":7, "y":2.25},
+                {"x":8, "y":2.13},
+                {"x":9, "y":2.0},
+                {"x":10, "y":2.13},
+                {"x":11, "y":2.5},
 
-                {"x":2.5, "y":3.66}, 
-                {"x":3.5, "y":4.0}, 
-                {"x":4.5, "y":4.25}, 
+                {"x":2.5, "y":3.16},
+                {"x":3.5, "y":3.5},
+                {"x":4.5, "y":3.75},
 
-                {"x":7.5, "y":4.0}, 
-                {"x":6.5, "y":4.25},
-                {"x":8.5, "y":3.66}]
+                {"x":6.5, "y":3.75},
+                {"x":7.5, "y":3.5},
+                {"x":8.5, "y":3.16}
+            ]
         }
     }
 }
diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h
index 7d19a0b83b..bc0bb1c4b8 100644
--- a/keyboards/pierce/keymaps/durken1/config.h
+++ b/keyboards/pierce/keymaps/durken1/config.h
@@ -27,9 +27,6 @@
 
 #define PERMISSIVE_HOLD
 
-// Recommended for heavy chording.
-#define QMK_KEYS_PER_SCAN 4
-
 // Combo settings
 #define COMBO_COUNT 3
 #define COMBO_TERM 35
@@ -74,4 +71,3 @@
 #ifdef AUTO_BUTTONS
   #define AUTO_BUTTONS_TIMEOUT 750
 #endif
-
diff --git a/keyboards/pierce/readme.md b/keyboards/pierce/readme.md
index 351bacbfa0..be7ba1948b 100644
--- a/keyboards/pierce/readme.md
+++ b/keyboards/pierce/readme.md
@@ -24,4 +24,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 Enter the bootloader in 2 ways:
 
 * **Physical reset button**: Briefly press the button on the dongle / wired half
-* **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