Remove some layout exceptions (#16957)

* LAYOUT_JP -> LAYOUT_jp

* LAYOUT_ANSI_DEFAULT -> LAYOUT

* LAYOUT_reviung34_2uL -> LAYOUT_reviung34_2u

3 files changed, 12 insertions, 22 deletions

diff --git a/keyboards/handwired/xealous/info.json b/keyboards/handwired/xealous/info.json
index 7113c311f2..9cd634a210 100644
--- a/keyboards/handwired/xealous/info.json
+++ b/keyboards/handwired/xealous/info.json
@@ -3,7 +3,7 @@
   "url": "",
   "maintainer": "alex-ong",
   "layouts": {
-    "LAYOUT_ANSI_DEFAULT": {
+    "LAYOUT": {
       "layout": [
         {"label":"Esc", "x":0, "y":0},
         {"label":"1", "x":1, "y":0},
@@ -25,11 +25,7 @@
         {"label":"Q", "x":1.5, "y":1},
         {"label":"W", "x":2.5, "y":1},
         {"label":"E", "x":3.5, "y":1},
-        {
-          "label": "R",
-          "x": 4.5,
-          "y": 1
-        },
+        {"label":"R", "x": 4.5,"y":1},
         {"label":"T", "x":5.5, "y":1},
 
         {"label":"Y", "x":6.5, "y":1},
@@ -73,15 +69,14 @@
         {"label":"Ctrl", "x":0, "y":4, "w":1.25},
         {"label":"Win", "x":1.25, "y":4, "w":1.25},
         {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":2.75},
-        {"x":6.5, "y":4, "w":1.25},
+        {"x":3.75, "y":4, "w":1.25},
+        {"x":5, "y":4, "w":2.25},
 
-        {"x":7.75, "y":4, "w":1.25},
-        {"x":9, "y":4, "w":2.0},
-        {"label":"Alt", "x":11, "y":4},
-        {"label":"Win", "x":12, "y":4},
-        {"label":"Menu", "x":13, "y":4},
-        {"label":"Ctrl", "x":14, "y":4}
+        {"x":7.25, "y":4, "w":2.75},
+        {"label":"Alt", "x":10, "y":4, "w":1.25},
+        {"label":"Win", "x":11.25, "y":4, "w":1.25},
+        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+        {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
       ]
     }
   }
diff --git a/keyboards/handwired/xealous/keymaps/default/keymap.c b/keyboards/handwired/xealous/keymaps/default/keymap.c
index bf7caef622..c0ce72214d 100644
--- a/keyboards/handwired/xealous/keymaps/default/keymap.c
+++ b/keyboards/handwired/xealous/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------'
    */
   /* Layer 0: Qwerty */
-  [_QWERTY] = LAYOUT_split60(
+  [_QWERTY] = LAYOUT(
     KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
     KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         FN,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   /* Layer 1: Numpad */
-  [_NUMPAD] = LAYOUT_split60(
+  [_NUMPAD] = LAYOUT(
     _______,  _______,  _______, _______,  _______,  _______,  _______,   KC_NLCK,  KC_PSLS,  KC_PAST,    KC_MINUS,  _______, _______,  KC_BSPC,
     _______,  _______,  _______, _______,  _______,  _______,  _______,     KC_P7,  KC_P8,        KC_P9,    KC_PLUS,  _______, _______,   KC_BSLS,
     _______,  _______,  _______, _______,  _______,  _______,  _______,     KC_P4,  KC_P5,        KC_P6,    KC_BSPC, _______,          _______,
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 
   /* Layer 2: RAISE */
-  [_FN] = LAYOUT_split60(
+  [_FN] = LAYOUT(
      KC_GRV,    KC_F1,    KC_F2,   KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,   KC_F12,   KC_DEL,
     KC_CAPS,  KC_PGUP,    KC_UP, KC_PGDN,  _______,  _______,  _______,  KC_PGUP,    KC_UP,  KC_PGDN,    KC_PSCR, KC_SLCK,  KC_PAUS,  _______,
     _______,  KC_LEFT,  KC_DOWN,KC_RIGHT,  _______,  KC_HOME,  KC_HOME,  KC_LEFT,  KC_DOWN, KC_RIGHT,    KC_INS,  KC_DEL,             _______,
@@ -96,6 +96,3 @@ layer_state_t default_layer_state_set_kb(layer_state_t state) {
     return state;
 }
 #endif
-
-void led_set_keymap(uint8_t usb_led) {  
-}
diff --git a/keyboards/handwired/xealous/rev1/rev1.h b/keyboards/handwired/xealous/rev1/rev1.h
index 88e5ef376e..ce8d68c2c1 100644
--- a/keyboards/handwired/xealous/rev1/rev1.h
+++ b/keyboards/handwired/xealous/rev1/rev1.h
@@ -22,5 +22,3 @@
     { R30, R31, R32, R33, R34, R35, XXX, XXX }, \
     { R40, R41, R42, R43, R44, XXX, XXX, XXX } \
 }
-
-#define LAYOUT_split60 LAYOUT