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

2 files changed, 92 insertions, 92 deletions

diff --git a/keyboards/kprepublic/bm80v2/info.json b/keyboards/kprepublic/bm80v2/info.json
index e891c54e02..50375f7d42 100644
--- a/keyboards/kprepublic/bm80v2/info.json
+++ b/keyboards/kprepublic/bm80v2/info.json
@@ -1,102 +1,102 @@
 {
     "keyboard_name": "bm80v2",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "edwardslau",
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                { "x":0, "y":0},
-                { "x":2, "y":0},
-                { "x":3, "y":0},
-                { "x":4, "y":0},
-                { "x":5, "y":0},
-                { "x":6.5, "y":0},
-                { "x":7.5, "y":0},
-                { "x":8.5, "y":0},
-                { "x":9.5, "y":0},
-                { "x":11, "y":0},
-                { "x":12, "y":0},
-                { "x":13, "y":0},
-                { "x":14, "y":0},
-                { "x":15.25, "y":0},
-                { "x":16.25, "y":0},
-                { "x":17.25, "y":0},
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
 
-                { "x":0, "y":1.5},
-                { "x":1, "y":1.5},
-                { "x":2, "y":1.5},
-                { "x":3, "y":1.5},
-                { "x":4, "y":1.5},
-                { "x":5, "y":1.5},
-                { "x":6, "y":1.5},
-                { "x":7, "y":1.5},
-                { "x":8, "y":1.5},
-                { "x":9, "y":1.5},
-                { "x":10, "y":1.5},
-                { "x":11, "y":1.5},
-                { "x":12, "y":1.5},
-                { "x":13, "y":1.5, "w":2},
-                { "x":15.25, "y":1.5},
-                { "x":16.25, "y":1.5},
-                { "x":17.25, "y":1.5},
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "x":17.25, "y":1.5},
 
-                { "x":0, "y":2.5, "w":1.5},
-                { "x":1.5, "y":2.5},
-                { "x":2.5, "y":2.5},
-                { "x":3.5, "y":2.5},
-                { "x":4.5, "y":2.5},
-                { "x":5.5, "y":2.5},
-                { "x":6.5, "y":2.5},
-                { "x":7.5, "y":2.5},
-                { "x":8.5, "y":2.5},
-                { "x":9.5, "y":2.5},
-                { "x":10.5, "y":2.5},
-                { "x":11.5, "y":2.5},
-                { "x":12.5, "y":2.5},
-                { "x":13.75,"y":2.5},
-                { "x":15.25, "y":2.5},
-                { "x":16.25, "y":2.5},
-                { "x":17.25, "y":2.5},
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"\\|", "x":13.5,"y":2.5, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"Page Down", "x":17.25, "y":2.5},
 
-                { "x":0, "y":3.5, "w":1.75},
-                { "x":1.75, "y":3.5},
-                { "x":2.75, "y":3.5},
-                { "x":3.75, "y":3.5},
-                { "x":4.75, "y":3.5},
-                { "x":5.75, "y":3.5},
-                { "x":6.75, "y":3.5},
-                { "x":7.75, "y":3.5},
-                { "x":8.75, "y":3.5},
-                { "x":9.75, "y":3.5},
-                { "x":10.75, "y":3.5},
-                { "x":11.75, "y":3.5},
-                { "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
 
-                { "x":0, "y":4.5, "w":2.25},
-                { "x":2.25, "y":4.5},
-                { "x":3.25, "y":4.5},
-                { "x":4.25, "y":4.5},
-                { "x":5.25, "y":4.5},
-                { "x":6.25, "y":4.5},
-                { "x":7.25, "y":4.5},
-                { "x":8.25, "y":4.5},
-                { "x":9.25, "y":4.5},
-                { "x":10.25, "y":4.5},
-                { "x":11.25, "y":4.5},
-                { "x":12.25, "y":4.5, "w":2.75},
-                { "x":16.25, "y":4.5},
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.5},
 
-                { "x":0, "y":5.5, "w":1.25},
-                { "x":1.25, "y":5.5, "w":1.25},
-                { "x":2.5, "y":5.5, "w":1.25},
-                { "x":3.75, "y":5.5, "w":6.25},
-                { "x":10, "y":5.5, "w":1.25},
-                { "x":11.25, "y":5.5, "w":1.25},
-                { "x":12.5, "y":5.5, "w":1.25},
-                { "x":13.75, "y":5.5, "w":1.25},
-                { "x":15.25, "y":5.5},
-                { "x":16.25, "y":5.5},
-                { "x":17.25, "y":5.5}
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.5},
+                {"label":"\u2193", "x":16.25, "y":5.5},
+                {"label":"\u2192", "x":17.25, "y":5.5}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm80v2/readme.md b/keyboards/kprepublic/bm80v2/readme.md
index 0f799c659a..72ff25909f 100644
--- a/keyboards/kprepublic/bm80v2/readme.md
+++ b/keyboards/kprepublic/bm80v2/readme.md
@@ -1,8 +1,8 @@
-# %bm80v2%  
+# bm80v2
 
 A 80% hotswap inswitch RGB keyboard.
 
-* Keyboard Maintainer: [%bdtc123%](https://github.com/bdtc123)
+* Keyboard Maintainer: [edwardslau](https://github.com/edwardslau)
 * Hardware Supported: BM80V2
 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm80rgb-bm80-rgb-80-hot-swappable-custom-mechanical-keyboard-pcb-programmed-qmk-via-firmware-full-rgb-switch-underglow-type-c?_pos=7&_sid=767c48383&_ss=r)
 
@@ -14,7 +14,7 @@ Flashing example for this keyboard:
 
     make kprepublic bm80v2:default:flash
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
 ## Bootloader
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).