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

4 files changed, 148 insertions, 141 deletions

diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
index e85a9fffc3..32dd998959 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
@@ -1,78 +1,81 @@
 {
-    "keyboard_name": "BM60HSRGB_EC",
+    "keyboard_name": "BM60HSRGB_EC rev1",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "peepeetee",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (B0,D0)", "x":0, "y":0},
-                {"label":"K01 (B0,D1)", "x":1, "y":0},
-                {"label":"K02 (B0,D2)", "x":2, "y":0},
-                {"label":"K03 (B0,D3)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,D4)", "x":5, "y":0},
-                {"label":"K06 (B0,D6)", "x":6, "y":0},
-                {"label":"K07 (B0,D7)", "x":7, "y":0},
-                {"label":"K08 (B0,B4)", "x":8, "y":0},
-                {"label":"K09 (B0,B5)", "x":9, "y":0},
-                {"label":"K0A (B0,B6)", "x":10, "y":0},
-                {"label":"K0B (B0,C6)", "x":11, "y":0},
-                {"label":"K0C (B0,C7)", "x":12, "y":0},
-                {"label":"K0D (B0,F7)", "x":13, "y":0},
-                {"label":"K21 (B2,D1)", "x":14, "y":0},
-                {"label":"K43 (E6,D3)", "x":15, "y":0},
-                {"label":"K44 (E6,D5)", "x":16, "y":0},
-                {"label":"K10 (B1,D0)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,D1)", "x":1.5, "y":1},
-                {"label":"K12 (B1,D2)", "x":2.5, "y":1},
-                {"label":"K13 (B1,D3)", "x":3.5, "y":1},
-                {"label":"K14 (B1,D5)", "x":4.5, "y":1},
-                {"label":"K15 (B1,D4)", "x":5.5, "y":1},
-                {"label":"K16 (B1,D6)", "x":6.5, "y":1},
-                {"label":"K17 (B1,D7)", "x":7.5, "y":1},
-                {"label":"K18 (B1,B4)", "x":8.5, "y":1},
-                {"label":"K19 (B1,B5)", "x":9.5, "y":1},
-                {"label":"K1A (B1,B6)", "x":10.5, "y":1},
-                {"label":"K1B (B1,C6)", "x":11.5, "y":1},
-                {"label":"K1C (B1,C7)", "x":12.5, "y":1},
-                {"label":"K1D (B1,F7)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K20 (B2,D0)", "x":0, "y":2, "w":1.75},
-                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
-                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
-                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
-                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
-                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
-                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
-                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
-                {"label":"K2A (B2,B6)", "x":9.75, "y":2},
-                {"label":"K2B (B2,C6)", "x":10.75, "y":2},
-                {"label":"K2C (B2,C7)", "x":11.75, "y":2},
-                {"label":"K2D (B2,F7)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K31 (B3,D1)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
-                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
-                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
-                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
-                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
-                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
-                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
-                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
-                {"label":"K3A (B3,B6)", "x":10.25, "y":3},
-                {"label":"K3B (B3,C6)", "x":11.25, "y":3, "w":1.75},
-                {"label":"K3C (B3,C7)", "x":13, "y":3},
-                {"label":"K3D (B3,F7)", "x":14, "y":3},
-                {"label":"K40 (E6,D0)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (E6,D1)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42 (E6,D2)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (E6,B5)", "x":10, "y":4},
-                {"label":"K4A (E6,B6)", "x":11, "y":4},
-                {"label":"K4B (E6,C6)", "x":12, "y":4},
-                {"label":"K4C (E6,C7)", "x":13, "y":4},
-                {"label":"K4D (E6,F7)", "x":14, "y":4}
+                {"label":"K00 (B0, D0)", "x":0, "y":0.5},
+                {"label":"K01 (B0, D1)", "x":1, "y":0.5},
+                {"label":"K02 (B0, D2)", "x":2, "y":0.5},
+                {"label":"K03 (B0, D3)", "x":3, "y":0.5},
+                {"label":"K04 (B0, D5)", "x":4, "y":0.5},
+                {"label":"K05 (B0, D4)", "x":5, "y":0.5},
+                {"label":"K06 (B0, D6)", "x":6, "y":0.5},
+                {"label":"K07 (B0, D7)", "x":7, "y":0.5},
+                {"label":"K08 (B0, B4)", "x":8, "y":0.5},
+                {"label":"K09 (B0, B5)", "x":9, "y":0.5},
+                {"label":"K0A (B0, B6)", "x":10, "y":0.5},
+                {"label":"K0B (B0, C6)", "x":11, "y":0.5},
+                {"label":"K0C (B0, C7)", "x":12, "y":0.5},
+                {"label":"K0D (B0, F7)", "x":13, "y":0.5},
+                {"label":"K21 (B2, D1)", "x":14, "y":0.5},
+                {"label":"K43 (E6, D3)", "x":13.9, "y":0, "w":0.6, "h":0.5},
+                {"label":"K44 (E6, D5)", "x":14.5, "y":0, "w":0.6, "h":0.5},
+
+                {"label":"K10 (B1, D0)", "x":0, "y":1.5, "w":1.5},
+                {"label":"K11 (B1, D1)", "x":1.5, "y":1.5},
+                {"label":"K12 (B1, D2)", "x":2.5, "y":1.5},
+                {"label":"K13 (B1, D3)", "x":3.5, "y":1.5},
+                {"label":"K14 (B1, D5)", "x":4.5, "y":1.5},
+                {"label":"K15 (B1, D4)", "x":5.5, "y":1.5},
+                {"label":"K16 (B1, D6)", "x":6.5, "y":1.5},
+                {"label":"K17 (B1, D7)", "x":7.5, "y":1.5},
+                {"label":"K18 (B1, B4)", "x":8.5, "y":1.5},
+                {"label":"K19 (B1, B5)", "x":9.5, "y":1.5},
+                {"label":"K1A (B1, B6)", "x":10.5, "y":1.5},
+                {"label":"K1B (B1, C6)", "x":11.5, "y":1.5},
+                {"label":"K1C (B1, C7)", "x":12.5, "y":1.5},
+                {"label":"K1D (B1, F7)", "x":13.5, "y":1.5, "w":1.5},
+
+                {"label":"K20 (B2, D0)", "x":0, "y":2.5, "w":1.75},
+                {"label":"K22 (B2, D2)", "x":1.75, "y":2.5},
+                {"label":"K23 (B2, D3)", "x":2.75, "y":2.5},
+                {"label":"K24 (B2, D5)", "x":3.75, "y":2.5},
+                {"label":"K25 (B2, D4)", "x":4.75, "y":2.5},
+                {"label":"K26 (B2, D6)", "x":5.75, "y":2.5},
+                {"label":"K27 (B2, D7)", "x":6.75, "y":2.5},
+                {"label":"K28 (B2, B4)", "x":7.75, "y":2.5},
+                {"label":"K29 (B2, B5)", "x":8.75, "y":2.5},
+                {"label":"K2A (B2, B6)", "x":9.75, "y":2.5},
+                {"label":"K2B (B2, C6)", "x":10.75, "y":2.5},
+                {"label":"K2C (B2, C7)", "x":11.75, "y":2.5},
+                {"label":"K2D (B2, F7)", "x":12.75, "y":2.5, "w":2.25},
+
+                {"label":"K31 (B3, D1)", "x":0, "y":3.5, "w":2.25},
+                {"label":"K32 (B3, D2)", "x":2.25, "y":3.5},
+                {"label":"K33 (B3, D3)", "x":3.25, "y":3.5},
+                {"label":"K34 (B3, D5)", "x":4.25, "y":3.5},
+                {"label":"K35 (B3, D4)", "x":5.25, "y":3.5},
+                {"label":"K36 (B3, D6)", "x":6.25, "y":3.5},
+                {"label":"K37 (B3, D7)", "x":7.25, "y":3.5},
+                {"label":"K38 (B3, B4)", "x":8.25, "y":3.5},
+                {"label":"K39 (B3, B5)", "x":9.25, "y":3.5},
+                {"label":"K3A (B3, B6)", "x":10.25, "y":3.5},
+                {"label":"K3B (B3, C6)", "x":11.25, "y":3.5, "w":1.75},
+                {"label":"K3C (B3, C7)", "x":13, "y":3.5},
+                {"label":"K3D (B3, F7)", "x":14, "y":3.5},
+
+                {"label":"K40 (E6, D0)", "x":0, "y":4.5, "w":1.25},
+                {"label":"K41 (E6, D1)", "x":1.25, "y":4.5, "w":1.25},
+                {"label":"K42 (E6, D2)", "x":2.5, "y":4.5, "w":1.25},
+                {"label":"K46 (E6, D6)", "x":3.75, "y":4.5, "w":6.25},
+                {"label":"K49 (E6, B5)", "x":10, "y":4.5},
+                {"label":"K4A (E6, B6)", "x":11, "y":4.5},
+                {"label":"K4B (E6, C6)", "x":12, "y":4.5},
+                {"label":"K4C (E6, C7)", "x":13, "y":4.5},
+                {"label":"K4D (E6, F7)", "x":14, "y":4.5}
             ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/readme.md b/keyboards/kprepublic/bm60hsrgb_ec/rev1/readme.md
index 2c0996974b..1e284041d0 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/readme.md
@@ -2,9 +2,9 @@
 
 A 60% hotswap inswitch RGB keyboard with an encoder from KP Republic. 
 
-* Keyboard Maintainer: [bdtc123](https://github.com/bdtc123)
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
 * Hardware Supported: BM60HSRGB_EC/rev1
-* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-60-gh60-hot-swappable-pcb-programmed-qmk-firmware-type-c)
+* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60ec-bm60-ec-rgb-60-gh60-hot-swappable-custom-mechanical-keyboard-pcb-programmed-qmk-via-rgb-switch-type-c-rotary-knob)
 
 ## Bootloader
 
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index 613511b784..c66533949e 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -1,80 +1,80 @@
 {
-    "keyboard_name": "bm60hsrgb_ec",
+    "keyboard_name": "BM60HSRGB_EC rev2",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "peepeetee",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14.75, "y":0},
-                {"x":15.75, "y":0},
-                {"x":16.75, "y":0},
+                {"x":0, "y":0.5},
+                {"x":1, "y":0.5},
+                {"x":2, "y":0.5},
+                {"x":3, "y":0.5},
+                {"x":4, "y":0.5},
+                {"x":5, "y":0.5},
+                {"x":6, "y":0.5},
+                {"x":7, "y":0.5},
+                {"x":8, "y":0.5},
+                {"x":9, "y":0.5},
+                {"x":10, "y":0.5},
+                {"x":11, "y":0.5},
+                {"x":12, "y":0.5},
+                {"x":13, "y":0.5},
+                {"x":14, "y":0.5},
+                {"x":13.9, "y":0, "w":0.6, "h":0.5},
+                {"x":14.5, "y":0, "w":0.6, "h":0.5},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
+                {"x":0, "y":1.5, "w":1.5},
+                {"x":1.5, "y":1.5},
+                {"x":2.5, "y":1.5},
+                {"x":3.5, "y":1.5},
+                {"x":4.5, "y":1.5},
+                {"x":5.5, "y":1.5},
+                {"x":6.5, "y":1.5},
+                {"x":7.5, "y":1.5},
+                {"x":8.5, "y":1.5},
+                {"x":9.5, "y":1.5},
+                {"x":10.5, "y":1.5},
+                {"x":11.5, "y":1.5},
+                {"x":12.5, "y":1.5},
+                {"x":13.5, "y":1.5, "w":1.5},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"x":0, "y":2.5, "w":1.75},
+                {"x":1.75, "y":2.5},
+                {"x":2.75, "y":2.5},
+                {"x":3.75, "y":2.5},
+                {"x":4.75, "y":2.5},
+                {"x":5.75, "y":2.5},
+                {"x":6.75, "y":2.5},
+                {"x":7.75, "y":2.5},
+                {"x":8.75, "y":2.5},
+                {"x":9.75, "y":2.5},
+                {"x":10.75, "y":2.5},
+                {"x":11.75, "y":2.5},
+                {"x":12.75, "y":2.5, "w":2.25},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3, "w":1.75},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
+                {"x":0, "y":3.5, "w":2.25},
+                {"x":2.25, "y":3.5},
+                {"x":3.25, "y":3.5},
+                {"x":4.25, "y":3.5},
+                {"x":5.25, "y":3.5},
+                {"x":6.25, "y":3.5},
+                {"x":7.25, "y":3.5},
+                {"x":8.25, "y":3.5},
+                {"x":9.25, "y":3.5},
+                {"x":10.25, "y":3.5},
+                {"x":11.25, "y":3.5, "w":1.75},
+                {"x":13, "y":3.5},
+                {"x":14, "y":3.5},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4}
+                {"x":0, "y":4.5, "w":1.25},
+                {"x":1.25, "y":4.5, "w":1.25},
+                {"x":2.5, "y":4.5, "w":1.25},
+                {"x":3.75, "y":4.5, "w":6.25},
+                {"x":10, "y":4.5},
+                {"x":11, "y":4.5},
+                {"x":12, "y":4.5},
+                {"x":13, "y":4.5},
+                {"x":14, "y":4.5}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/readme.md b/keyboards/kprepublic/bm60hsrgb_ec/rev2/readme.md
index 39e986c1c5..6454a57420 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/readme.md
@@ -2,9 +2,13 @@
 
 A 60% hotswap inswitch RGB keyboard with an encoder from KP Republic. 
 
-* Keyboard Maintainer: [bdtc123](https://github.com/bdtc123)
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
 * Hardware Supported: BM60HSRGB_EC/rev2
-* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-60-gh60-hot-swappable-pcb-programmed-qmk-firmware-type-c)
+* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60ec-bm60-ec-rgb-60-gh60-hot-swappable-custom-mechanical-keyboard-pcb-programmed-qmk-via-rgb-switch-type-c-rotary-knob)
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB