From 9551a0a38aca3d32e38a123ae2854a8c82b26195 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 14 Jun 2023 22:01:13 +1000 Subject: Move `RGBLIGHT_LED_MAP` to data driven (#21095) --- keyboards/matrix/cain_re/config.h | 1 - keyboards/matrix/cain_re/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/matrix/cain_re') diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h index 017961460c..df138027a6 100644 --- a/keyboards/matrix/cain_re/config.h +++ b/keyboards/matrix/cain_re/config.h @@ -36,7 +36,6 @@ #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#define RGBLIGHT_LED_MAP { 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3 } #define CAPS_PIN D3 #define NUM_PIN F7 diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json index 5b89ed83ef..f9af90c15e 100644 --- a/keyboards/matrix/cain_re/info.json +++ b/keyboards/matrix/cain_re/info.json @@ -8,6 +8,9 @@ "pid": "0x0106", "device_version": "0.0.1" }, + "rgblight": { + "led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3] + }, "ws2812": { "pin": "E6" }, -- cgit v1.2.3 From 2367d8129c92474eb0da66ebc5ace893097cf574 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 16 Jun 2023 14:04:45 +1000 Subject: Move `RGBLIGHT_SLEEP` to data driven (#21072) --- keyboards/matrix/cain_re/config.h | 1 - keyboards/matrix/cain_re/info.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/matrix/cain_re') diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h index df138027a6..6bccbfbc21 100644 --- a/keyboards/matrix/cain_re/config.h +++ b/keyboards/matrix/cain_re/config.h @@ -35,7 +35,6 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP #define CAPS_PIN D3 #define NUM_PIN F7 diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json index f9af90c15e..827690e3c6 100644 --- a/keyboards/matrix/cain_re/info.json +++ b/keyboards/matrix/cain_re/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "rgblight": { + "sleep": true, "led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3] }, "ws2812": { -- cgit v1.2.3 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/matrix/cain_re/config.h | 2 -- keyboards/matrix/cain_re/info.json | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/matrix/cain_re') diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h index 6bccbfbc21..b7ae408242 100644 --- a/keyboards/matrix/cain_re/config.h +++ b/keyboards/matrix/cain_re/config.h @@ -30,8 +30,6 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json index 827690e3c6..b2ceda7e65 100644 --- a/keyboards/matrix/cain_re/info.json +++ b/keyboards/matrix/cain_re/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "rgblight": { + "led_count": 14, "sleep": true, "led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3] }, -- 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/matrix/cain_re/config.h | 4 ---- keyboards/matrix/cain_re/info.json | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'keyboards/matrix/cain_re') diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h index b7ae408242..9555d0962f 100644 --- a/keyboards/matrix/cain_re/config.h +++ b/keyboards/matrix/cain_re/config.h @@ -30,10 +30,6 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 - #define CAPS_PIN D3 #define NUM_PIN F7 #define SCROLL_PIN B0 diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json index b2ceda7e65..f3d0aa4179 100644 --- a/keyboards/matrix/cain_re/info.json +++ b/keyboards/matrix/cain_re/info.json @@ -9,6 +9,8 @@ "device_version": "0.0.1" }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 14, "sleep": true, "led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3] -- 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/matrix/cain_re/config.h | 11 ----------- keyboards/matrix/cain_re/info.json | 14 +++++++++++++- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'keyboards/matrix/cain_re') diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h index 9555d0962f..9469d689d0 100644 --- a/keyboards/matrix/cain_re/config.h +++ b/keyboards/matrix/cain_re/config.h @@ -19,17 +19,6 @@ #pragma once -#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 - #define CAPS_PIN D3 #define NUM_PIN F7 #define SCROLL_PIN B0 diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json index f3d0aa4179..37e129f1f2 100644 --- a/keyboards/matrix/cain_re/info.json +++ b/keyboards/matrix/cain_re/info.json @@ -13,7 +13,19 @@ "brightness_steps": 8, "led_count": 14, "sleep": true, - "led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3] + "led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3], + "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 + } }, "ws2812": { "pin": "E6" -- cgit v1.2.3