summaryrefslogtreecommitdiff
path: root/keyboards/yandrstudio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/yandrstudio')
-rw-r--r--keyboards/yandrstudio/buff67v3/config.h1
-rw-r--r--keyboards/yandrstudio/buff67v3/info.json3
-rw-r--r--keyboards/yandrstudio/eau_r2/config.h4
-rw-r--r--keyboards/yandrstudio/eau_r2/info.json5
-rw-r--r--keyboards/yandrstudio/nightstar75/config.h2
-rw-r--r--keyboards/yandrstudio/nightstar75/info.json1
-rw-r--r--keyboards/yandrstudio/nz64/config.h10
-rw-r--r--keyboards/yandrstudio/nz64/info.json3
-rw-r--r--keyboards/yandrstudio/nz67v2/config.h6
-rw-r--r--keyboards/yandrstudio/nz67v2/info.json143
-rw-r--r--keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c5
-rw-r--r--keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c45
-rw-r--r--keyboards/yandrstudio/tg67/config.h4
-rw-r--r--keyboards/yandrstudio/yr6095/config.h2
-rw-r--r--keyboards/yandrstudio/yr6095/info.json3
-rw-r--r--keyboards/yandrstudio/yr80/config.h3
-rw-r--r--keyboards/yandrstudio/yr80/info.json3
17 files changed, 105 insertions, 138 deletions
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
index 677e41a00d..218f2dc3a8 100644
--- a/keyboards/yandrstudio/buff67v3/config.h
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -17,7 +17,6 @@
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 1
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json
index 69d4903bd6..d750cd6954 100644
--- a/keyboards/yandrstudio/buff67v3/info.json
+++ b/keyboards/yandrstudio/buff67v3/info.json
@@ -6,6 +6,9 @@
"pid": "0xAA88",
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "B4",
"driver": "pwm"
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
index dcf74a160b..28e8bc379a 100644
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -17,10 +17,6 @@
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 12
-# define RGBLIGHT_SLEEP
-# define RGBLIGHT_VAL_STEP 5
-
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
index e2700ea0cb..6201e9fcca 100644
--- a/keyboards/yandrstudio/eau_r2/info.json
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -15,7 +15,10 @@
"pin": "A8"
},
"rgblight": {
- "max_brightness": 200
+ "brightness_steps": 5,
+ "led_count": 12,
+ "max_brightness": 200,
+ "sleep": true
},
"debounce": 8,
"layouts": {
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index c6760befde..5d7aac48d9 100644
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -17,8 +17,6 @@
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 4
-
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json
index 32d0e29263..c2ecd21eae 100644
--- a/keyboards/yandrstudio/nightstar75/info.json
+++ b/keyboards/yandrstudio/nightstar75/info.json
@@ -11,6 +11,7 @@
"driver": "pwm"
},
"rgblight": {
+ "led_count": 4,
"max_brightness": 180
},
"matrix_pins": {
diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index 5e4cdaaea0..4aa37c5f20 100644
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -15,13 +15,9 @@
*/
#pragma once
-/* Fix VIA RGB_light */
-#define VIA_HAS_BROKEN_KEYCODES
-
/* RGB Matrix */
#ifdef RGB_MATRIX_ENABLE
-# define RGBLED_NUM 82
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 82
# define WS2812_PWM_DRIVER PWMD3 // default: PWMD2
# define WS2812_PWM_CHANNEL 2 // default: 2
@@ -31,7 +27,6 @@
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-# define RGBLIGHT_VAL_STEP 18
# define RGB_DISABLE_WHEN_USB_SUSPENDED true
# define RGB_MATRIX_CENTER { 96, 32 }
# define RGB_MATRIX_KEYPRESSES
@@ -87,9 +82,6 @@
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 82
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
-
# define WS2812_PWM_DRIVER PWMD3 // default: PWMD2
# define WS2812_PWM_CHANNEL 2 // default: 2
# define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json
index 6c054018d1..332f940305 100644
--- a/keyboards/yandrstudio/nz64/info.json
+++ b/keyboards/yandrstudio/nz64/info.json
@@ -4,6 +4,9 @@
"pid": "0xAAAF",
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 82
+ },
"ws2812": {
"pin": "A7",
"driver": "pwm"
diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index 860ee45381..dba2f77395 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -16,16 +16,12 @@
#pragma once
-#define TAP_CODE_DELAY 15
-
/* RGB Matrix */
#ifdef RGB_MATRIX_ENABLE
-# define RGBLED_NUM 86
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 86
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-# define RGBLIGHT_VAL_STEP 5
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json
index 6149c998f7..b351aed1ee 100644
--- a/keyboards/yandrstudio/nz67v2/info.json
+++ b/keyboards/yandrstudio/nz67v2/info.json
@@ -23,84 +23,85 @@
{"pin_a": "A9", "pin_b": "A10"}
]
},
+ "qmk": {
+ "tap_keycode_delay": 15
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.5},
- {"matrix": [0, 1], "x": 1, "y": 0.5},
- {"matrix": [0, 2], "x": 2, "y": 0.5},
- {"matrix": [0, 3], "x": 3, "y": 0.5},
- {"matrix": [0, 4], "x": 4, "y": 0.5},
- {"matrix": [0, 5], "x": 5, "y": 0.5},
- {"matrix": [0, 6], "x": 6, "y": 0.5},
- {"matrix": [0, 7], "x": 7, "y": 0.5},
- {"matrix": [0, 8], "x": 8, "y": 0.5},
- {"matrix": [0, 9], "x": 9, "y": 0.5},
- {"matrix": [0, 10], "x": 10, "y": 0.5},
- {"matrix": [0, 11], "x": 11, "y": 0.5},
- {"matrix": [0, 12], "x": 12, "y": 0.5},
- {"matrix": [0, 13], "x": 13, "y": 0.5, "w": 2},
- {"matrix": [4, 4], "x": 16, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0.5},
+ {"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": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
- {"matrix": [4, 6], "x": 16, "y": 1},
- {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1.5},
- {"matrix": [1, 2], "x": 2.5, "y": 1.5},
- {"matrix": [1, 3], "x": 3.5, "y": 1.5},
- {"matrix": [1, 4], "x": 4.5, "y": 1.5},
- {"matrix": [1, 5], "x": 5.5, "y": 1.5},
- {"matrix": [1, 6], "x": 6.5, "y": 1.5},
- {"matrix": [1, 7], "x": 7.5, "y": 1.5},
- {"matrix": [1, 8], "x": 8.5, "y": 1.5},
- {"matrix": [1, 9], "x": 9.5, "y": 1.5},
- {"matrix": [1, 10], "x": 10.5, "y": 1.5},
- {"matrix": [1, 11], "x": 11.5, "y": 1.5},
- {"matrix": [1, 12], "x": 12.5, "y": 1.5},
- {"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2.5},
- {"matrix": [2, 2], "x": 2.75, "y": 2.5},
- {"matrix": [2, 3], "x": 3.75, "y": 2.5},
- {"matrix": [2, 4], "x": 4.75, "y": 2.5},
- {"matrix": [2, 5], "x": 5.75, "y": 2.5},
- {"matrix": [2, 6], "x": 6.75, "y": 2.5},
- {"matrix": [2, 7], "x": 7.75, "y": 2.5},
- {"matrix": [2, 8], "x": 8.75, "y": 2.5},
- {"matrix": [2, 9], "x": 9.75, "y": 2.5},
- {"matrix": [2, 10], "x": 10.75, "y": 2.5},
- {"matrix": [2, 11], "x": 11.75, "y": 2.5},
- {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2.5},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3.5},
- {"matrix": [3, 2], "x": 3.25, "y": 3.5},
- {"matrix": [3, 3], "x": 4.25, "y": 3.5},
- {"matrix": [3, 4], "x": 5.25, "y": 3.5},
- {"matrix": [3, 5], "x": 6.25, "y": 3.5},
- {"matrix": [3, 6], "x": 7.25, "y": 3.5},
- {"matrix": [3, 7], "x": 8.25, "y": 3.5},
- {"matrix": [3, 8], "x": 9.25, "y": 3.5},
- {"matrix": [3, 9], "x": 10.25, "y": 3.5},
- {"matrix": [3, 10], "x": 11.25, "y": 3.5},
- {"matrix": [3, 12], "x": 12.25, "y": 3.5, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3.5},
- {"matrix": [3, 14], "x": 15, "y": 3.5},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 2.25},
- {"matrix": [4, 5], "x": 6, "y": 4.5, "w": 1.75},
- {"matrix": [4, 7], "x": 7.75, "y": 4.5, "w": 2.25},
- {"matrix": [4, 9], "x": 10, "y": 4.5, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4.5, "w": 1.25},
- {"matrix": [4, 12], "x": 13, "y": 4.5},
- {"matrix": [4, 13], "x": 14, "y": 4.5},
- {"matrix": [4, 14], "x": 15, "y": 4.5}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.75},
+ {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker": {
diff --git a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
index 7ed06c9ec5..f1069c37db 100644
--- a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
@@ -18,16 +18,15 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
- 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_VOLD, KC_HOME, KC_VOLU,
+ 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_HOME,
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_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_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_all(
- 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_DEL, KC_TRNS, KC_TRNS, KC_TRNS,
+ 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_DEL, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/yandrstudio/nz67v2/keymaps/via/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
index 56a083d444..52e0d15c8e 100644
--- a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
@@ -18,59 +18,36 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
- 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_VOLD, KC_HOME, KC_VOLU,
+ 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_HOME,
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_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_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_all(
- 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_DEL, KC_TRNS, KC_TRNS, KC_TRNS,
+ 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_DEL, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
-#ifdef ENCODER_ENABLE
-keyevent_t encoder1_ccw = {.key = (keypos_t){.row = 4, .col = 4}, .pressed = false, .type = KEY_EVENT};
-
-keyevent_t encoder1_cw = {.key = (keypos_t){.row = 4, .col = 6}, .pressed = false, .type = KEY_EVENT};
-void matrix_scan_user(void) {
- if (encoder1_ccw.pressed) {
- encoder1_ccw.pressed = false;
- encoder1_ccw.time = timer_read();
- action_exec(encoder1_ccw);
- }
-
- if (encoder1_cw.pressed) {
- encoder1_cw.pressed = false;
- encoder1_cw.time = timer_read();
- action_exec(encoder1_cw);
- }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (clockwise) {
- encoder1_cw.pressed = true;
- encoder1_cw.time = timer_read();
- action_exec(encoder1_cw);
- } else {
- encoder1_ccw.pressed = true;
- encoder1_ccw.time = timer_read();
- action_exec(encoder1_ccw);
- }
- return true;
-}
+#ifdef 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(_______, _______) },
+ [2] = { ENCODER_CCW_CW(_______, _______) },
+ [3] = { ENCODER_CCW_CW(_______, _______) },
+};
#endif
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index 373b5bcbf9..3386838c74 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -18,11 +18,9 @@
/* RGB Matrix */
#ifdef RGB_MATRIX_ENABLE
-# define RGBLED_NUM 69
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 69
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 250
-# define RGBLIGHT_VAL_STEP 5
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
index 74c8f4adce..40c148636f 100644
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -17,8 +17,6 @@
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 1
-
# define RGBLIGHT_LAYERS
# define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
# define RGBLIGHT_LAYERS_RETAIN_VAL
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
index 3ec826052c..77432a994c 100644
--- a/keyboards/yandrstudio/yr6095/info.json
+++ b/keyboards/yandrstudio/yr6095/info.json
@@ -6,6 +6,9 @@
"pid": "0xAA0C",
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "B5",
"driver": "pwm"
diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h
index 0e8602dee9..d2f6228308 100644
--- a/keyboards/yandrstudio/yr80/config.h
+++ b/keyboards/yandrstudio/yr80/config.h
@@ -18,9 +18,6 @@
#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 1
-# define DRIVER_LED_TOTAL RGBLED_NUM
-
# define RGBLIGHT_LAYERS
# define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
# define RGBLIGHT_LAYERS_RETAIN_VAL
diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json
index 7faaa482ef..3db1d88e26 100644
--- a/keyboards/yandrstudio/yr80/info.json
+++ b/keyboards/yandrstudio/yr80/info.json
@@ -6,6 +6,9 @@
"pid": "0xAA0D",
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 1
+ },
"ws2812": {
"pin": "A7",
"driver": "pwm"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 01:58:15 +0000