JJ50 Touch-Up (#15762)

* rules.mk: Build Options sorting and white space

* use QMK 3-character notation

* info.json: apply friendly formatting

* info.json: use 3-character notation

* move layout macro alias to info.json

* number matrix identifiers by electrical position

3 files changed, 93 insertions, 27 deletions

diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json
index e492059e1..5d84efe24 100644
--- a/keyboards/kprepublic/jj50/info.json
+++ b/keyboards/kprepublic/jj50/info.json
@@ -1,10 +1,78 @@
 {
-  "keyboard_name": "JJ50",
-  "url": "",
-  "maintainer": "qmk",
-  "layouts": {
-    "LAYOUT_ortho_5x12": {
-      "layout": [{"label":"K011", "x":0, "y":0}, {"label":"K010", "x":1, "y":0}, {"label":"K009", "x":2, "y":0}, {"label":"K008", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K003", "x":8, "y":0}, {"label":"K002", "x":9, "y":0}, {"label":"K201", "x":10, "y":0}, {"label":"K000", "x":11, "y":0}, {"label":"K111", "x":0, "y":1}, {"label":"K110", "x":1, "y":1}, {"label":"K109", "x":2, "y":1}, {"label":"K108", "x":3, "y":1}, {"label":"K104", "x":4, "y":1}, {"label":"K105", "x":5, "y":1}, {"label":"K106", "x":6, "y":1}, {"label":"K107", "x":7, "y":1}, {"label":"K103", "x":8, "y":1}, {"label":"K102", "x":9, "y":1}, {"label":"K001", "x":10, "y":1}, {"label":"K100", "x":11, "y":1}, {"label":"K211", "x":0, "y":2}, {"label":"K210", "x":1, "y":2}, {"label":"K209", "x":2, "y":2}, {"label":"K208", "x":3, "y":2}, {"label":"K204", "x":4, "y":2}, {"label":"K205", "x":5, "y":2}, {"label":"K206", "x":6, "y":2}, {"label":"K207", "x":7, "y":2}, {"label":"K203", "x":8, "y":2}, {"label":"K202", "x":9, "y":2}, {"label":"K101", "x":10, "y":2}, {"label":"K200", "x":11, "y":2}, {"label":"K311", "x":0, "y":3}, {"label":"K310", "x":1, "y":3}, {"label":"K309", "x":2, "y":3}, {"label":"K308", "x":3, "y":3}, {"label":"K304", "x":4, "y":3}, {"label":"K305", "x":5, "y":3}, {"label":"K306", "x":6, "y":3}, {"label":"K307", "x":7, "y":3}, {"label":"K303", "x":8, "y":3}, {"label":"K302", "x":9, "y":3}, {"label":"K301", "x":10, "y":3}, {"label":"K300", "x":11, "y":3}, {"label":"K411", "x":0, "y":4}, {"label":"K410", "x":1, "y":4}, {"label":"K409", "x":2, "y":4}, {"label":"K408", "x":3, "y":4}, {"label":"K404", "x":4, "y":4}, {"label":"K405", "x":5, "y":4}, {"label":"K406", "x":6, "y":4}, {"label":"K407", "x":7, "y":4}, {"label":"K403", "x":8, "y":4}, {"label":"K402", "x":9, "y":4}, {"label":"K401", "x":10, "y":4}, {"label":"K400", "x":11, "y":4}]
+    "keyboard_name": "JJ50",
+    "url": "",
+    "maintainer": "qmk",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "layout": [
+                {"label":"K2B", "x":0, "y":0},
+                {"label":"K2A", "x":1, "y":0},
+                {"label":"K29", "x":2, "y":0},
+                {"label":"K28", "x":3, "y":0},
+                {"label":"K24", "x":4, "y":0},
+                {"label":"K25", "x":5, "y":0},
+                {"label":"K26", "x":6, "y":0},
+                {"label":"K27", "x":7, "y":0},
+                {"label":"K23", "x":8, "y":0},
+                {"label":"K22", "x":9, "y":0},
+                {"label":"K21", "x":10, "y":0},
+                {"label":"K20", "x":11, "y":0},
+
+                {"label":"K0B", "x":0, "y":1},
+                {"label":"K0A", "x":1, "y":1},
+                {"label":"K09", "x":2, "y":1},
+                {"label":"K08", "x":3, "y":1},
+                {"label":"K04", "x":4, "y":1},
+                {"label":"K05", "x":5, "y":1},
+                {"label":"K06", "x":6, "y":1},
+                {"label":"K07", "x":7, "y":1},
+                {"label":"K03", "x":8, "y":1},
+                {"label":"K02", "x":9, "y":1},
+                {"label":"K01", "x":10, "y":1},
+                {"label":"K00", "x":11, "y":1},
+
+                {"label":"K1B", "x":0, "y":2},
+                {"label":"K1A", "x":1, "y":2},
+                {"label":"K19", "x":2, "y":2},
+                {"label":"K18", "x":3, "y":2},
+                {"label":"K14", "x":4, "y":2},
+                {"label":"K15", "x":5, "y":2},
+                {"label":"K16", "x":6, "y":2},
+                {"label":"K17", "x":7, "y":2},
+                {"label":"K13", "x":8, "y":2},
+                {"label":"K12", "x":9, "y":2},
+                {"label":"K11", "x":10, "y":2},
+                {"label":"K10", "x":11, "y":2},
+
+                {"label":"K3B", "x":0, "y":3},
+                {"label":"K3A", "x":1, "y":3},
+                {"label":"K39", "x":2, "y":3},
+                {"label":"K38", "x":3, "y":3},
+                {"label":"K34", "x":4, "y":3},
+                {"label":"K35", "x":5, "y":3},
+                {"label":"K36", "x":6, "y":3},
+                {"label":"K37", "x":7, "y":3},
+                {"label":"K33", "x":8, "y":3},
+                {"label":"K32", "x":9, "y":3},
+                {"label":"K31", "x":10, "y":3},
+                {"label":"K30", "x":11, "y":3},
+
+                {"label":"K4B", "x":0, "y":4},
+                {"label":"K4A", "x":1, "y":4},
+                {"label":"K49", "x":2, "y":4},
+                {"label":"K48", "x":3, "y":4},
+                {"label":"K44", "x":4, "y":4},
+                {"label":"K45", "x":5, "y":4},
+                {"label":"K46", "x":6, "y":4},
+                {"label":"K47", "x":7, "y":4},
+                {"label":"K43", "x":8, "y":4},
+                {"label":"K42", "x":9, "y":4},
+                {"label":"K41", "x":10, "y":4},
+                {"label":"K40", "x":11, "y":4}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/kprepublic/jj50/jj50.h b/keyboards/kprepublic/jj50/jj50.h
index 59d5c6409..a3d42856c 100644
--- a/keyboards/kprepublic/jj50/jj50.h
+++ b/keyboards/kprepublic/jj50/jj50.h
@@ -22,17 +22,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 #define LAYOUT_ortho_5x12( \
-    K011, K010, K009, K008, K004, K005, K006, K007, K003, K002, K201, K000, \
-    K111, K110, K109, K108, K104, K105, K106, K107, K103, K102, K001, K100, \
-    K211, K210, K209, K208, K204, K205, K206, K207, K203, K202, K101, K200, \
-    K311, K310, K309, K308, K304, K305, K306, K307, K303, K302, K301, K300, \
-    K411, K410, K409, K408, K404, K405, K406, K407, K403, K402, K401, K400  \
+    K2B, K2A, K29, K28, K24, K25, K26, K27, K23, K22, K21, K20, \
+    K0B, K0A, K09, K08, K04, K05, K06, K07, K03, K02, K01, K00, \
+    K1B, K1A, K19, K18, K14, K15, K16, K17, K13, K12, K11, K10, \
+    K3B, K3A, K39, K38, K34, K35, K36, K37, K33, K32, K31, K30, \
+    K4B, K4A, K49, K48, K44, K45, K46, K47, K43, K42, K41, K40  \
 ) { \
-  { K100, K001, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, }, \
-  { K200, K101, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, }, \
-  { K000, K201, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, }, \
-  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, }, \
-  { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411  }  \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B  }  \
 }
-
-#define LAYOUT LAYOUT_ortho_5x12
diff --git a/keyboards/kprepublic/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk
index 2e510c8bb..faa1a619b 100644
--- a/keyboards/kprepublic/jj50/rules.mk
+++ b/keyboards/kprepublic/jj50/rules.mk
@@ -8,14 +8,14 @@ BOOTLOADER = bootloadhid
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no    # Mouse keys
-EXTRAKEY_ENABLE = yes   # Audio control and System control
-CONSOLE_ENABLE = no     # Console for debug
-COMMAND_ENABLE = no     # Commands for debug and configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes   # Enable keyboard underlight functionality
-WS2812_DRIVER = i2c     # This driver powers the RGB Lighting and RGB Matrix features
-LTO_ENABLE = yes        # Enable link time optimization
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+WS2812_DRIVER = i2c         # This driver powers the RGB Lighting and RGB Matrix features
+LTO_ENABLE = yes            # Enable link time optimization
 
 LAYOUTS = ortho_5x12