From b1783db4eacacaf8181cfbce13146db1941486ba Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 18 Jun 2023 14:39:07 +1000 Subject: Move `RGBLED_NUM` to data driven (#21278) --- keyboards/neson_design/700e/config.h | 1 - keyboards/neson_design/700e/info.json | 3 +++ keyboards/neson_design/n6/config.h | 1 - keyboards/neson_design/n6/info.json | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h index e35f0c4d0a..7d33c31fbc 100644 --- a/keyboards/neson_design/700e/config.h +++ b/keyboards/neson_design/700e/config.h @@ -38,7 +38,6 @@ #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL) //rgb light setting -#define RGBLED_NUM 68 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json index 3f339ad554..a6db575ba2 100644 --- a/keyboards/neson_design/700e/info.json +++ b/keyboards/neson_design/700e/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "F5" }, + "rgblight": { + "led_count": 68 + }, "ws2812": { "pin": "D5" }, diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h index 9a4c8240c0..30d0e2567b 100644 --- a/keyboards/neson_design/n6/config.h +++ b/keyboards/neson_design/n6/config.h @@ -38,7 +38,6 @@ #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL) //rgb light setting -#define RGBLED_NUM 65 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json index 770748fa29..6d6d434754 100644 --- a/keyboards/neson_design/n6/info.json +++ b/keyboards/neson_design/n6/info.json @@ -20,6 +20,7 @@ "pin": "B3" }, "rgblight": { + "led_count": 65, "max_brightness": 192 }, "processor": "atmega32u4", -- cgit v1.2.3 From 4ae9bfd17ab01608e1bf2492c35d79bd2ad5c0fe Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 24 Jun 2023 17:37:54 +1000 Subject: Move `RGBLIGHT_HUE/SAT/VAL_STEP` to data driven (#21292) Co-authored-by: Nick Brassel --- keyboards/neson_design/700e/config.h | 3 --- keyboards/neson_design/700e/info.json | 2 ++ keyboards/neson_design/n6/config.h | 3 --- keyboards/neson_design/n6/info.json | 2 ++ 4 files changed, 4 insertions(+), 6 deletions(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h index 7d33c31fbc..9a17556610 100644 --- a/keyboards/neson_design/700e/config.h +++ b/keyboards/neson_design/700e/config.h @@ -47,8 +47,5 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 #define USB_SUSPEND_WAKEUP_DELAY 1000 diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json index a6db575ba2..addeafdaea 100644 --- a/keyboards/neson_design/700e/info.json +++ b/keyboards/neson_design/700e/info.json @@ -17,6 +17,8 @@ "caps_lock": "F5" }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 68 }, "ws2812": { diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h index 30d0e2567b..f9e1463f64 100644 --- a/keyboards/neson_design/n6/config.h +++ b/keyboards/neson_design/n6/config.h @@ -48,6 +48,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json index 6d6d434754..b6dd5eba41 100644 --- a/keyboards/neson_design/n6/info.json +++ b/keyboards/neson_design/n6/info.json @@ -20,6 +20,8 @@ "pin": "B3" }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 65, "max_brightness": 192 }, -- cgit v1.2.3 From 37bc9499453f95e4e835faa751dbfffff9bfd644 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 23 Aug 2023 10:00:03 +1000 Subject: RGB Matrix: driver naming cleanups (#21594) --- keyboards/neson_design/700e/700e.c | 40 +++++++++++++++++++------------------- keyboards/neson_design/n6/n6.c | 40 +++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 40 deletions(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/700e/700e.c b/keyboards/neson_design/700e/700e.c index a5a5ad9120..cf31b6b72b 100644 --- a/keyboards/neson_design/700e/700e.c +++ b/keyboards/neson_design/700e/700e.c @@ -107,12 +107,12 @@ static void self_testing(void) switch(rgb_state.testing) { case ST_STAGE_1: if (rgb_state.index !=0 ) { - IS31FL3731_set_color_all(0, 0, 0); + is31fl3731_set_color_all(0, 0, 0); } if (rgb_state.index >= ST_LEFT_END) { for (int i = rgb_state.index - 1; i < RGB_MATRIX_LED_COUNT - rgb_state.index + 1; i++) { - IS31FL3731_set_color(i, led.r, led.g, led.b); + is31fl3731_set_color(i, led.r, led.g, led.b); } if (rgb_state.index == ST_LEFT_END) { rgb_state.index = ST_LEFT_BEGIN; @@ -131,20 +131,20 @@ static void self_testing(void) break; case ST_STAGE_2: { // clear all - IS31FL3731_set_color_all(0, 0, 0); + is31fl3731_set_color_all(0, 0, 0); int i = 0; // light left and right for (i = 0; i < ST_LEFT_SIZE; i++) { - IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b); + is31fl3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b); } for (i = 0; i < ST_RIGHT_SIZE; i++) { - IS31FL3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b); + is31fl3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b); } if (rgb_state.dir) { // left to right for (int i = rgb_state.index; i < rgb_state.index+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) { - IS31FL3731_set_color(i, led.r, led.g, led.b); + is31fl3731_set_color(i, led.r, led.g, led.b); } rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE; if (rgb_state.index == ST_RIGHT_BEGIN) { @@ -154,7 +154,7 @@ static void self_testing(void) } else { // right to left for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) { - IS31FL3731_set_color(i, led.r, led.g, led.b); + is31fl3731_set_color(i, led.r, led.g, led.b); } rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE; if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) { @@ -174,7 +174,7 @@ static void self_testing(void) break; case ST_STAGE_3: if (rgb_state.index != RGB_MATRIX_LED_COUNT/2) { - IS31FL3731_set_color_all(0, 0, 0); + is31fl3731_set_color_all(0, 0, 0); } // light left and right @@ -193,11 +193,11 @@ static void self_testing(void) } else { // left for (int i = 0; i < rgb_state.index+1; i++) { - IS31FL3731_set_color(i, led.r, led.g, led.b); + is31fl3731_set_color(i, led.r, led.g, led.b); } // right for (int i = ST_RIGHT_END; i > ST_RIGHT_END - rgb_state.index - 1; i--) { - IS31FL3731_set_color(i, led.r, led.g, led.b); + is31fl3731_set_color(i, led.r, led.g, led.b); } rgb_state.index ++; } @@ -295,16 +295,16 @@ void matrix_init_kb(void) writePinLow(LED_CAPS_LOCK_PIN); i2c_init(); - IS31FL3731_init(DRIVER_ADDR_1); + is31fl3731_init(DRIVER_ADDR_1); #ifdef DRIVER_ADDR_2 - IS31FL3731_init(DRIVER_ADDR_2); + is31fl3731_init(DRIVER_ADDR_2); #endif for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) { - IS31FL3731_set_led_control_register(index, true, true, true); + is31fl3731_set_led_control_register(index, true, true, true); } - IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0); + is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0); #ifdef DRIVER_ADDR_2 - IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1); + is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1); #endif update_ticks(); matrix_init_user(); @@ -321,7 +321,7 @@ void housekeeping_task_kb(void) self_testing(); } else if (rgb_state.state == CAPS_ALERT) { if (rgb_state.alert) { - IS31FL3731_set_color_all(ALERM_LED_R, ALERM_LED_G, ALERM_LED_B); + is31fl3731_set_color_all(ALERM_LED_R, ALERM_LED_G, ALERM_LED_B); LED_TYPE leds[4]; for (int i = 0; i < 4; i++) { leds[i].r = ALERM_LED_G; @@ -330,7 +330,7 @@ void housekeeping_task_kb(void) } ws2812_setleds(leds, 4); } else { - IS31FL3731_set_color_all(0, 0, 0); + is31fl3731_set_color_all(0, 0, 0); LED_TYPE leds[4] = {0}; ws2812_setleds(leds, 4); } @@ -341,9 +341,9 @@ void housekeeping_task_kb(void) } } - IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0); + is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0); #ifdef DRIVER_ADDR_2 - IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1); + is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1); #endif housekeeping_task_user(); @@ -354,7 +354,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) if (rgb_state.state != NORMAL) return; for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; 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); } LED_TYPE leds[4]; for (int i = 0; i < 4; i++) { diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c index 5727ab655f..cf99404641 100644 --- a/keyboards/neson_design/n6/n6.c +++ b/keyboards/neson_design/n6/n6.c @@ -111,12 +111,12 @@ static void self_testing(void) switch(rgb_state.testing) { case ST_STAGE_1: if (rgb_state.index !=0 ) { - IS31FL3731_set_color_all(0, 0, 0); + is31fl3731_set_color_all(0, 0, 0); } if (rgb_state.index >= ST_LEFT_END) { for (int i = rgb_state.index - 1; i < RGB_MATRIX_LED_COUNT - rgb_state.index + 1; i++) { - IS31FL3731_set_color(i, led.r, led.g, led.b); + is31fl3731_set_color(i, led.r, led.g, led.b); } if (rgb_state.index == ST_LEFT_END) { rgb_state.index = ST_LEFT_BEGIN; @@ -135,20 +135,20 @@ static void self_testing(void) break; case ST_STAGE_2: { // clear all - IS31FL3731_set_color_all(0, 0, 0); + is31fl3731_set_color_all(0, 0, 0); int i = 0; // light left and right for (i = 0; i < ST_LEFT_SIZE; i++) { - IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b); + is31fl3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b); } for (i = 0; i < ST_RIGHT_SIZE; i++) { - IS31FL3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b); + is31fl3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b); } if (rgb_state.dir) { // left to right for (int i = rgb_state.index; i < rgb_state.index+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) { - IS31FL3731_set_color(i, led.r, led.g, led.b); + is31fl3731_set_color(i, led.r, led.g, led.b); } rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE; if (rgb_state.index == ST_RIGHT_BEGIN) { @@ -158,7 +158,7 @@ static void self_testing(void) } else { // right to left for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) { - IS31FL3731_set_color(i, led.r, led.g, led.b); + is31fl3731_set_color(i, led.r, led.g, led.b); } rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE; if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) { @@ -178,7 +178,7 @@ static void self_testing(void) break; case ST_STAGE_3: if (rgb_state.index != RGB_MATRIX_LED_COUNT/2) { - IS31FL3731_set_color_all(0, 0, 0); + is31fl3731_set_color_all(0, 0, 0); } // light left and right @@ -197,11 +197,11 @@ static void self_testing(void) } else { // left for (int i = 0; i < rgb_state.index+1; i++) { - IS31FL3731_set_color(i, led.r, led.g, led.b); + is31fl3731_set_color(i, led.r, led.g, led.b); } // right for (int i = ST_RIGHT_END; i > ST_RIGHT_END - rgb_state.index - 1; i--) { - IS31FL3731_set_color(i, led.r, led.g, led.b); + is31fl3731_set_color(i, led.r, led.g, led.b); } rgb_state.index ++; } @@ -299,16 +299,16 @@ void matrix_init_kb(void) writePinLow(LED_CAPS_LOCK_PIN); i2c_init(); - IS31FL3731_init(DRIVER_ADDR_1); + is31fl3731_init(DRIVER_ADDR_1); #ifdef DRIVER_ADDR_2 - IS31FL3731_init(DRIVER_ADDR_2); + is31fl3731_init(DRIVER_ADDR_2); #endif for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) { - IS31FL3731_set_led_control_register(index, true, true, true); + is31fl3731_set_led_control_register(index, true, true, true); } - IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0); + is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0); #ifdef DRIVER_ADDR_2 - IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1); + is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1); #endif update_ticks(); matrix_init_user(); @@ -327,13 +327,13 @@ void housekeeping_task_kb(void) .b = 0x00, }; if (rgb_state.alert) { - IS31FL3731_set_color_all(led.r, led.g, led.b); + is31fl3731_set_color_all(led.r, led.g, led.b); ws2812_setleds(&led, 1); } else { led.r = 0; led.g = 0; led.b = 0; - IS31FL3731_set_color_all(0, 0, 0); + is31fl3731_set_color_all(0, 0, 0); ws2812_setleds(&led, 1); } @@ -343,9 +343,9 @@ void housekeeping_task_kb(void) } } - IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0); + is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0); #ifdef DRIVER_ADDR_2 - IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1); + is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1); #endif housekeeping_task_user(); @@ -356,7 +356,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) if (rgb_state.state != NORMAL) return; for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; 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); } ws2812_setleds(start_led+RGB_MATRIX_LED_COUNT, 1); } -- cgit v1.2.3 From 023d644bb69748d97feb49091e2c24f3fcd3da11 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 24 Aug 2023 07:11:39 +1000 Subject: Move RGBLight animations to data driven (#21635) * Move RGBLight animations to data driven, 0-9 * Move RGBLight animations to data driven, A * Move RGBLight animations to data driven, B * Move RGBLight animations to data driven, C * Move RGBLight animations to data driven, D * Move RGBLight animations to data driven, E * Move RGBLight animations to data driven, F * Move RGBLight animations to data driven, G * Move RGBLight animations to data driven, H * Move RGBLight animations to data driven, handwired * Move RGBLight animations to data driven, I * Move RGBLight animations to data driven, J * Move RGBLight animations to data driven, K * Move RGBLight animations to data driven, L * Move RGBLight animations to data driven, M * Move RGBLight animations to data driven, N * Move RGBLight animations to data driven, O * Move RGBLight animations to data driven, P * Move RGBLight animations to data driven, Q * Move RGBLight animations to data driven, R * Move RGBLight animations to data driven, S * Move RGBLight animations to data driven, T * Move RGBLight animations to data driven, U * Move RGBLight animations to data driven, V * Move RGBLight animations to data driven, W * Move RGBLight animations to data driven, X * Move RGBLight animations to data driven, Y * Move RGBLight animations to data driven, Z * Fix incorrect placement * Fix build failures and mismatches --- keyboards/neson_design/700e/config.h | 11 ----------- keyboards/neson_design/700e/info.json | 13 ++++++++++++- keyboards/neson_design/n6/config.h | 12 ------------ keyboards/neson_design/n6/info.json | 14 +++++++++++++- 4 files changed, 25 insertions(+), 25 deletions(-) (limited to 'keyboards/neson_design') diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h index 9a17556610..cf89616aa8 100644 --- a/keyboards/neson_design/700e/config.h +++ b/keyboards/neson_design/700e/config.h @@ -37,15 +37,4 @@ #define DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL) -//rgb light setting -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING - #define USB_SUSPEND_WAKEUP_DELAY 1000 diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json index addeafdaea..12a979ab11 100644 --- a/keyboards/neson_design/700e/info.json +++ b/keyboards/neson_design/700e/info.json @@ -19,7 +19,18 @@ "rgblight": { "saturation_steps": 8, "brightness_steps": 8, - "led_count": 68 + "led_count": 68, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true + } }, "ws2812": { "pin": "D5" diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h index f9e1463f64..91d96c6a4d 100644 --- a/keyboards/neson_design/n6/config.h +++ b/keyboards/neson_design/n6/config.h @@ -36,15 +36,3 @@ #define DRIVER_ADDR_2 0b1110111 #define DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL) - -//rgb light setting -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json index b6dd5eba41..3f383b4f8f 100644 --- a/keyboards/neson_design/n6/info.json +++ b/keyboards/neson_design/n6/info.json @@ -23,7 +23,19 @@ "saturation_steps": 8, "brightness_steps": 8, "led_count": 65, - "max_brightness": 192 + "max_brightness": 192, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", -- cgit v1.2.3