Ratio65 Hotswap: rename LAYOUT_all to LAYOUT_65_ansi_blocker (#20801)

* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT_65_ansi_blocker

3 files changed, 77 insertions, 74 deletions

diff --git a/keyboards/rationalist/ratio65_hotswap/keymaps/default/keymap.c b/keyboards/rationalist/ratio65_hotswap/keymaps/default/keymap.c
index 2e9afb3060..9b0b9ef9a6 100644
--- a/keyboards/rationalist/ratio65_hotswap/keymaps/default/keymap.c
+++ b/keyboards/rationalist/ratio65_hotswap/keymaps/default/keymap.c
@@ -18,14 +18,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // main layer
-[0] = LAYOUT_all(
+[0] = LAYOUT_65_ansi_blocker(
     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_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_INSERT,
     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_LSFT,                KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,    KC_DOT,     KC_SLSH,    KC_RSFT,    KC_UP,      KC_PGDN,
     KC_LCTL,    KC_LGUI,    KC_LALT,                        KC_SPC,                             KC_RGUI,    MO(1),      KC_LEFT,    KC_DOWN,   KC_RIGHT ),
 // basic function layer
-[1] = LAYOUT_all(
+[1] = LAYOUT_65_ansi_blocker(
     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_TRNS,  QK_BOOT,
     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/rationalist/ratio65_hotswap/keymaps/via/keymap.c b/keyboards/rationalist/ratio65_hotswap/keymaps/via/keymap.c
index 180bfeee84..44735621c4 100644
--- a/keyboards/rationalist/ratio65_hotswap/keymaps/via/keymap.c
+++ b/keyboards/rationalist/ratio65_hotswap/keymaps/via/keymap.c
@@ -18,28 +18,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // main layer
-[0] = LAYOUT_all(
+[0] = LAYOUT_65_ansi_blocker(
     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_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_INSERT,
     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_LSFT,                KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,    KC_DOT,     KC_SLSH,    KC_RSFT,    KC_UP,      KC_PGDN,
     KC_LCTL,    KC_LGUI,    KC_LALT,                        KC_SPC,                             KC_RGUI,    MO(1),      KC_LEFT,    KC_DOWN,   KC_RIGHT ),
 // basic function layer 1
-[1] = LAYOUT_all(
+[1] = LAYOUT_65_ansi_blocker(
     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_TRNS,  QK_BOOT,
     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 ),
 // basic function layer 2
-[2] = LAYOUT_all(
+[2] = LAYOUT_65_ansi_blocker(
     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,  KC_TRNS,  KC_TRNS,
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS ),
 // basic function layer 3
-[3] = LAYOUT_all(
+[3] = LAYOUT_65_ansi_blocker(
     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/rationalist/ratio65_hotswap/rev_a/info.json b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
index 99c453d7fb..c9fb81dad8 100644
--- a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
+++ b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
@@ -22,81 +22,84 @@
     },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [0, 7], "x": 13, "y": 0, "w": 2},
-                {"matrix": [1, 7], "x": 15, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 7], "x": 13, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [1, 7], "x": 15, "y": 0},
 
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 1},
-                {"matrix": [3, 1], "x": 2.5, "y": 1},
-                {"matrix": [2, 2], "x": 3.5, "y": 1},
-                {"matrix": [3, 2], "x": 4.5, "y": 1},
-                {"matrix": [2, 3], "x": 5.5, "y": 1},
-                {"matrix": [3, 3], "x": 6.5, "y": 1},
-                {"matrix": [2, 4], "x": 7.5, "y": 1},
-                {"matrix": [3, 4], "x": 8.5, "y": 1},
-                {"matrix": [2, 5], "x": 9.5, "y": 1},
-                {"matrix": [3, 5], "x": 10.5, "y": 1},
-                {"matrix": [2, 6], "x": 11.5, "y": 1},
-                {"matrix": [3, 6], "x": 12.5, "y": 1},
-                {"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [3, 7], "x": 15, "y": 1},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [3, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [2, 2], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [3, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [2, 3], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [3, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [2, 4], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [3, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [2, 5], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [3, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [2, 6], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [3, 6], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Insert", "matrix": [3, 7], "x": 15, "y": 1},
 
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [5, 7], "x": 15, "y": 2},
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [5, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [5, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [4, 3], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [5, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [4, 4], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [5, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [4, 5], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [5, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [4, 6], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
 
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [6, 7], "x": 14, "y": 3},
-                {"matrix": [7, 7], "x": 15, "y": 3},
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [6, 7], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
 
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "GUI", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
 
-                {"matrix": [9, 6], "x": 13, "y": 4},
-                {"matrix": [8, 7], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
+                {"label": "\u2190", "matrix": [9, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [8, 7], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
             ]
         }
     }