summaryrefslogtreecommitdiffstats
path: root/keyboards/matrix/m20add
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/matrix/m20add')
-rw-r--r--keyboards/matrix/m20add/config.h3
-rw-r--r--keyboards/matrix/m20add/info.json3
-rw-r--r--keyboards/matrix/m20add/rgb_ring.c54
3 files changed, 31 insertions, 29 deletions
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index 421773affc..5e301cf1c4 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -79,7 +79,6 @@
#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
// rgb light setting
-#define RGBLED_NUM 20
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -94,4 +93,4 @@
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_COUNT 1
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 20
diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json
index 7d88bb81f5..25abd25827 100644
--- a/keyboards/matrix/m20add/info.json
+++ b/keyboards/matrix/m20add/info.json
@@ -8,6 +8,9 @@
"pid": "0x20AD",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 20
+ },
"ws2812": {
"pin": "B4"
},
diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c
index 4466ec3bea..4567f0348d 100644
--- a/keyboards/matrix/m20add/rgb_ring.c
+++ b/keyboards/matrix/m20add/rgb_ring.c
@@ -135,13 +135,13 @@ static void testing_mode(void)
if (timer_elapsed(animation_status.last_timer) > EFFECT_TEST_INTERVAL) {
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- //IS31FL3731_set_color_all(c.r, c.g, c.b);
- IS31FL3731_set_color_all(0, 0, 0);
- IS31FL3731_set_color(rgb_ring.outer_index+RING_OUTER_BEGIN, c.r, c.g, c.b);
+ //is31fl3731_set_color_all(c.r, c.g, c.b);
+ is31fl3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color(rgb_ring.outer_index+RING_OUTER_BEGIN, c.r, c.g, c.b);
h.v = EFFECT_TEST_VAL_STEP*rgb_ring.outer_index;
c = hsv_to_rgb(h);
for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) {
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
rgb_ring.outer_index = (rgb_ring.outer_index + 1) % RING_OUTER_SIZE;
//rgb_ring.inner_index = (rgb_ring.inner_index + 1) % RING_INNER_SIZE;
@@ -183,7 +183,7 @@ static void ring_effect_no_1(void)
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) {
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
rgblight_config.hue += EFFECT_1_HUE_STEP;
rgb_ring.effect_count++;
@@ -200,12 +200,12 @@ static void ring_effect_no_1(void)
static void ring_effect_no_2(void)
{
if (need_update(EFFECT_2_INTERVAL)) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
- IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
rgb_ring.led_begin = (rgb_ring.led_begin + 1) % RING_OUTER_SIZE;
rgb_ring.led_end = (rgb_ring.led_end + RING_OUTER_SIZE - 1) % RING_OUTER_SIZE;
@@ -225,19 +225,19 @@ static void ring_effect_no_2(void)
static void ring_effect_no_3(void)
{
if (rgb_ring.effect_count == 0) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
}
if (need_update(EFFECT_3_INTERVAL)) {
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
if (rgb_ring.led_clear) {
- IS31FL3731_set_color(rgb_ring.led_begin, 0, 0, 0);
- IS31FL3731_set_color(rgb_ring.led_end, 0, 0, 0);
+ is31fl3731_set_color(rgb_ring.led_begin, 0, 0, 0);
+ is31fl3731_set_color(rgb_ring.led_end, 0, 0, 0);
} else {
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
- IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
}
rgb_ring.led_begin = (rgb_ring.led_begin + 1) % RING_OUTER_SIZE;
@@ -273,12 +273,12 @@ static void ring_effect_no_3(void)
static void ring_effect_no_4(void)
{
if (need_update(EFFECT_4_INTERVAL)) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
- IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
+ is31fl3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
rgb_ring.led_begin = (rgb_ring.led_begin + EFFECT_4_STEP) % RING_OUTER_SIZE;
rgb_ring.led_end = (rgb_ring.led_end + RING_OUTER_SIZE - EFFECT_4_STEP) % RING_OUTER_SIZE;
@@ -297,16 +297,16 @@ static void ring_effect_no_4(void)
static void ring_effect_no_5(void)
{
if (need_update(EFFECT_5_INTERVAL)) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) {
HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) {
HSV h = {rgblight_config.hue+EFFECT_5_HUE_STEP, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
rgblight_config.hue += EFFECT_5_HUE_STEP;
rgb_ring.effect_count++;
@@ -323,16 +323,16 @@ static void ring_effect_no_5(void)
static void ring_effect_no_6(void)
{
if (need_update(EFFECT_6_INTERVAL)) {
- IS31FL3731_set_color_all(0, 0, 0);
+ is31fl3731_set_color_all(0, 0, 0);
for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) {
HSV h = {rgblight_config.hue+i*EFFECT_I_HUE_STEP, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) {
HSV h = {rgblight_config.hue+i*EFFECT_O_HUE_STEP, rgblight_config.sat, rgblight_config.val};
RGB c = hsv_to_rgb(h);
- IS31FL3731_set_color(i, c.r, c.g, c.b);
+ is31fl3731_set_color(i, c.r, c.g, c.b);
}
rgblight_config.hue += EFFECT_I_HUE_STEP;
rgb_ring.effect_count++;
@@ -364,7 +364,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
}
for (uint8_t i = 0; i < num_leds; i++) {
- IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
+ is31fl3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
}
}
@@ -372,12 +372,12 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
void rgb_ring_init(void)
{
i2c_init();
- IS31FL3731_init(DRIVER_ADDR_1);
+ is31fl3731_init(DRIVER_ADDR_1);
for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
bool enabled = true;
- IS31FL3731_set_led_control_register(index, enabled, enabled, enabled);
+ is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
}
- IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+ is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
}
void rgb_ring_task(void)
@@ -396,7 +396,7 @@ void rgb_ring_task(void)
break;
};
- IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+ is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
}
bool process_record_kb(uint16_t keycode, keyrecord_t *record)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 17:53:23 +0000