amend split_* community_layouts in keyboards (qmk#21847)

thismarvin · Sep 27, 2023 · c2f760a · c2f760a
1 parent 088636a
commit c2f760a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 60 deletions.
diff --git a/keyboards/budgy/info.json b/keyboards/budgy/info.json
@@ -38,6 +38,7 @@
             }
         }
     },
+    "community_layouts": ["split_3x5_2"],
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [

diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json
@@ -10,7 +10,7 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
-    "community_layouts": ["split_3x5_3" "split_3x6_3"],
+    "community_layouts": ["split_3x5_3", "split_3x6_3"],
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x6_3"
     },

diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json
@@ -27,8 +27,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3"
+    },
+    "community_layouts": ["split_3x6_3"],
     "layouts": {
-        "LAYOUT_split_3x6_3_2": {
+        "LAYOUT_split_3x6_3": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0.875},
                 {"matrix": [0, 1], "x": 1, "y": 0.625},

diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ enum layer_number {
 #define KC_A_DEL ALT_T(KC_DEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_split_3x6_3_2(
+    [_QWERTY] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+---------+--------+---------+--------+--------.
         KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                       KC_Y   , KC_U    , KC_I   , KC_O    , KC_P   , KC_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+---------+--------+---------+--------+--------|
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                          `+--------+--------+--------'                     `--------+---------+--------+'
     ),
 
-    [_RAISE] = LAYOUT_split_3x6_3_2(
+    [_RAISE] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE,                       KC_AT  , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                          `+--------+--------+--------'                      `--------+-------+--------+'
     ),
 
-    [_LOWER] = LAYOUT_split_3x6_3_2(
+    [_LOWER] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,                       _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                          `+--------+--------+--------'                     `--------+--------+--------+'
     ),
 
-    [_ADJUST] = LAYOUT_split_3x6_3_2(
+    [_ADJUST] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|

diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
@@ -31,7 +31,7 @@ enum layer_number {
 #define KC_A_DEL ALT_T(KC_DEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_split_3x6_3_2(
+    [_QWERTY] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+---------+--------+---------+--------+--------.
         KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                       KC_Y   , KC_U    , KC_I   , KC_O    , KC_P   , KC_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+---------+--------+---------+--------+--------|
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                          `+--------+--------+--------'                     `--------+---------+--------+'
     ),
 
-    [_RAISE] = LAYOUT_split_3x6_3_2(
+    [_RAISE] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE,                       KC_AT  , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                          `+--------+--------+--------'                      `--------+-------+--------+'
     ),
 
-    [_LOWER] = LAYOUT_split_3x6_3_2(
+    [_LOWER] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,                       _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //                          `+--------+--------+--------'                     `--------+--------+--------+'
     ),
 
-    [_ADJUST] = LAYOUT_split_3x6_3_2(
+    [_ADJUST] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|

diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
@@ -41,54 +41,5 @@
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"x": 0, "y": 0.88},
-                {"x": 1, "y": 0.38},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.38},
-                {"x": 4, "y": 0.5},
-
-                {"x": 6, "y": 0.5},
-                {"x": 7, "y": 0.38},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0.38},
-                {"x": 10, "y": 0.88},
-
-                {"x": 0, "y": 1.88},
-                {"x": 1, "y": 1.38},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.38},
-                {"x": 4, "y": 1.5},
-
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.38},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1.38},
-                {"x": 10, "y": 1.88},
-
-                {"x": 0, "y": 2.88},
-                {"x": 1, "y": 2.38},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.38},
-                {"x": 4, "y": 2.5},
-
-                {"x": 6, "y": 2.5},
-                {"x": 7, "y": 2.38},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2.38},
-                {"x": 10, "y": 2.88},
-
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.38},
-                {"x": 4, "y": 3.5},
-
-                {"x": 6, "y": 3.5},
-                {"x": 7, "y": 3.38},
-                {"x": 8, "y": 3.25}
-            ]
-        }
-    }
+    "community_layouts": ["split_3x5_3"]
 }