Address code review comments.

qmk · Dec 11, 2024 · 81d27b7 · 81d27b7
1 parent 52492d3
commit 81d27b7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/...oards/decent/tkl/keymaps/default/config.h → keyboards/decent/tkl/config.h b/...oards/decent/tkl/keymaps/default/config.h → keyboards/decent/tkl/config.h
@@ -3,12 +3,7 @@
 
 #pragma once
 
-#define BOOTMAGIC_ROW 0
-#define BOOTMAGIC_COLUMN 6
-
 #define I2C1_SDA_PIN GP26
 #define I2C1_SCL_PIN GP27
 
-#define RGB_MATRIX_LED_COUNT 82
-#define RGB_MATRIX_CENTER {77, 32}
 #define OLED_FONT_H "atari-font.c"
diff --git a/keyboards/decent/tkl/keyboard.json b/keyboards/decent/tkl/keyboard.json
@@ -2,8 +2,10 @@
     "manufacturer": "Bertrand Le roy",
     "keyboard_name": "DecenTKL",
     "maintainer": "bleroy",
+    "url": "https://github.com/bleroy/3d-junkyard/blob/main/DecenTKL/",
+    "tags": ["ansi", "tkl", "rgb", "oled", "encoder", "atari"],
     "bootloader": "rp2040",
-    "diode_direction": "COL2ROW",
+    "processor": "RP2040",
     "features": {
         "encoder": true,
         "bootmagic": true,
@@ -15,13 +17,14 @@
         "mousekey": false,
         "nkro": true
     },
+    "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
         "rows": ["GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18", "GP19", "GP20"]
     },
-    "processor": "RP2040",
-    "url": "https://github.com/bleroy/3d-junkyard/blob/main/DecenTKL/",
-    "tags": ["ansi", "tkl", "rgb", "oled", "encoder", "atari"],
+    "bootmagic": {
+        "matrix": [0, 6]
+    },
     "usb": {
         "device_version": "1.0.0",
         "pid": "0x0000",
@@ -45,7 +48,7 @@
         "driver": "vendor"
     },
     "layouts": {
-        "LAYOUT_tkl_ansi": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 6], "x": 0.5, "y": 0, "label": "Esc"},
                 {"matrix": [0, 5], "x": 3.5, "y": 0, "label": "F1"},
@@ -140,6 +143,7 @@
     "rgb_matrix": {
         "max_brightness": 125,
         "sleep": true,
+        "center_point": [77, 32],
         "default": {
             "animation": "typing_heatmap"
         },

diff --git a/keyboards/decent/tkl/keymaps/default/keymap.c b/keyboards/decent/tkl/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│GUI │Alt │                        │ Alt│ Fn │Menu│Ctrl│ │ ← │ ↓ │ → │
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
      */
-    [0] = LAYOUT_tkl_ansi(
+    [0] = LAYOUT(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
 
         KC_GRV,  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_INS,  KC_HOME, KC_PGUP,
@@ -38,21 +38,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │        │   │🎨│   │   │   │   │   │   │   │   │          │     │🗘 │
      * │    │    │    │                        │    │    │    │    │ │㉈ │🗘 │㉏ │
      */
-    [1] = LAYOUT_tkl_ansi(
+    [1] = LAYOUT(
         _______,          KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, _______,
 
-        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, KC_VOLD,
-        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          RGB_MOD,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+        _______, RM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
+        _______, _______, RM_VALU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, KC_VOLD,
+        _______, _______, RM_VALD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, RM_HUEU, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          RM_NEXT,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RM_SPDD, RM_PREV, RM_SPDU
     ),
 };
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+    [1] = { ENCODER_CCW_CW(RM_VALD, RM_VALU) }
 };
 #endif