From abc09f9a59ad63b6e7b6bdaa051e4888c991777d Mon Sep 17 00:00:00 2001 From: Takeshi Nishio Date: Sun, 5 Nov 2023 09:50:02 +0900 Subject: [PATCH] Move RGBLED_NUM to data driven (qmk#21278) on V031 and V1, RGB Lighting is never enabled -> remove settings --- keyboards/nora/v01/config.h | 1 - keyboards/nora/v01/info.json | 1 + keyboards/nora/v03/config.h | 1 - keyboards/nora/v03/info.json | 1 + keyboards/nora/v03/keymaps/jpskenn/config.h | 4 ---- .../nora/v03/keymaps/jpskenn_full/config.h | 4 ---- .../v03/keymaps/jpskenn_full_midi/config.h | 4 ---- keyboards/nora/v031/config.h | 19 ------------------- keyboards/nora/v031/info.json | 3 --- .../nora/v031/keymaps/jpskenn_re/config.h | 16 ++++++---------- keyboards/nora/v031/keymaps/via_re/config.h | 9 ++------- keyboards/nora/v1/keymaps/jpskenn_fw/config.h | 13 +++---------- keyboards/nora/v1/keymaps/jpskenn_re/config.h | 18 ++++++++---------- keyboards/nora/v1/keymaps/via_fw/config.h | 9 ++------- keyboards/nora/v1/keymaps/via_re/config.h | 9 ++------- 15 files changed, 25 insertions(+), 87 deletions(-) diff --git a/keyboards/nora/v01/config.h b/keyboards/nora/v01/config.h index fa0c074d0781..dc2773e64875 100644 --- a/keyboards/nora/v01/config.h +++ b/keyboards/nora/v01/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGBLIGHT */ - #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/nora/v01/info.json b/keyboards/nora/v01/info.json index d27ad063f15b..68124e266f20 100644 --- a/keyboards/nora/v01/info.json +++ b/keyboards/nora/v01/info.json @@ -19,6 +19,7 @@ "pin": "E6" }, "rgblight": { + "led_count": 16, "max_brightness": 240 }, "layouts": { diff --git a/keyboards/nora/v03/config.h b/keyboards/nora/v03/config.h index 6e6bf5960648..37dd7bcdf207 100644 --- a/keyboards/nora/v03/config.h +++ b/keyboards/nora/v03/config.h @@ -28,7 +28,6 @@ along with this program. If not, see . #define RGB_MATRIX_KEYPRESSES #else - #define RGBLED_NUM 71 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/nora/v03/info.json b/keyboards/nora/v03/info.json index 84c7ba898717..16476b379818 100644 --- a/keyboards/nora/v03/info.json +++ b/keyboards/nora/v03/info.json @@ -23,6 +23,7 @@ "max_brightness": 150 }, "rgblight": { + "led_count": 71, "max_brightness": 150 }, "layouts": { diff --git a/keyboards/nora/v03/keymaps/jpskenn/config.h b/keyboards/nora/v03/keymaps/jpskenn/config.h index 82f55626ef49..4083f7d0ff5b 100644 --- a/keyboards/nora/v03/keymaps/jpskenn/config.h +++ b/keyboards/nora/v03/keymaps/jpskenn/config.h @@ -16,9 +16,5 @@ #pragma once -// Change LED count to actually installed. -#undef RGBLED_NUM -#define RGBLED_NUM 2 - #define RGBLIGHT_LAYER_BLINK #define RGBLIGHT_MAX_LAYERS 10 // Blinkで2レイヤー追加すると、デフォルトの8レイヤーを超えてしまうため、ここで定義 diff --git a/keyboards/nora/v03/keymaps/jpskenn_full/config.h b/keyboards/nora/v03/keymaps/jpskenn_full/config.h index 83783f8cca0c..7511dc010383 100644 --- a/keyboards/nora/v03/keymaps/jpskenn_full/config.h +++ b/keyboards/nora/v03/keymaps/jpskenn_full/config.h @@ -16,10 +16,6 @@ #pragma once -// Change LED count to actually installed. -#undef RGBLED_NUM -#define RGBLED_NUM 2 - #define RGBLIGHT_LAYER_BLINK #define RGBLIGHT_MAX_LAYERS 10 // Blinkで2レイヤー追加すると、デフォルトの8レイヤーを超えてしまうため、ここで定義 diff --git a/keyboards/nora/v03/keymaps/jpskenn_full_midi/config.h b/keyboards/nora/v03/keymaps/jpskenn_full_midi/config.h index fd0551b3c080..3057d0a48f5a 100644 --- a/keyboards/nora/v03/keymaps/jpskenn_full_midi/config.h +++ b/keyboards/nora/v03/keymaps/jpskenn_full_midi/config.h @@ -16,10 +16,6 @@ #pragma once -// Change LED count to actually installed. -#undef RGBLED_NUM -#define RGBLED_NUM 2 - #define RGBLIGHT_LAYER_BLINK #define RGBLIGHT_MAX_LAYERS 10 // Blinkで2レイヤー追加すると、デフォルトの8レイヤーを超えてしまうため、ここで定義 diff --git a/keyboards/nora/v031/config.h b/keyboards/nora/v031/config.h index 66a9befc5967..eaed895635c3 100644 --- a/keyboards/nora/v031/config.h +++ b/keyboards/nora/v031/config.h @@ -106,25 +106,6 @@ along with this program. If not, see . #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif -#ifdef RGBLIGHT_ENABLE - /* RGB Lighting */ - #define RGBLED_NUM 64 - - #define RGBLIGHT_DEFAULT_VAL 40 - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - /* Lighting Layers */ - #define RGBLIGHT_LAYERS - #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status - #define RGBLIGHT_LAYERS_RETAIN_VAL // Keeps RGB values between lighting layer changes - #define RGBLIGHT_MAX_LAYERS 10 // default: 8 - #define RGBLIGHT_LAYER_BLINK - /* Animations & Effects */ - #define RGBLIGHT_ANIMATIONS - #define RGBLIGHT_EFFECT_TWINKLE -#endif - /* External EEPROM */ // Use 24LC64 EEPROM #define EEPROM_I2C_24LC64 diff --git a/keyboards/nora/v031/info.json b/keyboards/nora/v031/info.json index cbac692c0ebd..075eaab3ef2d 100644 --- a/keyboards/nora/v031/info.json +++ b/keyboards/nora/v031/info.json @@ -22,9 +22,6 @@ "driver": "ws2812", "max_brightness": 128 }, - "rgblight": { - "max_brightness": 128 - }, "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B2"} diff --git a/keyboards/nora/v031/keymaps/jpskenn_re/config.h b/keyboards/nora/v031/keymaps/jpskenn_re/config.h index 411c34a5a16a..47fffade72d8 100644 --- a/keyboards/nora/v031/keymaps/jpskenn_re/config.h +++ b/keyboards/nora/v031/keymaps/jpskenn_re/config.h @@ -17,14 +17,10 @@ #pragma once // Change number of LEDs for "RE layout". -#ifdef RGB_MATRIX_ENABLE - #undef RGB_MATRIX_LED_COUNT - #define RGB_MATRIX_LED_COUNT 65 -#else - #undef RGBLED_NUM - #define RGBLED_NUM 65 -#endif +#undef RGB_MATRIX_LED_COUNT +#define RGB_MATRIX_LED_COUNT 65 -#ifdef RGB_MATRIX_ENABLE - #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -#endif +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#undef ENABLE_RGB_MATRIX_MULTISPLASH diff --git a/keyboards/nora/v031/keymaps/via_re/config.h b/keyboards/nora/v031/keymaps/via_re/config.h index 12a06b230665..67afde6d6a92 100644 --- a/keyboards/nora/v031/keymaps/via_re/config.h +++ b/keyboards/nora/v031/keymaps/via_re/config.h @@ -17,10 +17,5 @@ #pragma once // Change number of LEDs for "RE layout". -#ifdef RGB_MATRIX_ENABLE - #undef RGB_MATRIX_LED_COUNT - #define RGB_MATRIX_LED_COUNT 65 -#else - #undef RGBLED_NUM - #define RGBLED_NUM 65 -#endif +#undef RGB_MATRIX_LED_COUNT +#define RGB_MATRIX_LED_COUNT 65 diff --git a/keyboards/nora/v1/keymaps/jpskenn_fw/config.h b/keyboards/nora/v1/keymaps/jpskenn_fw/config.h index 308000149d79..696f9bdae79a 100644 --- a/keyboards/nora/v1/keymaps/jpskenn_fw/config.h +++ b/keyboards/nora/v1/keymaps/jpskenn_fw/config.h @@ -16,17 +16,10 @@ #pragma once -#ifdef RGB_MATRIX_ENABLE - #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -#endif +#undef RGB_MATRIX_LED_COUNT +#define RGB_MATRIX_LED_COUNT 64 -#ifdef RGB_MATRIX_ENABLE - #undef RGB_MATRIX_LED_COUNT - #define RGB_MATRIX_LED_COUNT 64 -#else - #undef RGBLED_NUM - #define RGBLED_NUM 64 -#endif +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // LED index for DM_RECx indicator // NOTE: LED on R4 is connected from right to left. So, the index is inverted. diff --git a/keyboards/nora/v1/keymaps/jpskenn_re/config.h b/keyboards/nora/v1/keymaps/jpskenn_re/config.h index a98726d94ad3..4c42dfd805eb 100644 --- a/keyboards/nora/v1/keymaps/jpskenn_re/config.h +++ b/keyboards/nora/v1/keymaps/jpskenn_re/config.h @@ -17,14 +17,12 @@ #pragma once // Change number of LEDs for "RE layout". -#ifdef RGB_MATRIX_ENABLE - #undef RGB_MATRIX_LED_COUNT - #define RGB_MATRIX_LED_COUNT 62 -#else - #undef RGBLED_NUM - #define RGBLED_NUM 62 -#endif +#undef RGB_MATRIX_LED_COUNT +#define RGB_MATRIX_LED_COUNT 62 -#ifdef RGB_MATRIX_ENABLE - #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -#endif +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE + +// LED index for DM_RECx indicator +// NOTE: LED on R4 is connected from right to left. So, the index is inverted. +#define LED_INDEX_R4_LEFT_INSIDE 49 +#define LED_INDEX_R4_RIGHT_INSIDE 48 diff --git a/keyboards/nora/v1/keymaps/via_fw/config.h b/keyboards/nora/v1/keymaps/via_fw/config.h index 97f929633760..eed508029097 100644 --- a/keyboards/nora/v1/keymaps/via_fw/config.h +++ b/keyboards/nora/v1/keymaps/via_fw/config.h @@ -17,10 +17,5 @@ along with this program. If not, see . #pragma once -#ifdef RGB_MATRIX_ENABLE - #undef RGB_MATRIX_LED_COUNT - #define RGB_MATRIX_LED_COUNT 64 -#else - #undef RGBLED_NUM - #define RGBLED_NUM 64 -#endif +#undef RGB_MATRIX_LED_COUNT +#define RGB_MATRIX_LED_COUNT 64 diff --git a/keyboards/nora/v1/keymaps/via_re/config.h b/keyboards/nora/v1/keymaps/via_re/config.h index 944385979675..cfd09483119a 100644 --- a/keyboards/nora/v1/keymaps/via_re/config.h +++ b/keyboards/nora/v1/keymaps/via_re/config.h @@ -18,10 +18,5 @@ along with this program. If not, see . #pragma once // Change number of LEDs for "RE layout". -#ifdef RGB_MATRIX_ENABLE - #undef RGB_MATRIX_LED_COUNT - #define RGB_MATRIX_LED_COUNT 62 -#else - #undef RGBLED_NUM - #define RGBLED_NUM 62 -#endif +#undef RGB_MATRIX_LED_COUNT +#define RGB_MATRIX_LED_COUNT 62