Merge ef03c9c613c3e9892680d2137f71f252881d2deb into 57f89e5388f0f79e27d0e634c9d4621e5a9c214f

[CI] Regenerate Files (#24770 )
Regenerate Files
2025-01-04 22:13:04 +00:00 · 2025-01-02 04:35:14 +02:00 · 2025-01-01 13:02:16 +11:00 · 2025-01-01 01:58:41 +00:00 · 2024-12-31 12:36:24 +00:00 · 2024-07-08 16:00:07 +08:00
83 changed files with 473 additions and 80 deletions
--- a/keyboards/keychron/c1_pro/ansi/white/keyboard.json
+++ b/keyboards/keychron/c1_pro/ansi/white/keyboard.json
@ -119,8 +119,7 @@
            "solid_reactive_multinexus": true,
            "solid_splash": true,
            "wave_left_right": true,
-            "wave_up_down": true,
-            "effect_max": true
+            "wave_up_down": true
        },
        "layout": [
            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
--- a/keyboards/keychron/c2_pro/ansi/white/keyboard.json
+++ b/keyboards/keychron/c2_pro/ansi/white/keyboard.json
@ -136,8 +136,7 @@
            "solid_reactive_multinexus": true,
            "solid_splash": true,
            "wave_left_right": true,
-            "wave_up_down": true,
-            "effect_max": true
+            "wave_up_down": true
        },
        "layout": [
            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
--- a/keyboards/rk/rk890/keyboard.json
+++ b/keyboards/rk/rk890/keyboard.json
--- a/keyboards/rk/rk890/keymaps/default/keymap.c
+++ b/keyboards/rk/rk890/keymaps/default/keymap.c
@ -0,0 +1,27 @@
+// Copyright 2024 SDK (@sdk66)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT( /* Base */
+        KC_ESC,           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_PSCR,  KC_SCRL, KC_PAUSE, KC_VOLU, KC_VOLD, KC_MUTE, KC_CALC,
+        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,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        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_DEL,   KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_P4,   KC_P5,   KC_P6,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT,  MO(1),    KC_APP,           KC_RCTL, KC_LEFT,  KC_DOWN, KC_RGHT,  KC_P0,   KC_PDOT
+        ),
+
+    [1] = LAYOUT( /* FN */
+        _______,          KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,  KC_WSCH,  KC_WFAV, _______, KC_MAIL, _______,  _______, _______,  _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______,                              _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,                    _______,           _______,           _______, _______, _______, _______, 
+        _______, GU_TOGG, _______,                   EE_CLR,                             _______,  _______,  _______,          _______, _______,  _______, _______,  _______, _______
+        ),
+};
+// clang-format on
--- a/keyboards/rk/rk890/keymaps/via/keymap.c
+++ b/keyboards/rk/rk890/keymaps/via/keymap.c
@ -0,0 +1,28 @@
+// Copyright 2024 SDK (@sdk66)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT( /* Base */
+        KC_ESC,           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_PSCR,  KC_SCRL, KC_PAUSE, KC_VOLU, KC_VOLD, KC_MUTE, KC_CALC,
+        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,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        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_DEL,   KC_END,  KC_PGDN,  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_P4,   KC_P5,   KC_P6,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT,  MO(1),    KC_APP,           KC_RCTL, KC_LEFT,  KC_DOWN, KC_RGHT,  KC_P0,   KC_PDOT
+        ),
+
+    [1] = LAYOUT( /* FN */
+        _______,          KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,  KC_WSCH,  KC_WFAV, _______, KC_MAIL, _______,  _______, _______,  _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______,                              _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,                    _______,           _______,           _______, _______, _______, _______, 
+        _______, GU_TOGG, _______,                   EE_CLR,                             _______,  _______,  _______,          _______, _______,  _______, _______,  _______, _______
+        ),
+};
+
+// clang-format on
--- a/keyboards/rk/rk890/keymaps/via/rules.mk
+++ b/keyboards/rk/rk890/keymaps/via/rules.mk
@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/rk/rk890/readme.md
+++ b/keyboards/rk/rk890/readme.md
@ -0,0 +1,24 @@
+# RK890
+
+* Keyboard Maintainer: [sdk66](https://github.com/sdk66)
+* Hardware Supported: RK890
+* Hardware Availability: [rk](http://www.rkgaming.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rk/rk890:default
+        
+Flashing example for this keyboard:
+
+    make rk/rk890:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the bottom side of the PCB while connecting the USB cable
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+R_Shift+Esc will reset the board to bootloader mode if you have flashed the default QMK keymap
+
+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).
+
+![image](https://imgur.com/s8vZpBc.png)
+
--- a/keyboards/rk/rk890/rk890.c
+++ b/keyboards/rk/rk890/rk890.c
@ -0,0 +1,10 @@
+// Copyright 2024 SDK (@sdk66)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+#define LED_ENABLE_PIN A5
+void keyboard_pre_init_kb(void) {
+    gpio_set_pin_output(LED_ENABLE_PIN);
+    gpio_write_pin_high(LED_ENABLE_PIN);
+    keyboard_pre_init_user();
+}
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@ -789,8 +789,8 @@ def _extract_led_config(info_data, keyboard):
                                info_data[feature]['layout'] = ret
                        except Exception as e:
                            _log_warning(info_data, f'led_config: {file.name}: {e}')
-                    else:
-                        _log_warning(info_data, 'led_config: matrix size required to parse g_led_config')
+                else:
+                    _log_warning(info_data, 'led_config: matrix size required to parse g_led_config')

            if info_data[feature].get('layout', None) and not info_data[feature].get('led_count', None):
                info_data[feature]['led_count'] = len(info_data[feature]['layout'])
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_belgian.h
+++ b/quantum/keymap_extras/keymap_belgian.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_brazilian_abnt2.h
+++ b/quantum/keymap_extras/keymap_brazilian_abnt2.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_canadian_french.h
+++ b/quantum/keymap_extras/keymap_canadian_french.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_colemak.h
+++ b/quantum/keymap_extras/keymap_colemak.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_croatian.h
+++ b/quantum/keymap_extras/keymap_croatian.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_czech.h
+++ b/quantum/keymap_extras/keymap_czech.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_czech_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_czech_mac_ansi.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_czech_mac_iso.h
+++ b/quantum/keymap_extras/keymap_czech_mac_iso.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_danish.h
+++ b/quantum/keymap_extras/keymap_danish.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_dvorak.h
+++ b/quantum/keymap_extras/keymap_dvorak.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_dvorak_fr.h
+++ b/quantum/keymap_extras/keymap_dvorak_fr.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_dvorak_programmer.h
+++ b/quantum/keymap_extras/keymap_dvorak_programmer.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_estonian.h
+++ b/quantum/keymap_extras/keymap_estonian.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_farsi.h
+++ b/quantum/keymap_extras/keymap_farsi.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_finnish.h
+++ b/quantum/keymap_extras/keymap_finnish.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_french_afnor.h
+++ b/quantum/keymap_extras/keymap_french_afnor.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_french_mac_iso.h
+++ b/quantum/keymap_extras/keymap_french_mac_iso.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sdk	a893a917b5	Merge ef03c9c613c3e9892680d2137f71f252881d2deb into 57f89e5388f0f79e27d0e634c9d4621e5a9c214f	2025-01-02 04:35:14 +02:00
QMK Bot	57f89e5388	[CI] Regenerate Files (#24770 ) Regenerate Files	2025-01-01 13:02:16 +11:00
Joel Challis	53680fa6da	Fix g_led_config parse warning (#24769 )	2025-01-01 01:58:41 +00:00
Joel Challis	fe2200f73a	Remove invalid "effect_max" animation from keyboards (#24767 )	2024-12-31 12:36:24 +00:00
sdk66	ef03c9c613	add rk890 keyboard	2024-07-08 16:00:07 +08:00