Resolve a number of warnings in `qmk generate-api` (#12833)

keyboards/40percentclub/25/info.json

@@ -5,7 +5,7 @@
     "width": 6,
     "height": 2,
     "layouts": {
-        "LAYOUT_macro": {
+        "LAYOUT_ortho_5x5": {
             "key_count": 15,
             "layout": [
               {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
@@ -15,7 +15,7 @@
               {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}
           ]
         },
-        "LAYOUT_split": {
+        "LAYOUT_ortho_5x10": {
             "key_count": 30,
             "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},

keyboards/40percentclub/6lit/info.json

@@ -5,14 +5,14 @@
     "width": 6,
     "height": 2,
     "layouts": {
-        "LAYOUT_macro": {
+        "LAYOUT_ortho_2x3": {
             "key_count": 6,
             "layout": [
               {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0},
               {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}
             ]
         },
-        "LAYOUT_split": {
+        "LAYOUT_ortho_2x6": {
             "key_count": 12,
             "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},

keyboards/40percentclub/foobar/info.json

@@ -5,7 +5,7 @@
     "width": 10,
     "height": 3,
     "layouts": {
-        "LAYOUT_macro": {
+        "LAYOUT_ortho_3x5": {
             "key_count": 15,
             "layout": [
               {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
@@ -13,7 +13,7 @@
               {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}
             ]
         },
-        "LAYOUT_split": {
+        "LAYOUT_ortho_3x10": {
             "key_count": 30,
             "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},

keyboards/40percentclub/nano/info.json

@@ -5,7 +5,7 @@
   "width": 4,
   "height": 2,
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_ortho_2x4": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]
     }
   }

keyboards/bm60rgb/info.json

@@ -5,7 +5,7 @@
     "width": 15,
     "height": 5,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60_iso_arrow": {
             "key_count": 63,
             "layout": [
                 {"label":"K00 (B0,D0)", "x":0, "y":0},

keyboards/bm60rgb_iso/info.json

@@ -5,7 +5,7 @@
     "width": 15,
     "height": 5,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60_iso_arrow": {
             "layout": [
                 {"label":"K00 (B0,D0)", "x":0, "y":0},
                 {"label":"K01 (B0,D1)", "x":1, "y":0},

keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h

@@ -20,9 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CU80_RGB
 
 /* update the product for RGB Matrix variant in VIA/VIAL and Remap-keys.app */
-#undef PRODUCT_ID
 #undef PRODUCT
-#define PRODUCT_ID      0x0082
 #define PRODUCT         CU80 v2 ANSI RGB
 
 /* moved to RGB specific */

keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json

@@ -0,0 +1,8 @@
+{
+  "features": {
+    "rgblight": false
+  },
+  "usb": {
+    "pid": "0x0082"
+  }
+}

keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk

@@ -1,3 +1,2 @@
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix
 RGB_MATRIX_DRIVER = WS2812  # Set Driver to WS2812

keyboards/capsunlocked/cu80/v2_iso/rgb/config.h

@@ -19,9 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CU80_RGB
 
 /* update the product for RGB Matrix variant in VIA/VIAL and Remap-keys.app */
-#undef PRODUCT_ID
 #undef PRODUCT
-#define PRODUCT_ID      0x0083
 #define PRODUCT         CU80 v2 ISO RGB
 
 /* moved to RGB specific */

keyboards/capsunlocked/cu80/v2_iso/rgb/info.json

@@ -0,0 +1,8 @@
+{
+  "features": {
+    "rgblight": false
+  },
+  "usb": {
+    "pid": "0x0083"
+  }
+}

keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk

@@ -1,3 +1,2 @@
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix
 RGB_MATRIX_DRIVER = WS2812  # Set Driver to WS2812

keyboards/converter/ibm_5291/info.json

@@ -5,7 +5,7 @@
   "width": 21,
   "height": 5,
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_5291": {
       "layout": [
         {"label":"Sys Req", "x":0, "y":0},
         {"label":"Cmd", "x":1, "y":0},

keyboards/ergo42/info.json

@@ -5,7 +5,7 @@
   "width": 15,
   "height": 4,
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_ortho_4x14": {
       "key_count": 56,
       "layout": [{"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, {"label":"L02", "x":2, "y":0}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0}, {"label":"L05", "x":5, "y":0}, {"label":"L06", "x":6, "y":0}, {"label":"R00", "x":8, "y":0}, {"label":"R01", "x":9, "y":0}, {"label":"R02", "x":10, "y":0}, {"label":"R03", "x":11, "y":0}, {"label":"R04", "x":12, "y":0}, {"label":"R05", "x":13, "y":0}, {"label":"R06", "x":14, "y":0}, {"label":"L10", "x":0, "y":1}, {"label":"L11", "x":1, "y":1}, {"label":"L12", "x":2, "y":1}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1}, {"label":"L15", "x":5, "y":1}, {"label":"L16", "x":6, "y":1}, {"label":"R10", "x":8, "y":1}, {"label":"R11", "x":9, "y":1}, {"label":"R12", "x":10, "y":1}, {"label":"R13", "x":11, "y":1}, {"label":"R14", "x":12, "y":1}, {"label":"R15", "x":13, "y":1}, {"label":"R16", "x":14, "y":1}, {"label":"L20", "x":0, "y":2}, {"label":"L21", "x":1, "y":2}, {"label":"L22", "x":2, "y":2}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2}, {"label":"L25", "x":5, "y":2}, {"label":"L26", "x":6, "y":2}, {"label":"R20", "x":8, "y":2}, {"label":"R21", "x":9, "y":2}, {"label":"R22", "x":10, "y":2}, {"label":"R23", "x":11, "y":2}, {"label":"R24", "x":12, "y":2}, {"label":"R25", "x":13, "y":2}, {"label":"R26", "x":14, "y":2}, {"label":"L30", "x":0, "y":3}, {"label":"L31", "x":1, "y":3}, {"label":"L32", "x":2, "y":3}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3}, {"label":"L36", "x":6, "y":3}, {"label":"R30", "x":8, "y":3}, {"label":"R31", "x":9, "y":3}, {"label":"R32", "x":10, "y":3}, {"label":"R33", "x":11, "y":3}, {"label":"R34", "x":12, "y":3}, {"label":"R35", "x":13, "y":3}, {"label":"R36", "x":14, "y":3}]
     }

keyboards/idb/idb_60/info.json

@@ -69,7 +69,7 @@
                 {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
             ]
         },
-        "LAYOUT_all": {
+        "LAYOUT": {
             "key_count": 63,
             "layout": [
                 {"label":"Esc", "x":0, "y":0},

keyboards/keebio/nyquist/info.json

@@ -7,9 +7,6 @@
     "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":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
     },
-    "LAYOUT_ortho_5x12": {
-      "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":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
-    },
     "LAYOUT_ortho_4x12": {
       "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":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
     }

keyboards/keebio/quefrency/info.json

@@ -5,7 +5,7 @@
     "width": 17,
     "height": 5,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60": {
             "layout": [
                 {"label":"Esc", "x":0, "y":0},
                 {"label":"1", "x":1, "y":0},

keyboards/ploopyco/trackball/config.h

@@ -24,7 +24,6 @@
 #define VENDOR_ID 0x5043
 #define PRODUCT_ID 0x5442
 #define DEVICE_VER 0x0001
-#define MANUFACTURER PloopyCo
 #define PRODUCT Trackball
 
 /* key matrix size */

keyboards/ploopyco/trackball/info.json

@@ -2,6 +2,7 @@
     "keyboard_name": "PloopyCo Trackball",
     "url": "www.ploopy.co",
     "maintainer": "drashna",
+    "manufacturer": "Ploopy Corporation",
     "width": 8,
     "height": 3,
     "layouts": {

keyboards/ploopyco/trackball_mini/config.h

@@ -25,7 +25,6 @@
 #define VENDOR_ID 0x5043
 #define PRODUCT_ID 0x1EAB
 #define DEVICE_VER 0x0001
-#define MANUFACTURER PloopyCo
 #define PRODUCT Trackball Mini
 
 /* key matrix size */

keyboards/ploopyco/trackball_nano/config.h

@@ -25,7 +25,6 @@
 #define VENDOR_ID 0x5043
 #define PRODUCT_ID 0x1EAB
 #define DEVICE_VER 0x0001
-#define MANUFACTURER PloopyCo
 #define PRODUCT Trackball Nano
 
 /* key matrix size */

keyboards/ramonimbao/mona/info.json

@@ -355,7 +355,7 @@
                 {"x":13.5, "y":4, "w":1.5}
             ]
         },
-        "LAYOUT_all": {
+        "LAYOUT_60_iso_split_bs_rshift": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},

keyboards/sowbug/68keys/info.json

@@ -5,7 +5,7 @@
     "width": 17.25,
     "height": 5,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_default": {
             "layout": [
                 {"label":"K00", "x":0, "y":0},
                 {"label":"K01", "x":1, "y":0},

keyboards/sowbug/ansi_tkl/info.json

@@ -5,7 +5,7 @@
     "width": 18.25,
     "height": 6.5,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_default": {
             "layout": [
                 {"label":"K00", "x":0, "y":0},
                 {"label":"K02", "x":2, "y":0},

keyboards/telophase/telophase.h

@@ -46,7 +46,7 @@
 // This a shortcut to help you visually see your layout.
 // The first section contains all of the arguements
 // The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
+#define LAYOUT_ortho_4x12( \
   k00, k01, k02, k03, k04, k05,      k06, k07, k08, k09, k10, k11, \
   k12, k13, k14, k15, k16, k17,      k18, k19, k20, k21, k22, k23, \
   k24, k25, k26, k27, k28, k29,      k30, k31, k32, k33, k34, k35, \
@@ -59,6 +59,6 @@
 	{ k36, k37, k38, k39, k40, k41,      k42, k43, k44, k45, k46, k47 }, \
 }
 
-#define LAYOUT_ortho_4x12 LAYOUT
+#define LAYOUT LAYOUT_ortho_4x12
 
 #endif

keyboards/tkw/grandiceps/config.h

@@ -22,7 +22,6 @@
 #define VENDOR_ID 0xFEED
 #define PRODUCT_ID 0x7812
 #define DEVICE_VER 0x0001
-#define MANUFACTURER TKW
 #define PRODUCT Grandiceps Split
 
 /* key matrix size */

keyboards/tkw/grandiceps/info.json

@@ -2,7 +2,7 @@
     "keyboard_name": "grandiceps",
     "url": "https://github.com/vattern/grandiceps",
     "maintainer": "vattern",
-    "manufacturer": "tkw",
+    "manufacturer": "TKW",
     "width": 16.5,
     "height": 5.25,
     "layouts": {

keyboards/zlant/info.json

@@ -5,7 +5,7 @@
     "width": 12.75,
     "height": 4,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_4x12": {
             "key_count": 48,
             "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2, "y":0}, {"label":"K003", "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":"K008", "x":8, "y":0}, {"label":"K009", "x":9, "y":0}, {"label":"K010", "x":10, "y":0}, {"label":"K011", "x":11, "y":0}, {"label":"K100", "x":0.25, "y":1}, {"label":"K101", "x":1.25, "y":1}, {"label":"K102", "x":2.25, "y":1}, {"label":"K103", "x":3.25, "y":1}, {"label":"K104", "x":4.25, "y":1}, {"label":"K105", "x":5.25, "y":1}, {"label":"K106", "x":6.25, "y":1}, {"label":"K107", "x":7.25, "y":1}, {"label":"K108", "x":8.25, "y":1}, {"label":"K109", "x":9.25, "y":1}, {"label":"K110", "x":10.25, "y":1}, {"label":"K111", "x":11.25, "y":1}, {"label":"K200", "x":0.5, "y":2}, {"label":"K201", "x":1.5, "y":2}, {"label":"K202", "x":2.5, "y":2}, {"label":"K203", "x":3.5, "y":2}, {"label":"K204", "x":4.5, "y":2}, {"label":"K205", "x":5.5, "y":2}, {"label":"K206", "x":6.5, "y":2}, {"label":"K207", "x":7.5, "y":2}, {"label":"K208", "x":8.5, "y":2}, {"label":"K209", "x":9.5, "y":2}, {"label":"K210", "x":10.5, "y":2}, {"label":"K211", "x":11.5, "y":2}, {"label":"K300", "x":0.75, "y":3}, {"label":"K301", "x":1.75, "y":3}, {"label":"K302", "x":2.75, "y":3}, {"label":"K303", "x":3.75, "y":3}, {"label":"K304", "x":4.75, "y":3}, {"label":"K305", "x":5.75, "y":3}, {"label":"K306", "x":6.75, "y":3}, {"label":"K307", "x":7.75, "y":3}, {"label":"K308", "x":8.75, "y":3}, {"label":"K309", "x":9.75, "y":3}, {"label":"K310", "x":10.75, "y":3}, {"label":"K311", "x":11.75, "y":3}]
         },