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/noah/config.h | 1 - keyboards/matrix/noah/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/matrix/noah') diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h index 5a74ab5206..05b2a0a5f1 100644 --- a/keyboards/matrix/noah/config.h +++ b/keyboards/matrix/noah/config.h @@ -75,7 +75,6 @@ # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH /* indicator rgb */ -#define RGBLED_NUM 7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json index 33dedc6bce..67c5fe0221 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/info.json @@ -8,6 +8,9 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "rgblight": { + "led_count": 7 + }, "ws2812": { "pin": "B1" }, -- 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/matrix/noah/config.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'keyboards/matrix/noah') diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h index 05b2a0a5f1..4a3e4d83c9 100644 --- a/keyboards/matrix/noah/config.h +++ b/keyboards/matrix/noah/config.h @@ -85,9 +85,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - - -// tapping setting -//#define TAPPING_TERM 200 -//#define RETRO_TAPPING -//#define PERMISSIVE_HOLD -- cgit v1.2.3 From 7ff80a57cbe57e888646c3b90e2f4f9dea977156 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 3 Jul 2023 04:24:22 +1000 Subject: Get rid of `USB_LED_SCROLL_LOCK` (#21405) --- keyboards/matrix/noah/noah.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/matrix/noah') diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c index 671d272d85..0969998fa9 100644 --- a/keyboards/matrix/noah/noah.c +++ b/keyboards/matrix/noah/noah.c @@ -32,14 +32,14 @@ void rgblight_set(void) { } } if (noah_led_mode) { - uint8_t ind_led = host_keyboard_leds(); - if (IS_LED_ON(ind_led, USB_LED_CAPS_LOCK)) { + led_t led_state = host_keyboard_led_state(); + if (led_state.caps_lock) { noah_leds[0] = led[0]; } - if (IS_LED_ON(ind_led, USB_LED_SCROLL_LOCK)) { + if (led_state.scroll_lock) { noah_leds[1] = led[1]; } - if (IS_LED_ON(ind_led, USB_LED_NUM_LOCK)) { + if (led_state.num_lock) { noah_leds[2] = led[2]; } for (int32_t i = 0; i < 4; i++) { -- cgit v1.2.3 From 1c069b13b9c410d30cb3b0126b21b984284c405c Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 15 Aug 2023 20:06:57 +1000 Subject: rgblight: driver selection cleanups (#21558) --- keyboards/matrix/noah/info.json | 1 + keyboards/matrix/noah/rules.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/matrix/noah') diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json index 67c5fe0221..4550f7d70a 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "rgblight": { + "driver": "custom", "led_count": 7 }, "ws2812": { diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk index 55ea2f42b0..3b75264222 100644 --- a/keyboards/matrix/noah/rules.mk +++ b/keyboards/matrix/noah/rules.mk @@ -27,7 +27,6 @@ NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in RGB_MATRIX_ENABLE = yes RGBLIGHT_ENABLE = yes -RGBLIGHT_CUSTOM_DRIVER = yes WS2812_DRIVER_REQUIRED = yes CUSTOM_MATRIX = yes -- 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/matrix/noah/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/matrix/noah') diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json index 4550f7d70a..192be4a9b5 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/info.json @@ -16,7 +16,7 @@ "pin": "B1" }, "rgb_matrix": { - "driver": "IS31FL3731" + "driver": "is31fl3731" }, "community_layouts": ["65_iso_blocker"], "layouts": { -- 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/noah/config.h | 12 ------------ keyboards/matrix/noah/info.json | 14 +++++++++++++- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'keyboards/matrix/noah') diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h index 4a3e4d83c9..452fef4cee 100644 --- a/keyboards/matrix/noah/config.h +++ b/keyboards/matrix/noah/config.h @@ -73,15 +73,3 @@ # define ENABLE_RGB_MATRIX_MULTISPLASH # define ENABLE_RGB_MATRIX_SOLID_SPLASH # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - -/* indicator rgb */ -#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/matrix/noah/info.json b/keyboards/matrix/noah/info.json index 192be4a9b5..507c36120e 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/info.json @@ -10,7 +10,19 @@ }, "rgblight": { "driver": "custom", - "led_count": 7 + "led_count": 7, + "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": "B1" -- cgit v1.2.3