Odelia Touch-Up (#20754)

* rename LAYOUT_all to LAYOUT

Only one layout is supported.

* info.json: apply friendly formatting

3 files changed, 96 insertions, 93 deletions

diff --git a/keyboards/odelia/info.json b/keyboards/odelia/info.json
index ddd160f8f8..6208e2da1e 100644
--- a/keyboards/odelia/info.json
+++ b/keyboards/odelia/info.json
@@ -15,110 +15,113 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"label": "F1", "matrix": [1, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 0], "x": 1, "y": 0},
 
-                {"matrix": [1, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 1], "x": 3.5, "y": 0},
-                {"matrix": [1, 2], "x": 4.5, "y": 0},
-                {"matrix": [0, 2], "x": 5.5, "y": 0},
-                {"matrix": [1, 3], "x": 6.5, "y": 0},
-                {"matrix": [0, 3], "x": 7.5, "y": 0},
-                {"matrix": [1, 4], "x": 8.5, "y": 0},
-                {"matrix": [0, 4], "x": 9.5, "y": 0},
-                {"matrix": [1, 5], "x": 10.5, "y": 0},
-                {"matrix": [0, 5], "x": 11.5, "y": 0},
-                {"matrix": [1, 6], "x": 12.5, "y": 0},
-                {"matrix": [0, 6], "x": 13.5, "y": 0},
-                {"matrix": [1, 7], "x": 14.5, "y": 0},
-                {"matrix": [0, 7], "x": 15.5, "y": 0, "w": 2},
-                {"matrix": [1, 8], "x": 17.5, "y": 0},
+                {"label": "Esc", "matrix": [1, 1], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [1, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 2], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [1, 3], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 3], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [1, 4], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 4], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [1, 5], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 5], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [1, 6], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 6], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [1, 7], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 7], "x": 15.5, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [1, 8], "x": 17.5, "y": 0},
 
-                {"matrix": [0, 8], "x": 19, "y": 0},
-                {"matrix": [1, 9], "x": 20, "y": 0},
+                {"label": "\u25bd", "matrix": [0, 8], "x": 19, "y": 0},
+                {"label": "\u25bd", "matrix": [1, 9], "x": 20, "y": 0},
 
-                {"matrix": [3, 0], "x": 0, "y": 1},
-                {"matrix": [2, 0], "x": 1, "y": 1},
+                {"label": "F3", "matrix": [3, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [2, 0], "x": 1, "y": 1},
 
-                {"matrix": [3, 1], "x": 2.5, "y": 1, "w": 1.5},
-                {"matrix": [2, 1], "x": 4, "y": 1},
-                {"matrix": [3, 2], "x": 5, "y": 1},
-                {"matrix": [2, 2], "x": 6, "y": 1},
-                {"matrix": [3, 3], "x": 7, "y": 1},
-                {"matrix": [2, 3], "x": 8, "y": 1},
-                {"matrix": [3, 4], "x": 9, "y": 1},
-                {"matrix": [2, 4], "x": 10, "y": 1},
-                {"matrix": [3, 5], "x": 11, "y": 1},
-                {"matrix": [2, 5], "x": 12, "y": 1},
-                {"matrix": [3, 6], "x": 13, "y": 1},
-                {"matrix": [2, 6], "x": 14, "y": 1},
-                {"matrix": [3, 7], "x": 15, "y": 1},
-                {"matrix": [2, 7], "x": 16, "y": 1, "w": 1.5},
-                {"matrix": [3, 8], "x": 17.5, "y": 1},
+                {"label": "Tab", "matrix": [3, 1], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [3, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [2, 2], "x": 6, "y": 1},
+                {"label": "R", "matrix": [3, 3], "x": 7, "y": 1},
+                {"label": "T", "matrix": [2, 3], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [3, 4], "x": 9, "y": 1},
+                {"label": "U", "matrix": [2, 4], "x": 10, "y": 1},
+                {"label": "I", "matrix": [3, 5], "x": 11, "y": 1},
+                {"label": "O", "matrix": [2, 5], "x": 12, "y": 1},
+                {"label": "P", "matrix": [3, 6], "x": 13, "y": 1},
+                {"label": "[", "matrix": [2, 6], "x": 14, "y": 1},
+                {"label": "]", "matrix": [3, 7], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [2, 7], "x": 16, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [3, 8], "x": 17.5, "y": 1},
 
-                {"matrix": [2, 8], "x": 19, "y": 1},
-                {"matrix": [3, 9], "x": 20, "y": 1},
+                {"label": "\u25bd", "matrix": [2, 8], "x": 19, "y": 1},
+                {"label": "\u25bd", "matrix": [3, 9], "x": 20, "y": 1},
 
-                {"matrix": [4, 0], "x": 0, "y": 2},
-                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [5, 0], "x": 1, "y": 2},
 
-                {"matrix": [4, 1], "x": 2.5, "y": 2, "w": 1.75},
-                {"matrix": [5, 1], "x": 4.25, "y": 2},
-                {"matrix": [4, 2], "x": 5.25, "y": 2},
-                {"matrix": [5, 2], "x": 6.25, "y": 2},
-                {"matrix": [4, 3], "x": 7.25, "y": 2},
-                {"matrix": [5, 3], "x": 8.25, "y": 2},
-                {"matrix": [4, 4], "x": 9.25, "y": 2},
-                {"matrix": [5, 4], "x": 10.25, "y": 2},
-                {"matrix": [4, 5], "x": 11.25, "y": 2},
-                {"matrix": [5, 5], "x": 12.25, "y": 2},
-                {"matrix": [4, 6], "x": 13.25, "y": 2},
-                {"matrix": [5, 6], "x": 14.25, "y": 2},
-                {"matrix": [4, 7], "x": 15.25, "y": 2, "w": 2.25},
-                {"matrix": [5, 8], "x": 17.5, "y": 2},
+                {"label": "Caps Lock", "matrix": [4, 1], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [4, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [5, 2], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [4, 3], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [5, 3], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [4, 4], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [5, 4], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [4, 5], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [5, 5], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [4, 6], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [5, 6], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [4, 7], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [5, 8], "x": 17.5, "y": 2},
 
-                {"matrix": [4, 8], "x": 19, "y": 2},
-                {"matrix": [5, 9], "x": 20, "y": 2},
+                {"label": "\u25bd", "matrix": [4, 8], "x": 19, "y": 2},
+                {"label": "\u25bd", "matrix": [5, 9], "x": 20, "y": 2},
 
-                {"matrix": [6, 0], "x": 0, "y": 3},
-                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"label": "F7", "matrix": [6, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [7, 0], "x": 1, "y": 3},
 
-                {"matrix": [6, 1], "x": 2.5, "y": 3, "w": 2.25},
-                {"matrix": [7, 1], "x": 4.75, "y": 3},
-                {"matrix": [6, 2], "x": 5.75, "y": 3},
-                {"matrix": [7, 2], "x": 6.75, "y": 3},
-                {"matrix": [6, 3], "x": 7.75, "y": 3},
-                {"matrix": [7, 3], "x": 8.75, "y": 3},
-                {"matrix": [6, 4], "x": 9.75, "y": 3},
-                {"matrix": [7, 4], "x": 10.75, "y": 3},
-                {"matrix": [6, 5], "x": 11.75, "y": 3},
-                {"matrix": [7, 5], "x": 12.75, "y": 3},
-                {"matrix": [6, 6], "x": 13.75, "y": 3},
-                {"matrix": [7, 6], "x": 14.75, "y": 3, "w": 1.75},
-                {"matrix": [6, 7], "x": 16.5, "y": 3},
-                {"matrix": [7, 8], "x": 17.5, "y": 3},
+                {"label": "Shift", "matrix": [6, 1], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [7, 1], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [6, 2], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [7, 2], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [6, 3], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [7, 3], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [6, 4], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [7, 4], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [6, 5], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [7, 5], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [6, 6], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [7, 6], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [6, 7], "x": 16.5, "y": 3},
+                {"label": "Page Down", "matrix": [7, 8], "x": 17.5, "y": 3},
 
-                {"matrix": [6, 8], "x": 19, "y": 3},
-                {"matrix": [7, 9], "x": 20, "y": 3},
+                {"label": "\u25bd", "matrix": [6, 8], "x": 19, "y": 3},
+                {"label": "\u25bd", "matrix": [7, 9], "x": 20, "y": 3},
 
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [9, 0], "x": 1, "y": 4},
+                {"label": "F9", "matrix": [8, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [9, 0], "x": 1, "y": 4},
 
-                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 1], "x": 4, "y": 4},
-                {"matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
-                {"matrix": [9, 3], "x": 6.5, "y": 4, "w": 7},
-                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 1], "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 6.5, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5},
 
-                {"matrix": [9, 6], "x": 15.5, "y": 4},
-                {"matrix": [8, 7], "x": 16.5, "y": 4},
-                {"matrix": [9, 8], "x": 17.5, "y": 4},
+                {"label": "\u2190", "matrix": [9, 6], "x": 15.5, "y": 4},
+                {"label": "\u2193", "matrix": [8, 7], "x": 16.5, "y": 4},
+                {"label": "\u2192", "matrix": [9, 8], "x": 17.5, "y": 4},
 
-                {"matrix": [8, 8], "x": 19, "y": 4},
-                {"matrix": [9, 9], "x": 20, "y": 4}
+                {"label": "\u25bd", "matrix": [8, 8], "x": 19, "y": 4},
+                {"label": "\u25bd", "matrix": [9, 9], "x": 20, "y": 4}
             ]
         }
     }
diff --git a/keyboards/odelia/keymaps/default/keymap.c b/keyboards/odelia/keymaps/default/keymap.c
index a2ef94cff9..aecba2d4e0 100644
--- a/keyboards/odelia/keymaps/default/keymap.c
+++ b/keyboards/odelia/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_all(
+    [0] = LAYOUT(
         KC_F1,   KC_F2,   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_DEL,  KC_TRNS, KC_TRNS,
         KC_F3,   KC_F4,   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, KC_END,  KC_TRNS, KC_TRNS,
         KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,     KC_ENT,       KC_PGUP, KC_TRNS, KC_TRNS,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                                 KC_SPC,                                 KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS
     ),
 
-    [1] = LAYOUT_all(
+    [1] = LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/odelia/keymaps/via/keymap.c b/keyboards/odelia/keymaps/via/keymap.c
index 31230fe6f4..cb08aab6ec 100644
--- a/keyboards/odelia/keymaps/via/keymap.c
+++ b/keyboards/odelia/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_all(
+    [0] = LAYOUT(
         KC_F1,   KC_F2,   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_DEL,  KC_TRNS, KC_TRNS,
         KC_F3,   KC_F4,   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, KC_END,  KC_TRNS, KC_TRNS,
         KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,     KC_ENT,       KC_PGUP, KC_TRNS, KC_TRNS,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                                 KC_SPC,                                 KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS
     ),
 
-    [1] = LAYOUT_all(
+    [1] = LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 KC_TRNS,                                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-    [2] = LAYOUT_all(
+    [2] = LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                 KC_TRNS,                                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-    [3] = LAYOUT_all(
+    [3] = LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,