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/org60/config.h | 1 - keyboards/org60/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/org60') diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h index e2b275251d..8ad0b8935f 100644 --- a/keyboards/org60/config.h +++ b/keyboards/org60/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 20 // Number of LEDs #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json index 7ceeef8312..005c5b6648 100644 --- a/keyboards/org60/info.json +++ b/keyboards/org60/info.json @@ -17,6 +17,9 @@ "pin": "F5", "levels": 6 }, + "rgblight": { + "led_count": 20 + }, "ws2812": { "pin": "F6" }, -- cgit v1.2.3 From 1c9d0f0eec614a20cbf88c20c448ebfe69414ca8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 19 Jun 2023 08:33:45 +1000 Subject: Remove default `TAPPING_TERM` from keyboard config.h (#21284) --- keyboards/org60/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/org60') diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h index 8ad0b8935f..2b79ba9d0d 100644 --- a/keyboards/org60/config.h +++ b/keyboards/org60/config.h @@ -37,5 +37,3 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define TAPPING_TERM 200 -- 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/org60/config.h | 3 --- keyboards/org60/info.json | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'keyboards/org60') diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h index 2b79ba9d0d..3980b2fb71 100644 --- a/keyboards/org60/config.h +++ b/keyboards/org60/config.h @@ -29,9 +29,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 17 -#define RGBLIGHT_VAL_STEP 17 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json index 005c5b6648..bc922012f0 100644 --- a/keyboards/org60/info.json +++ b/keyboards/org60/info.json @@ -18,6 +18,7 @@ "levels": 6 }, "rgblight": { + "hue_steps": 10, "led_count": 20 }, "ws2812": { -- cgit v1.2.3 From 4137685f8eb3ecde7ba0158a78cd9c411ee05606 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 21 Jul 2023 09:27:55 +1000 Subject: backlight: split AVR PWM and timer drivers (#21540) --- keyboards/org60/info.json | 1 + 1 file changed, 1 insertion(+) (limited to 'keyboards/org60') diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json index bc922012f0..c1de3084ed 100644 --- a/keyboards/org60/info.json +++ b/keyboards/org60/info.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "backlight": { + "driver": "timer", "pin": "F5", "levels": 6 }, -- 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/org60/config.h | 13 ------------- keyboards/org60/info.json | 14 +++++++++++++- 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'keyboards/org60') diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h index 3980b2fb71..4e59694818 100644 --- a/keyboards/org60/config.h +++ b/keyboards/org60/config.h @@ -17,19 +17,6 @@ along with this program. If not, see . #pragma once -/* RGB Underglow - */ -#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 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json index c1de3084ed..2e45997524 100644 --- a/keyboards/org60/info.json +++ b/keyboards/org60/info.json @@ -20,7 +20,19 @@ }, "rgblight": { "hue_steps": 10, - "led_count": 20 + "led_count": 20, + "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": "F6" -- cgit v1.2.3