From e2308167ff1ac5967157e9461624b12ccde5297c Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Mon, 14 Jul 2025 16:37:37 +0200
Subject: [PATCH 01/13] feat: add classic48 keyboard

---
 data/mappings/keyboard_aliases.hjson          |   3 +
 .../pablojimenezmateo/classic48/config.h      |  20 ++
 .../pablojimenezmateo/classic48/keyboard.json | 169 ++++++++++++++++
 .../classic48/keymaps/default/keymap.c        | 188 ++++++++++++++++++
 .../pablojimenezmateo/classic48/readme.md     |  28 +++
 .../pablojimenezmateo/classic48/rules.mk      |   1 +
 6 files changed, 409 insertions(+)
 create mode 100644 keyboards/pablojimenezmateo/classic48/config.h
 create mode 100644 keyboards/pablojimenezmateo/classic48/keyboard.json
 create mode 100644 keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
 create mode 100644 keyboards/pablojimenezmateo/classic48/readme.md
 create mode 100644 keyboards/pablojimenezmateo/classic48/rules.mk

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index db62bce419c..6d00d8f7d2a 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -879,6 +879,9 @@
     "christmas_tree": {
         "target": "maple_computing/christmas_tree"
     },
+    "classic48": {
+        "target": "pablojimenezmateo/classic48"
+    },
     "claw44/rev1": {
         "target": "dailycraft/claw44/rev1"
     },
diff --git a/keyboards/pablojimenezmateo/classic48/config.h b/keyboards/pablojimenezmateo/classic48/config.h
new file mode 100644
index 00000000000..5ecbe795b6a
--- /dev/null
+++ b/keyboards/pablojimenezmateo/classic48/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2024 Pablo Jiménez Mateo (@pablojimenezmateo)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#define EE_HANDS
+#define MK_KINETIC_SPEED
+#define MOUSEKEY_INITIAL_SPEED 200
+#define MOUSEKEY_WHEEL_INITIAL_MOVEMENTS 2
+#define MOUSEKEY_WHEEL_BASE_MOVEMENTS 16
\ No newline at end of file
diff --git a/keyboards/pablojimenezmateo/classic48/keyboard.json b/keyboards/pablojimenezmateo/classic48/keyboard.json
new file mode 100644
index 00000000000..878e055255f
--- /dev/null
+++ b/keyboards/pablojimenezmateo/classic48/keyboard.json
@@ -0,0 +1,169 @@
+{
+    "manufacturer": "Pablo Jimenez Mateo",
+    "keyboard_name": "classic48",
+    "maintainer": "pablojimenezmateo",
+    "development_board": "promicro_rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP23", "GP21", "GP16", "GP15", "GP14", "GP13"],
+        "rows": ["GP27", "GP26", "GP22", "GP20"]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "split": {
+        "enabled": true,
+        "serial": {
+          "driver": "vendor",
+          "pin": "GP28"
+        },
+        "transport":{
+            "sync": {
+                "layer_state": true
+            }
+        }
+      },
+    "tapping": {
+        "term": 200
+    },
+    "ws2812": {
+        "pin": "GP29",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 20, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 40, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 60, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 80, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 100, "y": 0},
+
+            
+            {"flags": 4, "matrix": [4, 0], "x": 240, "y": 0},
+            {"flags": 4, "matrix": [4, 1], "x": 220, "y": 0},
+            {"flags": 4, "matrix": [4, 2], "x": 200, "y": 0},
+            {"flags": 4, "matrix": [4, 3], "x": 180, "y": 0},
+            {"flags": 4, "matrix": [4, 4], "x": 160, "y": 0},
+            {"flags": 4, "matrix": [4, 5], "x": 140, "y": 0},
+            
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 20},
+            {"flags": 4, "matrix": [1, 1], "x": 20, "y": 20},
+            {"flags": 4, "matrix": [1, 2], "x": 40, "y": 20},
+            {"flags": 4, "matrix": [1, 3], "x": 60, "y": 20},
+            {"flags": 4, "matrix": [1, 4], "x": 80, "y": 20},
+            {"flags": 4, "matrix": [1, 5], "x": 100, "y": 20},
+            
+            {"flags": 4, "matrix": [5, 0], "x": 240, "y": 20},
+            {"flags": 4, "matrix": [5, 1], "x": 220, "y": 20},
+            {"flags": 4, "matrix": [5, 2], "x": 200, "y": 20},
+            {"flags": 4, "matrix": [5, 3], "x": 180, "y": 20},
+            {"flags": 4, "matrix": [5, 4], "x": 160, "y": 20},
+            {"flags": 4, "matrix": [5, 5], "x": 140, "y": 20},
+
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 40},
+            {"flags": 4, "matrix": [2, 1], "x": 20, "y": 40},
+            {"flags": 4, "matrix": [2, 2], "x": 40, "y": 40},
+            {"flags": 4, "matrix": [2, 3], "x": 60, "y": 40},
+            {"flags": 4, "matrix": [2, 4], "x": 80, "y": 40},
+            {"flags": 4, "matrix": [2, 5], "x": 100, "y": 40},
+
+            {"flags": 4, "matrix": [6, 0], "x": 240, "y": 40},
+            {"flags": 4, "matrix": [6, 1], "x": 220, "y": 40},
+            {"flags": 4, "matrix": [6, 2], "x": 200, "y": 40},
+            {"flags": 4, "matrix": [6, 3], "x": 180, "y": 40},
+            {"flags": 4, "matrix": [6, 4], "x": 160, "y": 40},
+            {"flags": 4, "matrix": [6, 5], "x": 140, "y": 40},
+
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 60},
+            {"flags": 4, "matrix": [3, 1], "x": 20, "y": 60},
+            {"flags": 4, "matrix": [3, 2], "x": 40, "y": 60},
+            {"flags": 4, "matrix": [3, 3], "x": 60, "y": 60},
+            {"flags": 4, "matrix": [3, 4], "x": 80, "y": 60},
+            {"flags": 4, "matrix": [3, 5], "x": 100, "y": 60},
+
+            {"flags": 4, "matrix": [7, 0], "x": 240, "y": 60},
+            {"flags": 4, "matrix": [7, 1], "x": 220, "y": 60},
+            {"flags": 4, "matrix": [7, 2], "x": 200, "y": 60},
+            {"flags": 4, "matrix": [7, 3], "x": 180, "y": 60},
+            {"flags": 4, "matrix": [7, 4], "x": 160, "y": 60},
+            {"flags": 4, "matrix": [7, 5], "x": 140, "y": 60}
+        ],
+        "max_brightness": 200
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [4, 5], "x": 7, "y": 0},
+                {"matrix": [4, 4], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 5], "x": 7, "y": 1},
+                {"matrix": [5, 4], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 5], "x": 7, "y": 2},
+                {"matrix": [6, 4], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 0], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 5], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
new file mode 100644
index 00000000000..23356d14786
--- /dev/null
+++ b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
@@ -0,0 +1,188 @@
+/* Copyright 2024 Pablo Jiménez Mateo (@pablojimenezmateo)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Spanish
+#define ES_ACUT KC_QUOT
+#define ES_NTIL KC_SCLN
+#define ES_SLSH S(KC_7)
+#define ES_PIPE ALGR(KC_1)
+#define ES_AT ALGR(KC_2)
+#define ES_LCBR ALGR(KC_QUOT)
+#define ES_RCBR ALGR(KC_NUHS)
+#define ES_CIRC S(KC_LBRC)
+#define ES_IEXL KC_EQL
+#define ES_LPRN S(KC_8)
+#define ES_RPRN S(KC_9)
+#define ES_HASH ALGR(KC_3)
+#define ES_LBRC ALGR(KC_LBRC)
+#define ES_RBRC ALGR(KC_RBRC)
+#define ES_TILD ALGR(KC_4)
+#define ES_APOS KC_MINS
+#define ES_DQUO S(KC_2)
+#define ES_EQL S(KC_0)
+#define ES_AMPR S(KC_6)
+#define ES_ASTR S(KC_RBRC)
+#define ES_GRV KC_LBRC
+#define ES_IQUE S(KC_EQL)
+#define ES_QUES S(KC_MINS)
+#define ES_COLN S(KC_DOT)
+#define ES_SCLN S(KC_COMM)
+#define ES_PLUS KC_RBRC
+#define ES_LESS KC_NUBS
+#define ES_GRTR S(KC_NUBS)
+#define ES_MINS KC_SLSH
+#define ES_UNDS S(KC_SLSH)
+#define ES_BSLS ALGR(KC_GRV)
+
+#define LED_ROWS_PER_HALF 4
+#define LED_COLS_PER_HALF 6
+#define LED_COLS  (LED_COLS_PER_HALF * 2)
+#define LED_TOTAL 48
+
+enum layer_names {
+    _MAIN = 0,
+    _NUMBERS,
+    _SYMBOLS,
+    _NAVIGATION,
+    _GAMING,
+    _GAMING_NUM
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAIN] = LAYOUT(
+        KC_NO,      KC_Q,       KC_W,                KC_E,               KC_R,               KC_T,                KC_Y,            KC_U,               KC_I,               KC_O,               KC_P,    KC_NO,
+        KC_TAB,     KC_A,       MT(MOD_LSFT,  KC_S), MT(MOD_LALT, KC_D), MT(MOD_LCTL, KC_F), KC_G,                KC_H,            MT(MOD_RCTL, KC_J), MT(MOD_LALT, KC_K), MT(MOD_RSFT, KC_L), ES_NTIL, ES_ACUT,
+        KC_ESCAPE,  KC_Z,       KC_X,                KC_C,               KC_V,               KC_B,                KC_N,            KC_M,               KC_COMMA,           KC_DOT,             ES_SLSH, KC_NO,
+        LCTL(KC_X), LCTL(KC_C), LCTL(KC_V),          KC_NO,              MO(1),              LT(3, KC_SPC),       LT(2, KC_ENTER), KC_LSFT,            KC_NO,              KC_LEFT_GUI,        KC_NO,   LCTL(KC_F)
+    ),
+    [_NUMBERS] = LAYOUT(
+        KC_NO, KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_NO,       KC_NO, KC_7,  KC_8,  KC_9,  KC_NO, KC_NO,
+        KC_NO, KC_F5, KC_F6,  KC_F7,  KC_F8,  KC_NO,       KC_NO, KC_4,  KC_5,  KC_6,  KC_NO, KC_NO,
+        KC_NO, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO,       KC_NO, KC_1,  KC_2,  KC_3,  KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,       KC_0,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+    ),
+    [_SYMBOLS] = LAYOUT(
+        KC_NO, ES_PIPE, ES_AT,   ES_LCBR, ES_RCBR, ES_CIRC,       ES_APOS, ES_DQUO, ES_EQL,  ES_AMPR, ES_ASTR, ES_GRV,
+        KC_NO, ES_IEXL, KC_EXLM, ES_LPRN, ES_RPRN, KC_DLR,        ES_IQUE, ES_QUES, ES_SLSH, ES_COLN, ES_SCLN, ES_PLUS,
+        KC_NO, ES_HASH, KC_PERC, ES_LBRC, ES_RBRC, ES_TILD,       ES_LESS, ES_GRTR, ES_MINS, ES_UNDS, ES_BSLS, KC_PSCR,
+        KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_BSPC,       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT
+    ),
+    [_NAVIGATION] = LAYOUT(
+        TG(_GAMING), KC_NO,      MS_BTN4,    MS_UP,   MS_BTN5, KC_NO,             LSFT(KC_LEFT), LALT(KC_DOWN), LALT(KC_UP),   LSFT(KC_RGHT), KC_NO,  KC_VOLU,
+        KC_NO,       QK_LLCK,    MS_LEFT,    MS_DOWN, MS_RGHT, KC_LEFT_CTRL,      KC_HOME,       MS_BTN1,       MS_BTN3,       MS_BTN2,       KC_END, KC_VOLD,
+        KC_NO,       KC_NO,      KC_NO,      KC_NO,   KC_NO,   KC_NO,             KC_LEFT,       KC_DOWN,       KC_UP,         KC_RGHT,       KC_NO,  KC_BRIU,
+        LCTL(KC_X),  LCTL(KC_C), LCTL(KC_V), KC_NO,   KC_NO,   KC_NO,             MS_WHLD,       MS_WHLU,       KC_NO,         KC_NO,         KC_NO,  KC_BRID
+    ),
+    [_GAMING] = LAYOUT(
+        KC_TAB,       KC_Q,  KC_W,  KC_E,          KC_R,   KC_T,                   KC_Y,  KC_U, KC_I,     KC_O,   KC_P,    ES_ACUT,
+        KC_LEFT_CTRL, KC_A,  KC_S,  KC_D,          KC_F,   KC_G,                   KC_H,  KC_J, KC_K,     KC_L,   ES_NTIL, KC_NO,
+        KC_ESCAPE,    KC_Z,  KC_X,  KC_C,          KC_V,   KC_B,                   KC_N,  KC_M, KC_COMMA, KC_DOT, ES_SLSH, KC_NO,
+        TG(_GAMING),  KC_NO, KC_NO, KC_LEFT_SHIFT, KC_SPC, MO(_GAMING_NUM),        KC_NO, KC_1, KC_2,     KC_3,   KC_4,    KC_5
+    ),
+    [_GAMING_NUM] = LAYOUT(
+        KC_TAB,        KC_1,  KC_2,  KC_3,          KC_4,   KC_5,         KC_Y,  KC_U,  KC_I,     KC_O,   KC_P,    ES_ACUT,
+        KC_LEFT_CTRL,  KC_A,  KC_S,  KC_D,          KC_F,   KC_G,         KC_H,  KC_J,  KC_K,     KC_L,   ES_NTIL, KC_NO,
+        KC_ESCAPE,     KC_Z,  KC_X,  KC_C,          KC_V,   KC_B,         KC_N,  KC_M,  KC_COMMA, KC_DOT, ES_SLSH, KC_NO,
+        TG(4),         KC_NO, KC_NO, KC_LEFT_SHIFT, KC_SPC, KC_NO,        KC_NO, KC_NO, KC_NO,    KC_NO,  KC_NO,   KC_NO
+    ),
+};
+
+// In RGB
+const uint8_t PROGMEM ledmap[][LED_TOTAL][3] = {
+    [_MAIN] = { 
+        {255,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,0},
+        {255,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,0},
+        {255,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,0},
+        {255,255,0}, {255,255,0},   {255,255,0},   {255,255,0},   {255,255,0},   {255,255,0},        {255,255,0}, {255,255,0}, {255,255,0}, {255,255,0}, {255,255,0}, {255,255,0}, 
+    },
+    [_NUMBERS] = { 
+        {0,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,0,255},
+        {0,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,0,255},
+        {0,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,0,255},
+        {0,0,255}, {0,0,255},     {0,0,255},     {0,0,255},     {0,0,255},     {0,0,255},          {0,0,255},     {0,0,255},     {0,0,255},     {0,0,255},     {0,0,255},     {0,0,255}, 
+    },
+    [_SYMBOLS] = { 
+        {255,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,255},
+        {255,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,255},
+        {255,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,255},
+        {255,0,255}, {255,0,255},   {255,0,255},   {255,0,255},   {255,0,255},   {255,0,255},        {255,0,255},   {255,0,255},   {255,0,255},   {255,0,255},   {255,0,255},   {255,0,255}, 
+    },
+    [_NAVIGATION] = { 
+        {0,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,255,0},
+        {0,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,255,0},
+        {0,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,255,0},
+        {0,255,0}, {0,255,0},     {0,255,0},     {0,255,0},     {0,255,0},     {0,255,0},          {0,255,0},     {0,255,0},     {0,255,0},     {0,255,0},     {0,255,0},     {0,255,0},
+    },
+    [_GAMING] = { 
+        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
+        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
+        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
+        {255,0,0}, {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},          {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},
+    },
+    [_GAMING_NUM] = { 
+        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
+        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
+        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
+        {255,0,0}, {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},          {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},
+    },
+};
+
+// We use this to get the correct values from the ledmap
+// depending on the half we are on
+uint8_t index_offset;
+
+void keyboard_post_init_user(void) {
+    bool is_left = eeconfig_read_handedness();
+
+    if (is_left) {
+        index_offset = 0;
+    } else {
+        index_offset = LED_COLS_PER_HALF;
+    }
+}
+
+// So we can keep the ledmap with a "visual" representation
+// each half uses indexes from 0-23, we cannot use 0-47
+const uint8_t PROGMEM physical_index[LED_TOTAL] = {
+    0,  1,  2,  3,  4,  5,       5,  4,  3,  2,  1,  0, 
+    11, 10, 9,  8,  7,  6,       6,  7,  8,  9,  10, 11, 
+    12, 13, 14, 15, 16, 17,      17, 16, 15, 14, 13, 12, 
+    23, 22, 21, 20, 19, 18,      18, 19, 20, 21, 22, 23,
+};
+
+
+// This is run in each half per cycle
+bool rgb_matrix_indicators_user(void) {
+    uint8_t layer = get_highest_layer(layer_state);
+
+    for (uint8_t row = 0; row < LED_ROWS_PER_HALF; row++) {
+        for (uint8_t col = 0; col < LED_COLS_PER_HALF; col++) {
+
+            uint8_t linear_index = row * LED_COLS + col + index_offset;
+            uint8_t index = pgm_read_byte(&physical_index[linear_index]);
+
+            uint8_t r = pgm_read_byte(&ledmap[layer][linear_index][0]);
+            uint8_t g = pgm_read_byte(&ledmap[layer][linear_index][1]);
+            uint8_t b = pgm_read_byte(&ledmap[layer][linear_index][2]);
+
+            rgb_matrix_set_color(index, r, g, b);
+        }
+    }
+
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/pablojimenezmateo/classic48/readme.md b/keyboards/pablojimenezmateo/classic48/readme.md
new file mode 100644
index 00000000000..ae69538bc9c
--- /dev/null
+++ b/keyboards/pablojimenezmateo/classic48/readme.md
@@ -0,0 +1,28 @@
+# pablojimenezmateo/classic48
+
+![pablojimenezmateo/classic48](https://i.imgur.com/czFWWhX.jpeg)
+
+A custom split keyboard with 48 keys and addressable LEDs. The config allows you to set the color of each individual LED easily.
+
+* Keyboard Maintainer: [Pablo Jimenez Mateo](https://github.com/pablojimenezmateo)
+* Hardware Supported: RP2040 Pro Micro
+* Hardware Availability: https://github.com/pablojimenezmateo/classic48
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pablojimenezmateo/classic48:default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb pablojimenezmateo/classic48 -km default -bl uf2-split-left
+    qmk flash -kb pablojimenezmateo/classic48 -km default -bl uf2-split-right
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/pablojimenezmateo/classic48/rules.mk b/keyboards/pablojimenezmateo/classic48/rules.mk
new file mode 100644
index 00000000000..79948cbf5ea
--- /dev/null
+++ b/keyboards/pablojimenezmateo/classic48/rules.mk
@@ -0,0 +1 @@
+LAYER_LOCK_ENABLE = yes
\ No newline at end of file

From b99b16ea0a40e0d01a507cc8c3f1902a68528a2d Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Mon, 14 Jul 2025 16:39:49 +0200
Subject: [PATCH 02/13] chore: remove unused layer

---
 .../classic48/keymaps/default/keymap.c          | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
index 23356d14786..bbcb52f728d 100644
--- a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
+++ b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
@@ -59,8 +59,7 @@ enum layer_names {
     _NUMBERS,
     _SYMBOLS,
     _NAVIGATION,
-    _GAMING,
-    _GAMING_NUM
+    _GAMING
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -93,13 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LEFT_CTRL, KC_A,  KC_S,  KC_D,          KC_F,   KC_G,                   KC_H,  KC_J, KC_K,     KC_L,   ES_NTIL, KC_NO,
         KC_ESCAPE,    KC_Z,  KC_X,  KC_C,          KC_V,   KC_B,                   KC_N,  KC_M, KC_COMMA, KC_DOT, ES_SLSH, KC_NO,
         TG(_GAMING),  KC_NO, KC_NO, KC_LEFT_SHIFT, KC_SPC, MO(_GAMING_NUM),        KC_NO, KC_1, KC_2,     KC_3,   KC_4,    KC_5
-    ),
-    [_GAMING_NUM] = LAYOUT(
-        KC_TAB,        KC_1,  KC_2,  KC_3,          KC_4,   KC_5,         KC_Y,  KC_U,  KC_I,     KC_O,   KC_P,    ES_ACUT,
-        KC_LEFT_CTRL,  KC_A,  KC_S,  KC_D,          KC_F,   KC_G,         KC_H,  KC_J,  KC_K,     KC_L,   ES_NTIL, KC_NO,
-        KC_ESCAPE,     KC_Z,  KC_X,  KC_C,          KC_V,   KC_B,         KC_N,  KC_M,  KC_COMMA, KC_DOT, ES_SLSH, KC_NO,
-        TG(4),         KC_NO, KC_NO, KC_LEFT_SHIFT, KC_SPC, KC_NO,        KC_NO, KC_NO, KC_NO,    KC_NO,  KC_NO,   KC_NO
-    ),
+    )
 };
 
 // In RGB
@@ -134,12 +127,6 @@ const uint8_t PROGMEM ledmap[][LED_TOTAL][3] = {
         {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
         {255,0,0}, {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},          {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},
     },
-    [_GAMING_NUM] = { 
-        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
-        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
-        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
-        {255,0,0}, {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},          {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},
-    },
 };
 
 // We use this to get the correct values from the ledmap

From e2960bf78bca3bb6e4da62992dca31cfa1a82543 Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Mon, 14 Jul 2025 16:44:47 +0200
Subject: [PATCH 03/13] chore: improve comments

---
 .../pablojimenezmateo/classic48/keyboard.json      |  2 +-
 .../classic48/keymaps/default/keymap.c             | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/keyboards/pablojimenezmateo/classic48/keyboard.json b/keyboards/pablojimenezmateo/classic48/keyboard.json
index 878e055255f..89a262b6818 100644
--- a/keyboards/pablojimenezmateo/classic48/keyboard.json
+++ b/keyboards/pablojimenezmateo/classic48/keyboard.json
@@ -1,5 +1,5 @@
 {
-    "manufacturer": "Pablo Jimenez Mateo",
+    "manufacturer": "Pablo Jiménez Mateo",
     "keyboard_name": "classic48",
     "maintainer": "pablojimenezmateo",
     "development_board": "promicro_rp2040",
diff --git a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
index bbcb52f728d..a03cb04154c 100644
--- a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
+++ b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 
 #include QMK_KEYBOARD_H
 
-// Spanish
+/* These are some Spanish specific keys */
 #define ES_ACUT KC_QUOT
 #define ES_NTIL KC_SCLN
 #define ES_SLSH S(KC_7)
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
-// In RGB
+/* These values are in RGB */
 const uint8_t PROGMEM ledmap[][LED_TOTAL][3] = {
     [_MAIN] = { 
         {255,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,0},
@@ -129,8 +129,7 @@ const uint8_t PROGMEM ledmap[][LED_TOTAL][3] = {
     },
 };
 
-// We use this to get the correct values from the ledmap
-// depending on the half we are on
+/* We use this to get the correct values from the ledmap depending on the half we are on */
 uint8_t index_offset;
 
 void keyboard_post_init_user(void) {
@@ -143,8 +142,9 @@ void keyboard_post_init_user(void) {
     }
 }
 
-// So we can keep the ledmap with a "visual" representation
-// each half uses indexes from 0-23, we cannot use 0-47
+/* We use this so we can keep the ledmap with a "visual"
+representation (each half uses indexes from 0-23, we cannot use 0-47)
+*/
 const uint8_t PROGMEM physical_index[LED_TOTAL] = {
     0,  1,  2,  3,  4,  5,       5,  4,  3,  2,  1,  0, 
     11, 10, 9,  8,  7,  6,       6,  7,  8,  9,  10, 11, 
@@ -153,7 +153,7 @@ const uint8_t PROGMEM physical_index[LED_TOTAL] = {
 };
 
 
-// This is run in each half per cycle
+/* This is run in each half per cycle */
 bool rgb_matrix_indicators_user(void) {
     uint8_t layer = get_highest_layer(layer_state);
 

From 481f1542ab800317657a0492e8d046d746a0f1c4 Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Mon, 14 Jul 2025 16:51:58 +0200
Subject: [PATCH 04/13] feat: add URL

---
 keyboards/pablojimenezmateo/classic48/keyboard.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/pablojimenezmateo/classic48/keyboard.json b/keyboards/pablojimenezmateo/classic48/keyboard.json
index 89a262b6818..a58e1e9e87b 100644
--- a/keyboards/pablojimenezmateo/classic48/keyboard.json
+++ b/keyboards/pablojimenezmateo/classic48/keyboard.json
@@ -18,7 +18,7 @@
         "cols": ["GP23", "GP21", "GP16", "GP15", "GP14", "GP13"],
         "rows": ["GP27", "GP26", "GP22", "GP20"]
     },
-    "url": "",
+    "url": "https://github.com/pablojimenezmateo/classic48",
     "usb": {
         "device_version": "1.0.0",
         "pid": "0x0000",

From 748ddb4f9f3babe6cc970b75da9bb899d29b4752 Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Mon, 14 Jul 2025 16:52:12 +0200
Subject: [PATCH 05/13] fix: remove old layer reference

---
 .../pablojimenezmateo/classic48/keymaps/default/keymap.c  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
index a03cb04154c..d3b52d586ef 100644
--- a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
+++ b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
@@ -88,10 +88,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LCTL(KC_X),  LCTL(KC_C), LCTL(KC_V), KC_NO,   KC_NO,   KC_NO,             MS_WHLD,       MS_WHLU,       KC_NO,         KC_NO,         KC_NO,  KC_BRID
     ),
     [_GAMING] = LAYOUT(
-        KC_TAB,       KC_Q,  KC_W,  KC_E,          KC_R,   KC_T,                   KC_Y,  KC_U, KC_I,     KC_O,   KC_P,    ES_ACUT,
-        KC_LEFT_CTRL, KC_A,  KC_S,  KC_D,          KC_F,   KC_G,                   KC_H,  KC_J, KC_K,     KC_L,   ES_NTIL, KC_NO,
-        KC_ESCAPE,    KC_Z,  KC_X,  KC_C,          KC_V,   KC_B,                   KC_N,  KC_M, KC_COMMA, KC_DOT, ES_SLSH, KC_NO,
-        TG(_GAMING),  KC_NO, KC_NO, KC_LEFT_SHIFT, KC_SPC, MO(_GAMING_NUM),        KC_NO, KC_1, KC_2,     KC_3,   KC_4,    KC_5
+        KC_TAB,       KC_Q,  KC_W,  KC_E,          KC_R,   KC_T,         KC_Y,  KC_U, KC_I,     KC_O,   KC_P,    ES_ACUT,
+        KC_LEFT_CTRL, KC_A,  KC_S,  KC_D,          KC_F,   KC_G,         KC_H,  KC_J, KC_K,     KC_L,   ES_NTIL, KC_NO,
+        KC_ESCAPE,    KC_Z,  KC_X,  KC_C,          KC_V,   KC_B,         KC_N,  KC_M, KC_COMMA, KC_DOT, ES_SLSH, KC_NO,
+        TG(_GAMING),  KC_NO, KC_NO, KC_LEFT_SHIFT, KC_SPC, KC_NO,        KC_NO, KC_1, KC_2,     KC_3,   KC_4,    KC_5
     )
 };
 

From 49b48d65a4881b4f9a1af9be608c6469ba79c6e1 Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Mon, 14 Jul 2025 17:06:00 +0200
Subject: [PATCH 06/13] chore: remove classic48 from aliases

---
 data/mappings/keyboard_aliases.hjson | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 6d00d8f7d2a..db62bce419c 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -879,9 +879,6 @@
     "christmas_tree": {
         "target": "maple_computing/christmas_tree"
     },
-    "classic48": {
-        "target": "pablojimenezmateo/classic48"
-    },
     "claw44/rev1": {
         "target": "dailycraft/claw44/rev1"
     },

From deb1892c026c1c045101fe5954da25492dbf6709 Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Mon, 14 Jul 2025 17:07:36 +0200
Subject: [PATCH 07/13] chore: address PR comment regarding config.h

---
 keyboards/pablojimenezmateo/classic48/config.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/pablojimenezmateo/classic48/config.h b/keyboards/pablojimenezmateo/classic48/config.h
index 5ecbe795b6a..d97fed1c379 100644
--- a/keyboards/pablojimenezmateo/classic48/config.h
+++ b/keyboards/pablojimenezmateo/classic48/config.h
@@ -13,7 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
+
 #define EE_HANDS
+
 #define MK_KINETIC_SPEED
 #define MOUSEKEY_INITIAL_SPEED 200
 #define MOUSEKEY_WHEEL_INITIAL_MOVEMENTS 2

From 502ca2d19b06a624756bcbbe3d2ad63f77d3e1e0 Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Mon, 14 Jul 2025 17:08:53 +0200
Subject: [PATCH 08/13] chore: address PR comment, remove default tapping term

---
 keyboards/pablojimenezmateo/classic48/keyboard.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/keyboards/pablojimenezmateo/classic48/keyboard.json b/keyboards/pablojimenezmateo/classic48/keyboard.json
index a58e1e9e87b..af1cd93adb8 100644
--- a/keyboards/pablojimenezmateo/classic48/keyboard.json
+++ b/keyboards/pablojimenezmateo/classic48/keyboard.json
@@ -36,9 +36,6 @@
             }
         }
       },
-    "tapping": {
-        "term": 200
-    },
     "ws2812": {
         "pin": "GP29",
         "driver": "vendor"

From 3eba482546f188921a4158b74d947c6fde62331d Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Mon, 14 Jul 2025 17:14:14 +0200
Subject: [PATCH 09/13] chore: address PR comment

---
 keyboards/pablojimenezmateo/classic48/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/pablojimenezmateo/classic48/readme.md b/keyboards/pablojimenezmateo/classic48/readme.md
index ae69538bc9c..ff3dd072c55 100644
--- a/keyboards/pablojimenezmateo/classic48/readme.md
+++ b/keyboards/pablojimenezmateo/classic48/readme.md
@@ -2,7 +2,7 @@
 
 ![pablojimenezmateo/classic48](https://i.imgur.com/czFWWhX.jpeg)
 
-A custom split keyboard with 48 keys and addressable LEDs. The config allows you to set the color of each individual LED easily.
+A custom split keyboard with 48 keys and addressable LEDs.
 
 * Keyboard Maintainer: [Pablo Jimenez Mateo](https://github.com/pablojimenezmateo)
 * Hardware Supported: RP2040 Pro Micro

From 22fa37838d61c48733e8ef42a167d4b5282cda85 Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Tue, 15 Jul 2025 08:46:46 +0200
Subject: [PATCH 10/13] feat: move rules.mk to keymak level

---
 .../pablojimenezmateo/classic48/{ => keymaps/default}/rules.mk    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename keyboards/pablojimenezmateo/classic48/{ => keymaps/default}/rules.mk (100%)

diff --git a/keyboards/pablojimenezmateo/classic48/rules.mk b/keyboards/pablojimenezmateo/classic48/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/pablojimenezmateo/classic48/rules.mk
rename to keyboards/pablojimenezmateo/classic48/keymaps/default/rules.mk

From 1006c0da097d9f595fc80e33079d7fcf1fe9ed96 Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Tue, 15 Jul 2025 09:06:29 +0200
Subject: [PATCH 11/13] chore: simplify default keyboard

---
 .../pablojimenezmateo/classic48/config.h      |   2 +-
 .../pablojimenezmateo/classic48/keyboard.json |   6 +-
 .../classic48/keymaps/default/keymap.c        | 175 ++++--------------
 .../classic48/keymaps/default/rules.mk        |   1 -
 4 files changed, 40 insertions(+), 144 deletions(-)
 delete mode 100644 keyboards/pablojimenezmateo/classic48/keymaps/default/rules.mk

diff --git a/keyboards/pablojimenezmateo/classic48/config.h b/keyboards/pablojimenezmateo/classic48/config.h
index d97fed1c379..1e42e63744d 100644
--- a/keyboards/pablojimenezmateo/classic48/config.h
+++ b/keyboards/pablojimenezmateo/classic48/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2024 Pablo Jiménez Mateo (@pablojimenezmateo)
+/* Copyright 2025 Pablo Jiménez Mateo (@pablojimenezmateo)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/pablojimenezmateo/classic48/keyboard.json b/keyboards/pablojimenezmateo/classic48/keyboard.json
index af1cd93adb8..44df21359d8 100644
--- a/keyboards/pablojimenezmateo/classic48/keyboard.json
+++ b/keyboards/pablojimenezmateo/classic48/keyboard.json
@@ -5,13 +5,9 @@
     "development_board": "promicro_rp2040",
     "diode_direction": "COL2ROW",
     "features": {
-        "bootmagic": false,
-        "command": false,
-        "console": false,
+        "bootmagic": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false,
-        "rgblight": false,
         "rgb_matrix": true
     },
     "matrix_pins": {
diff --git a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
index d3b52d586ef..94c144219b4 100644
--- a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
+++ b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2024 Pablo Jiménez Mateo (@pablojimenezmateo)
+/* Copyright 2025 Pablo Jiménez Mateo (@pablojimenezmateo)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,162 +14,63 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
-
-/* These are some Spanish specific keys */
-#define ES_ACUT KC_QUOT
-#define ES_NTIL KC_SCLN
-#define ES_SLSH S(KC_7)
-#define ES_PIPE ALGR(KC_1)
-#define ES_AT ALGR(KC_2)
-#define ES_LCBR ALGR(KC_QUOT)
-#define ES_RCBR ALGR(KC_NUHS)
-#define ES_CIRC S(KC_LBRC)
-#define ES_IEXL KC_EQL
-#define ES_LPRN S(KC_8)
-#define ES_RPRN S(KC_9)
-#define ES_HASH ALGR(KC_3)
-#define ES_LBRC ALGR(KC_LBRC)
-#define ES_RBRC ALGR(KC_RBRC)
-#define ES_TILD ALGR(KC_4)
-#define ES_APOS KC_MINS
-#define ES_DQUO S(KC_2)
-#define ES_EQL S(KC_0)
-#define ES_AMPR S(KC_6)
-#define ES_ASTR S(KC_RBRC)
-#define ES_GRV KC_LBRC
-#define ES_IQUE S(KC_EQL)
-#define ES_QUES S(KC_MINS)
-#define ES_COLN S(KC_DOT)
-#define ES_SCLN S(KC_COMM)
-#define ES_PLUS KC_RBRC
-#define ES_LESS KC_NUBS
-#define ES_GRTR S(KC_NUBS)
-#define ES_MINS KC_SLSH
-#define ES_UNDS S(KC_SLSH)
-#define ES_BSLS ALGR(KC_GRV)
-
-#define LED_ROWS_PER_HALF 4
-#define LED_COLS_PER_HALF 6
-#define LED_COLS  (LED_COLS_PER_HALF * 2)
-#define LED_TOTAL 48
+ #include QMK_KEYBOARD_H
 
 enum layer_names {
-    _MAIN = 0,
+    _MAIN,
     _NUMBERS,
     _SYMBOLS,
-    _NAVIGATION,
-    _GAMING
+    _NAVIGATION
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAIN] = LAYOUT(
-        KC_NO,      KC_Q,       KC_W,                KC_E,               KC_R,               KC_T,                KC_Y,            KC_U,               KC_I,               KC_O,               KC_P,    KC_NO,
-        KC_TAB,     KC_A,       MT(MOD_LSFT,  KC_S), MT(MOD_LALT, KC_D), MT(MOD_LCTL, KC_F), KC_G,                KC_H,            MT(MOD_RCTL, KC_J), MT(MOD_LALT, KC_K), MT(MOD_RSFT, KC_L), ES_NTIL, ES_ACUT,
-        KC_ESCAPE,  KC_Z,       KC_X,                KC_C,               KC_V,               KC_B,                KC_N,            KC_M,               KC_COMMA,           KC_DOT,             ES_SLSH, KC_NO,
-        LCTL(KC_X), LCTL(KC_C), LCTL(KC_V),          KC_NO,              MO(1),              LT(3, KC_SPC),       LT(2, KC_ENTER), KC_LSFT,            KC_NO,              KC_LEFT_GUI,        KC_NO,   LCTL(KC_F)
+        KC_NO,      KC_Q,       KC_W,       KC_E,  KC_R,         KC_T,               KC_Y,            KC_U,    KC_I,    KC_O,    KC_P,    KC_NO,
+        KC_TAB,     KC_A,       KC_S,       KC_D,  KC_F,         KC_G,               KC_H,            KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_ESCAPE,  KC_Z,       KC_X,       KC_C,  KC_V,         KC_B,               KC_N,            KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO,
+        LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_NO, MO(_NUMBERS), LT(3, KC_SPC),      LT(2, KC_ENTER), KC_LSFT, KC_NO,   KC_LGUI, KC_NO,   LCTL(KC_F)
     ),
     [_NUMBERS] = LAYOUT(
-        KC_NO, KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_NO,       KC_NO, KC_7,  KC_8,  KC_9,  KC_NO, KC_NO,
-        KC_NO, KC_F5, KC_F6,  KC_F7,  KC_F8,  KC_NO,       KC_NO, KC_4,  KC_5,  KC_6,  KC_NO, KC_NO,
-        KC_NO, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO,       KC_NO, KC_1,  KC_2,  KC_3,  KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,       KC_0,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+        KC_NO, KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_NO,      KC_NO, KC_7,  KC_8,  KC_9,  KC_NO, KC_NO,
+        KC_NO, KC_F5, KC_F6,  KC_F7,  KC_F8,  KC_NO,      KC_NO, KC_4,  KC_5,  KC_6,  KC_NO, KC_NO,
+        KC_NO, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO,      KC_NO, KC_1,  KC_2,  KC_3,  KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,      KC_0,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
     ),
     [_SYMBOLS] = LAYOUT(
-        KC_NO, ES_PIPE, ES_AT,   ES_LCBR, ES_RCBR, ES_CIRC,       ES_APOS, ES_DQUO, ES_EQL,  ES_AMPR, ES_ASTR, ES_GRV,
-        KC_NO, ES_IEXL, KC_EXLM, ES_LPRN, ES_RPRN, KC_DLR,        ES_IQUE, ES_QUES, ES_SLSH, ES_COLN, ES_SCLN, ES_PLUS,
-        KC_NO, ES_HASH, KC_PERC, ES_LBRC, ES_RBRC, ES_TILD,       ES_LESS, ES_GRTR, ES_MINS, ES_UNDS, ES_BSLS, KC_PSCR,
-        KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_BSPC,       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT
+        KC_NO, KC_PIPE, KC_AT,   KC_LCBR, KC_RCBR, KC_CIRC,      KC_QUOT, KC_DQUO, KC_EQL,  KC_AMPR, KC_ASTR, KC_GRV,
+        KC_NO, KC_EXLM, KC_EXLM, KC_LPRN, KC_RPRN, KC_DLR,       KC_EXLM, KC_QUES, KC_SLSH, KC_COLN, KC_SCLN, KC_PLUS,
+        KC_NO, KC_HASH, KC_PERC, KC_LBRC, KC_RBRC, KC_TILD,      KC_LT,   KC_GT,   KC_MINS, KC_UNDS, KC_BSLS, KC_PSCR,
+        KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_BSPC,      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT
     ),
     [_NAVIGATION] = LAYOUT(
-        TG(_GAMING), KC_NO,      MS_BTN4,    MS_UP,   MS_BTN5, KC_NO,             LSFT(KC_LEFT), LALT(KC_DOWN), LALT(KC_UP),   LSFT(KC_RGHT), KC_NO,  KC_VOLU,
-        KC_NO,       QK_LLCK,    MS_LEFT,    MS_DOWN, MS_RGHT, KC_LEFT_CTRL,      KC_HOME,       MS_BTN1,       MS_BTN3,       MS_BTN2,       KC_END, KC_VOLD,
+        KC_NO,       KC_NO,      MS_BTN4,    MS_UP,   MS_BTN5, KC_NO,             LSFT(KC_LEFT), LALT(KC_DOWN), LALT(KC_UP),   LSFT(KC_RGHT), KC_NO,  KC_VOLU,
+        KC_NO,       KC_NO,      MS_LEFT,    MS_DOWN, MS_RGHT, KC_LEFT_CTRL,      KC_HOME,       MS_BTN1,       MS_BTN3,       MS_BTN2,       KC_END, KC_VOLD,
         KC_NO,       KC_NO,      KC_NO,      KC_NO,   KC_NO,   KC_NO,             KC_LEFT,       KC_DOWN,       KC_UP,         KC_RGHT,       KC_NO,  KC_BRIU,
         LCTL(KC_X),  LCTL(KC_C), LCTL(KC_V), KC_NO,   KC_NO,   KC_NO,             MS_WHLD,       MS_WHLU,       KC_NO,         KC_NO,         KC_NO,  KC_BRID
     ),
-    [_GAMING] = LAYOUT(
-        KC_TAB,       KC_Q,  KC_W,  KC_E,          KC_R,   KC_T,         KC_Y,  KC_U, KC_I,     KC_O,   KC_P,    ES_ACUT,
-        KC_LEFT_CTRL, KC_A,  KC_S,  KC_D,          KC_F,   KC_G,         KC_H,  KC_J, KC_K,     KC_L,   ES_NTIL, KC_NO,
-        KC_ESCAPE,    KC_Z,  KC_X,  KC_C,          KC_V,   KC_B,         KC_N,  KC_M, KC_COMMA, KC_DOT, ES_SLSH, KC_NO,
-        TG(_GAMING),  KC_NO, KC_NO, KC_LEFT_SHIFT, KC_SPC, KC_NO,        KC_NO, KC_1, KC_2,     KC_3,   KC_4,    KC_5
-    )
 };
 
-/* These values are in RGB */
-const uint8_t PROGMEM ledmap[][LED_TOTAL][3] = {
-    [_MAIN] = { 
-        {255,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,0},
-        {255,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,0},
-        {255,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,0},
-        {255,255,0}, {255,255,0},   {255,255,0},   {255,255,0},   {255,255,0},   {255,255,0},        {255,255,0}, {255,255,0}, {255,255,0}, {255,255,0}, {255,255,0}, {255,255,0}, 
-    },
-    [_NUMBERS] = { 
-        {0,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,0,255},
-        {0,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,0,255},
-        {0,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,0,255},
-        {0,0,255}, {0,0,255},     {0,0,255},     {0,0,255},     {0,0,255},     {0,0,255},          {0,0,255},     {0,0,255},     {0,0,255},     {0,0,255},     {0,0,255},     {0,0,255}, 
-    },
-    [_SYMBOLS] = { 
-        {255,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,255},
-        {255,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,255},
-        {255,0,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,255},
-        {255,0,255}, {255,0,255},   {255,0,255},   {255,0,255},   {255,0,255},   {255,0,255},        {255,0,255},   {255,0,255},   {255,0,255},   {255,0,255},   {255,0,255},   {255,0,255}, 
-    },
-    [_NAVIGATION] = { 
-        {0,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,255,0},
-        {0,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,255,0},
-        {0,255,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {0,255,0},
-        {0,255,0}, {0,255,0},     {0,255,0},     {0,255,0},     {0,255,0},     {0,255,0},          {0,255,0},     {0,255,0},     {0,255,0},     {0,255,0},     {0,255,0},     {0,255,0},
-    },
-    [_GAMING] = { 
-        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
-        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
-        {255,0,0}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255},      {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,255,255}, {255,0,0},
-        {255,0,0}, {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},          {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},     {255,0,0},
-    },
-};
-
-/* We use this to get the correct values from the ledmap depending on the half we are on */
-uint8_t index_offset;
-
 void keyboard_post_init_user(void) {
-    bool is_left = eeconfig_read_handedness();
-
-    if (is_left) {
-        index_offset = 0;
-    } else {
-        index_offset = LED_COLS_PER_HALF;
-    }
+    rgb_matrix_sethsv(50, 255, 255);
 }
 
-/* We use this so we can keep the ledmap with a "visual"
-representation (each half uses indexes from 0-23, we cannot use 0-47)
-*/
-const uint8_t PROGMEM physical_index[LED_TOTAL] = {
-    0,  1,  2,  3,  4,  5,       5,  4,  3,  2,  1,  0, 
-    11, 10, 9,  8,  7,  6,       6,  7,  8,  9,  10, 11, 
-    12, 13, 14, 15, 16, 17,      17, 16, 15, 14, 13, 12, 
-    23, 22, 21, 20, 19, 18,      18, 19, 20, 21, 22, 23,
-};
-
-
-/* This is run in each half per cycle */
-bool rgb_matrix_indicators_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    for (uint8_t row = 0; row < LED_ROWS_PER_HALF; row++) {
-        for (uint8_t col = 0; col < LED_COLS_PER_HALF; col++) {
-
-            uint8_t linear_index = row * LED_COLS + col + index_offset;
-            uint8_t index = pgm_read_byte(&physical_index[linear_index]);
-
-            uint8_t r = pgm_read_byte(&ledmap[layer][linear_index][0]);
-            uint8_t g = pgm_read_byte(&ledmap[layer][linear_index][1]);
-            uint8_t b = pgm_read_byte(&ledmap[layer][linear_index][2]);
-
-            rgb_matrix_set_color(index, r, g, b);
-        }
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        case _MAIN:
+            /* Yellow */
+            rgb_matrix_sethsv(50, 255, 255); break;   
+        case _NUMBERS:
+            /* Cyan */
+            rgb_matrix_sethsv(170, 255, 255); break;
+        case _SYMBOLS:
+            /* Purple */
+            rgb_matrix_sethsv(200, 255, 255); break;
+        case _NAVIGATION:
+            /* Green */
+            rgb_matrix_sethsv(85, 255, 255); break;
+        default:
+            /* Off */
+            rgb_matrix_sethsv(0, 0, 0); break;
     }
-
-    return true;
-}
\ No newline at end of file
+    return state;
+}
diff --git a/keyboards/pablojimenezmateo/classic48/keymaps/default/rules.mk b/keyboards/pablojimenezmateo/classic48/keymaps/default/rules.mk
deleted file mode 100644
index 79948cbf5ea..00000000000
--- a/keyboards/pablojimenezmateo/classic48/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LAYER_LOCK_ENABLE = yes
\ No newline at end of file

From 7b08214b1058a8b580b350f27ce51b153240d642 Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Tue, 15 Jul 2025 22:19:04 +0200
Subject: [PATCH 12/13] chore: add missing newline

---
 keyboards/pablojimenezmateo/classic48/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/pablojimenezmateo/classic48/config.h b/keyboards/pablojimenezmateo/classic48/config.h
index 1e42e63744d..8716f34b750 100644
--- a/keyboards/pablojimenezmateo/classic48/config.h
+++ b/keyboards/pablojimenezmateo/classic48/config.h
@@ -20,4 +20,4 @@
 #define MK_KINETIC_SPEED
 #define MOUSEKEY_INITIAL_SPEED 200
 #define MOUSEKEY_WHEEL_INITIAL_MOVEMENTS 2
-#define MOUSEKEY_WHEEL_BASE_MOVEMENTS 16
\ No newline at end of file
+#define MOUSEKEY_WHEEL_BASE_MOVEMENTS 16

From f962418c824afb93c656bc759d1cc6cc4b7d8ab5 Mon Sep 17 00:00:00 2001
From: Pablo Jimenez Mateo <pablojimenezmateo@gmail.com>
Date: Tue, 15 Jul 2025 22:19:22 +0200
Subject: [PATCH 13/13] feat: add default color in keyboard.json, do not write
 layer changes to eeprom

---
 .../pablojimenezmateo/classic48/keyboard.json      |  7 ++++++-
 .../classic48/keymaps/default/keymap.c             | 14 +++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/keyboards/pablojimenezmateo/classic48/keyboard.json b/keyboards/pablojimenezmateo/classic48/keyboard.json
index 44df21359d8..f315056d0ba 100644
--- a/keyboards/pablojimenezmateo/classic48/keyboard.json
+++ b/keyboards/pablojimenezmateo/classic48/keyboard.json
@@ -37,6 +37,11 @@
         "driver": "vendor"
     },
     "rgb_matrix": {
+        "default": {
+            "hue": 180,
+            "sat": 100,
+            "val": 60
+        },
         "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
@@ -159,4 +164,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
index 94c144219b4..20dbf6269ee 100644
--- a/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
+++ b/keyboards/pablojimenezmateo/classic48/keymaps/default/keymap.c
@@ -50,27 +50,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-void keyboard_post_init_user(void) {
-    rgb_matrix_sethsv(50, 255, 255);
-}
-
 layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
         case _MAIN:
             /* Yellow */
-            rgb_matrix_sethsv(50, 255, 255); break;   
+            rgb_matrix_sethsv_noeeprom(50, 255, 255); break;   
         case _NUMBERS:
             /* Cyan */
-            rgb_matrix_sethsv(170, 255, 255); break;
+            rgb_matrix_sethsv_noeeprom(170, 255, 255); break;
         case _SYMBOLS:
             /* Purple */
-            rgb_matrix_sethsv(200, 255, 255); break;
+            rgb_matrix_sethsv_noeeprom(200, 255, 255); break;
         case _NAVIGATION:
             /* Green */
-            rgb_matrix_sethsv(85, 255, 255); break;
+            rgb_matrix_sethsv_noeeprom(85, 255, 255); break;
         default:
             /* Off */
-            rgb_matrix_sethsv(0, 0, 0); break;
+            rgb_matrix_sethsv_noeeprom(0, 0, 0); break;
     }
     return state;
 }