From bf09550108934c648cd8cca09bf08a928d402618 Mon Sep 17 00:00:00 2001 From: Micah Date: Sun, 8 Sep 2024 22:28:47 +0800 Subject: [PATCH] update ds17 RGB_Matrix --- keyboards/czmao/ds17/keyboard.json | 72 +++++++++++++++++++++++++++++- keyboards/dc01/numpad/matrix.c | 2 +- 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/keyboards/czmao/ds17/keyboard.json b/keyboards/czmao/ds17/keyboard.json index ffc3fccf7f0..c9f2b93a2bb 100644 --- a/keyboards/czmao/ds17/keyboard.json +++ b/keyboards/czmao/ds17/keyboard.json @@ -18,8 +18,8 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": false, - "rgblight": true, + "rgb_matrix": true, + "rgblight": false, "encoder": false }, "dynamic_keymap": { @@ -58,6 +58,74 @@ "twinkle": true } }, + + "rgb_matrix": { + "animations": { + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "typing_heatmap": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "driver": "ws2812", + "layout": [ + { "flags": 2, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 2, "matrix": [0, 1], "x": 75, "y": 0 }, + { "flags": 2, "matrix": [0, 2], "x": 150, "y": 0 }, + { "flags": 2, "matrix": [0, 3], "x": 224, "y": 0 }, + + { "flags": 2, "matrix": [1, 3], "x": 224, "y": 32 }, + { "flags": 2, "matrix": [3, 3], "x": 224, "y": 50 }, + { "flags": 2, "matrix": [4, 2], "x": 150, "y": 64 }, + { "flags": 2, "matrix": [4, 0], "x": 100, "y": 64 }, + + { "flags": 2, "matrix": [3, 0], "x": 0, "y": 48 }, + { "flags": 2, "matrix": [2, 0], "x": 0, "y": 32 }, + { "flags": 2, "matrix": [1, 0], "x": 0, "y": 16 }, + { "flags": 2, "matrix": [1, 1], "x": 75, "y": 16 }, + + { "flags": 2, "matrix": [1, 2], "x": 150, "y": 16 }, + { "flags": 2, "matrix": [2, 2], "x": 150, "y": 32 }, + { "flags": 2, "matrix": [3, 2], "x": 150, "y": 48 }, + { "flags": 2, "matrix": [3, 1], "x": 75, "y": 48 }, + + { "flags": 2, "matrix": [2, 1], "x": 75, "y": 32 } + ], + "sleep": true + }, + "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c index 73b245f56e8..4338018c637 100644 --- a/keyboards/dc01/numpad/matrix.c +++ b/keyboards/dc01/numpad/matrix.c @@ -29,7 +29,7 @@ along with this program. If not, see . #include "util.h" #include "matrix.h" #include "timer.h" -#include "i2c_slave.h" +#include "_slave.h" #include "lufa.h" #define SLAVE_I2C_ADDRESS 0x36