Keyboard: Numbrero: Configurator fix and code tidy (#4787)

* Numbrero: fix Configurator mismatch

Key object order in info.json didn't match the layout macro, leading to keys being assigned out-of-sequence.

* Numbrero: tidy

- white space changes in numbrero.h (alignment/readability/QMK conventions)
- minor changes to readme.md (grammar, mostly)

3 files changed, 73 insertions, 28 deletions

diff --git a/keyboards/handwired/numbrero/info.json b/keyboards/handwired/numbrero/info.json
index 85c4b48275..d2f7ebd031 100644
--- a/keyboards/handwired/numbrero/info.json
+++ b/keyboards/handwired/numbrero/info.json
@@ -5,11 +5,58 @@
   "width": 5,
   "height": 5,
   "layouts": {
-      "LAYOUT_numbrero_numpad": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":0, "y":1, "h":1.5}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1, "h":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":2.5}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "h":2}, {"x":0, "y":3.5, "h":1.5}, {"x":1, "y":4, "w":2}, {"x":3, "y":4}]
-      },
-      "LAYOUT_numbrero_ortho": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":0, "y":1, "h":1.5}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":0, "y":2.5}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":0, "y":3.5, "h":1.5}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}]
+    "LAYOUT_numbrero_numpad": {
+      "layout": [
+        {"label":"K00", "x":0, "y":0},
+        {"label":"K01", "x":1, "y":0},
+        {"label":"K02", "x":2, "y":0},
+        {"label":"K03", "x":3, "y":0},
+        {"label":"K04", "x":4, "y":0},
+        {"label":"K10", "x":0, "y":1, "h":1.5},
+        {"label":"K11", "x":1, "y":1},
+        {"label":"K12", "x":2, "y":1},
+        {"label":"K13", "x":3, "y":1},
+        {"label":"K20", "x":0, "y":2.5},
+        {"label":"K21", "x":1, "y":2},
+        {"label":"K22", "x":2, "y":2},
+        {"label":"K23", "x":3, "y":2},
+        {"label":"K14", "x":4, "y":1, "h":2},
+        {"label":"K30", "x":0, "y":3.5, "h":1.5},
+        {"label":"K31", "x":1, "y":3},
+        {"label":"K32", "x":2, "y":3},
+        {"label":"K33", "x":3, "y":3},
+        {"label":"K41", "x":1, "y":4, "w":2},
+        {"label":"K43", "x":3, "y":4},
+        {"label":"K34", "x":4, "y":3, "h":2}
+      ]
+    },
+    "LAYOUT_numbrero_ortho": {
+      "layout": [
+        {"label":"K00", "x":0, "y":0},
+        {"label":"K01", "x":1, "y":0},
+        {"label":"K02", "x":2, "y":0},
+        {"label":"K03", "x":3, "y":0},
+        {"label":"K04", "x":4, "y":0},
+        {"label":"K10", "x":0, "y":1, "h":1.5},
+        {"label":"K11", "x":1, "y":1},
+        {"label":"K12", "x":2, "y":1},
+        {"label":"K13", "x":3, "y":1},
+        {"label":"K14", "x":4, "y":1},
+        {"label":"K20", "x":0, "y":2.5},
+        {"label":"K21", "x":1, "y":2},
+        {"label":"K22", "x":2, "y":2},
+        {"label":"K23", "x":3, "y":2},
+        {"label":"K24", "x":4, "y":2},
+        {"label":"K30", "x":0, "y":3.5, "h":1.5},
+        {"label":"K31", "x":1, "y":3},
+        {"label":"K32", "x":2, "y":3},
+        {"label":"K33", "x":3, "y":3},
+        {"label":"K34", "x":4, "y":3},
+        {"label":"K41", "x":1, "y":4},
+        {"label":"K42", "x":2, "y":4},
+        {"label":"K43", "x":3, "y":4},
+        {"label":"K44", "x":4, "y":4}
+      ]
     }
   }
 }
diff --git a/keyboards/handwired/numbrero/numbrero.h b/keyboards/handwired/numbrero/numbrero.h
index d4aff8b880..c72e654078 100644
--- a/keyboards/handwired/numbrero/numbrero.h
+++ b/keyboards/handwired/numbrero/numbrero.h
@@ -3,28 +3,28 @@
 #include "quantum.h"
 
 #define LAYOUT_numbrero_numpad( \
-	K00, K01, K02, K03, K04, \
-	K10, K11, K12, K13,      \
-	K20, K21, K22, K23, K14, \
-	K30, K31, K32, K33,      \
-	     K41,      K43, K34  \
+  K00, K01, K02, K03, K04, \
+  K10, K11, K12, K13,      \
+  K20, K21, K22, K23, K14, \
+  K30, K31, K32, K33,      \
+       K41,      K43, K34  \
 ) { \
-	{ K00,   K01,   K02,   K03,   K04 }, \
-	{ K10,   K11,   K12,   K13,   K14 }, \
-	{ K20,   K21,   K22,   K23,   KC_NO }, \
-	{ K30,   K31,   K32,   K33,   K34 }, \
-	{ KC_NO, K41,   KC_NO, K43,   KC_NO }  \
+  { K00,   K01,   K02,   K03,   K04   }, \
+  { K10,   K11,   K12,   K13,   K14   }, \
+  { K20,   K21,   K22,   K23,   KC_NO }, \
+  { K30,   K31,   K32,   K33,   K34   }, \
+  { KC_NO, K41,   KC_NO, K43,   KC_NO }  \
 }
 #define LAYOUT_numbrero_ortho(\
   K00, K01, K02, K03, K04, \
-	K10, K11, K12, K13, K14, \
-	K20, K21, K22, K23, K24,  \
-	K30, K31, K32, K33, K34, \
-	     K41, K42, K43, K44  \
+  K10, K11, K12, K13, K14, \
+  K20, K21, K22, K23, K24, \
+  K30, K31, K32, K33, K34, \
+       K41, K42, K43, K44  \
 ){ \
-	{ K00,   K01,   K02,   K03,   K04 }, \
-	{ K10,   K11,   K12,   K13,   K14 }, \
-	{ K20,   K21,   K22,   K23,   K24 }, \
-	{ K30,   K31,   K32,   K33,   K34 }, \
-	{ KC_NO, K41,   K42,   K43,   K44 }  \
+  { K00,   K01,   K02,   K03,   K04 }, \
+  { K10,   K11,   K12,   K13,   K14 }, \
+  { K20,   K21,   K22,   K23,   K24 }, \
+  { K30,   K31,   K32,   K33,   K34 }, \
+  { KC_NO, K41,   K42,   K43,   K44 }  \
 }
diff --git a/keyboards/handwired/numbrero/readme.md b/keyboards/handwired/numbrero/readme.md
index a69eeefd43..42f005dbe2 100644
--- a/keyboards/handwired/numbrero/readme.md
+++ b/keyboards/handwired/numbrero/readme.md
@@ -1,11 +1,9 @@
 # Numbrero
 
-No picture currently available.
-
-A Reversible Numpad (Left/Right handed) with extra macro keys.
+A reversible numpad (left/right-handed) with extra macro keys.
 
 Keyboard Maintainer: [Flehrad](https://github.com/flehrad)  
-Hardware Supported: Numbrero PCB.  
+Hardware Supported: Numbrero PCB, Pro Micro  
 Hardware Availability: The Board Podcast Slack
 
 Make example for this keyboard (after setting up your build environment):