Change DRIVER_LED_COUNT to {LED,RGB}_MATRIX_LED_COUNT (#18399)

This commit is contained in:
Ryan
2022-09-23 22:46:23 +10:00
committed by GitHub
parent d967de0df7
commit 36c410592d
577 changed files with 836 additions and 831 deletions

View File

@@ -38,7 +38,7 @@
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN E2
#define DRIVER_LED_TOTAL 53
#define RGB_MATRIX_LED_COUNT 53
#ifdef RGB_DI_PIN
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value

View File

@@ -54,7 +54,7 @@
// If RGBLight is enabled
#ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM DRIVER_LED_TOTAL
# define RGBLED_NUM RGB_MATRIX_LED_COUNT
# define RGBLIGHT_EFFECT_SNAKE
# define RGBLIGHT_EFFECT_STATIC_GRADIENT

View File

@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
#define LAYER (get_highest_layer(layer_state))
#define LAYER_SIZE (MATRIX_ROWS * MATRIX_COLS)
#define CHECK_LED() \
if ((i >= DRIVER_LED_TOTAL) \
if ((i >= RGB_MATRIX_LED_COUNT) \
|| ((g_led_config.flags[pos] == LED_FLAG_NONE) || (g_led_config.flags[pos] == LED_FLAG_UNDERGLOW))) \
continue
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef UNDERGLOW_DISABLE
void keyboard_pre_init_user(void) {
for (int key_id = 0; key_id < DRIVER_LED_TOTAL; key_id++ ) {
for (int key_id = 0; key_id < RGB_MATRIX_LED_COUNT; key_id++ ) {
if (g_led_config.flags[key_id] == LED_FLAG_UNDERGLOW) {
g_led_config.flags[key_id] = LED_FLAG_NONE;
}

View File

@@ -69,7 +69,7 @@ void matrix_scan_user(void) {
void rgb_matrix_indicators_user(void) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
rgb_matrix_set_color(i, 0, 0, 0);
}
@@ -80,7 +80,7 @@ void rgb_matrix_indicators_user(void) {
//capslock
if (host_keyboard_led_state().caps_lock) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
rgb_matrix_set_color(i, 255, 255, 255);
}
@@ -89,7 +89,7 @@ void rgb_matrix_indicators_user(void) {
//nav layer
if (IS_LAYER_ON(NAVR)) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
rgb_matrix_set_color(i, 0, 204, 255);
}
@@ -98,7 +98,7 @@ void rgb_matrix_indicators_user(void) {
//funl layer
if (IS_LAYER_ON(FUNL)) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
rgb_matrix_set_color(i, 255, 0, 0);
}
@@ -107,7 +107,7 @@ void rgb_matrix_indicators_user(void) {
//nsl layer
if (IS_LAYER_ON(NSL)) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
rgb_matrix_set_color(i, 51, 0, 255);
}
@@ -116,7 +116,7 @@ void rgb_matrix_indicators_user(void) {
//nssl layer
if (IS_LAYER_ON(NSSL)) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
rgb_matrix_set_color(i, 0, 255, 0);
}
@@ -125,7 +125,7 @@ void rgb_matrix_indicators_user(void) {
//game layer
if (IS_LAYER_ON(GAME)) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
rgb_matrix_set_color(i, 0, 204, 255);
}
@@ -134,7 +134,7 @@ void rgb_matrix_indicators_user(void) {
//secgame layer
if (IS_LAYER_ON(SECGAME)) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
rgb_matrix_set_color(i, 255, 0, 0);
}

View File

@@ -69,7 +69,7 @@ void matrix_scan_user(void) {
void rgb_matrix_indicators_user(void) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
rgb_matrix_set_color(i, 0, 0, 0);
}
@@ -80,7 +80,7 @@ void rgb_matrix_indicators_user(void) {
//capslock
if (host_keyboard_led_state().caps_lock) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
rgb_matrix_set_color(i, 255, 255, 255);
}
@@ -89,7 +89,7 @@ void rgb_matrix_indicators_user(void) {
//game layer
if (IS_LAYER_ON(GAME)) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
rgb_matrix_set_color(i, 0, 204, 255);
}
@@ -98,7 +98,7 @@ void rgb_matrix_indicators_user(void) {
//secgame layer
if (IS_LAYER_ON(SECGAME)) {
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
rgb_matrix_set_color(i, 255, 0, 0);
}

View File

@@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN E2
#define DRIVER_LED_TOTAL 69
#define RGB_MATRIX_LED_COUNT 69
#ifdef RGB_DI_PIN
# define RGBLED_NUM 69
# define RGB_MATRIX_KEYPRESSES

View File

@@ -100,7 +100,7 @@
#define DRIVER_COUNT 2
#define DRIVER_1_LED_TOTAL 63
//#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
//#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
#define RGB_MATRIX_DISABLE_KEYCODES
@@ -118,7 +118,7 @@
# define WS2812_LED_TOTAL 6
#endif
#define DRIVER_LED_TOTAL (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
#define RGB_MATRIX_LED_COUNT (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_KEYPRESSES

View File

@@ -22,7 +22,7 @@
# include "is31fl3733.h"
# include "ws2812.h"
const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{ 0, B_1, A_1, C_1 },
{ 0, B_2, A_2, C_2 },
{ 0, B_3, A_3, C_3 },

View File

@@ -43,7 +43,7 @@
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN E2
#define DRIVER_LED_TOTAL 69
#define RGB_MATRIX_LED_COUNT 69
#ifdef RGB_DI_PIN
#define RGBLED_NUM 69
#define RGB_MATRIX_KEYPRESSES

View File

@@ -67,7 +67,7 @@
# define DRIVER_ADDR_1 0b1010000
# define DRIVER_COUNT 2
# define DRIVER_1_LED_TOTAL 63
# define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
# define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
#define RGB_MATRIX_KEYPRESSES
// RGB Matrix Animation modes. Explicitly enabled

View File

@@ -15,7 +15,7 @@
#include "rev2.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{ 0, B_1, A_1, C_1 },
{ 0, B_2, A_2, C_2 },
{ 0, B_3, A_3, C_3 },

View File

@@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN E2
#define DRIVER_LED_TOTAL 70
#define RGB_MATRIX_LED_COUNT 70
#ifdef RGB_DI_PIN
# define RGBLED_NUM 70
# define RGB_MATRIX_KEYPRESSES

View File

@@ -137,7 +137,7 @@
# define WS2812_LED_TOTAL RGBLED_NUM
#endif
#define DRIVER_LED_TOTAL (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
#define RGB_MATRIX_LED_COUNT (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_KEYPRESSES

View File

@@ -24,7 +24,7 @@
# include "ws2812.h"
const PROGMEM is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
const PROGMEM is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{ 0, B_1, A_1, C_1 },
{ 0, B_2, A_2, C_2 },
{ 0, B_3, A_3, C_3 },

View File

@@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN E2
#define DRIVER_LED_TOTAL 67
#define RGB_MATRIX_LED_COUNT 67
#ifdef RGB_DI_PIN
#define RGBLED_NUM 67
#define RGB_MATRIX_KEYPRESSES

View File

@@ -109,7 +109,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
rgb_matrix_set_color( i, red, green, blue );
}

View File

@@ -133,7 +133,7 @@
# define WS2812_LED_TOTAL RGBLED_NUM
#endif
#define DRIVER_LED_TOTAL (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
#define RGB_MATRIX_LED_COUNT (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_KEYPRESSES

View File

@@ -21,7 +21,7 @@
# include "is31fl3733.h"
# include "ws2812.h"
const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{ 0, B_1, A_1, C_1 },
{ 0, B_2, A_2, C_2 },
{ 0, B_3, A_3, C_3 },

View File

@@ -46,7 +46,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// The pin connected to the data pin of the LEDs
#define RGB_DI_PIN E2
// The number of LEDs connected
#define DRIVER_LED_TOTAL 73
#define RGB_MATRIX_LED_COUNT 73
#ifdef RGB_DI_PIN
#define RGBLED_NUM 73
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses

View File

@@ -423,7 +423,7 @@ void set_layer_color(int layer) {
}
// non key specific lighting instead led flag based
if (layer == _LVL7_){
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
set_led_color_by_hsv(i, C_HSV_DARKGOLD);
}

View File

@@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN E2
#define DRIVER_LED_TOTAL 74
#define RGB_MATRIX_LED_COUNT 74
#ifdef RGB_DI_PIN
#define RGBLED_NUM 74
#define RGB_MATRIX_KEYPRESSES

View File

@@ -46,7 +46,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// The pin connected to the data pin of the LEDs
#define RGB_DI_PIN E2
// The number of LEDs connected
#define DRIVER_LED_TOTAL 74
#define RGB_MATRIX_LED_COUNT 74
#ifdef RGB_DI_PIN
# define RGBLED_NUM 74
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses

View File

@@ -64,7 +64,7 @@
// #define RGBLIGHT_VAL_STEP 12 // Units to step when in/decreasing value (brightness)
// #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
// #define RGBLIGHT_ANIMATIONS // Run RGB animations
// #define RGBLIGHT_ANIMATIONS // Enable all additional animation modes.

View File

@@ -56,7 +56,7 @@ Templete
#undef _______
#define _______ {0, 0, 0}
const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
[1] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
GREEN, BLUE, {0, 0, 255}, PURPLE, AZURE, _______, {0, 0, 255}, {0, 0, 255}, {0, 0, 255}, _______, _______, _______, _______, _______, _______,
@@ -270,7 +270,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
void set_layer_color(int layer) {
if (layer == 0) { return; }
for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
HSV hsv = {
.h = pgm_read_byte(&ledmap[layer][i][0]),
.s = pgm_read_byte(&ledmap[layer][i][1]),

View File

@@ -55,7 +55,7 @@
#define DRIVER_COUNT 1
#define DRIVER_1_LED_TOTAL 68
#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
#define DRIVER_INDICATOR_LED_TOTAL 0
#ifdef RGB_MATRIX_ENABLE

View File

@@ -17,7 +17,7 @@
#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{0, CS6_SW1, CS5_SW1, CS4_SW1},
{0, CS6_SW2, CS5_SW2, CS4_SW2},
{0, CS6_SW3, CS5_SW3, CS4_SW3},

View File

@@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN E2
// The number of LEDs connected
#define DRIVER_LED_TOTAL 87
#define RGB_MATRIX_LED_COUNT 87
#ifdef RGB_DI_PIN
#define RGBLED_NUM 87
@@ -56,7 +56,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
//#define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
//#define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
// #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set

View File

@@ -46,7 +46,7 @@
// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
// #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
// #define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)

View File

@@ -16,7 +16,7 @@
#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{0, CS6_SW1, CS5_SW1, CS4_SW1},
{0, CS6_SW3, CS5_SW3, CS4_SW3},
{0, CS6_SW4, CS5_SW4, CS4_SW4},

View File

@@ -70,6 +70,6 @@
#define DRIVER_ADDR_1 0b0110000
#define DRIVER_COUNT 1
#define DRIVER_1_LED_TOTAL 87
#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180

View File

@@ -16,7 +16,7 @@
#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{0, CS6_SW1, CS5_SW1, CS4_SW1},
{0, CS6_SW3, CS5_SW3, CS4_SW3},
{0, CS6_SW4, CS5_SW4, CS4_SW4},

View File

@@ -71,6 +71,6 @@
#define DRIVER_ADDR_1 0b0110000
#define DRIVER_COUNT 1
#define DRIVER_1_LED_TOTAL 88
#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180

View File

@@ -56,7 +56,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN B0
// The number of LEDs connected
#define DRIVER_LED_TOTAL 98
#define RGB_MATRIX_LED_COUNT 98
//#ifdef RGB_DI_PIN
# define RGBLED_NUM 98
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses