Change DRIVER_LED_COUNT to {LED,RGB}_MATRIX_LED_COUNT (#18399)
				
					
				
			This commit is contained in:
		
							parent
							
								
									d967de0df7
								
							
						
					
					
						commit
						36c410592d
					
				
					 577 changed files with 836 additions and 831 deletions
				
			
		| 
						 | 
				
			
			@ -22,7 +22,7 @@
 | 
			
		|||
  #ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
  #undef RGBLED_NUM
 | 
			
		||||
  #define RGBLED_NUM 50
 | 
			
		||||
  #define DRIVER_LED_TOTAL RGBLED_NUM
 | 
			
		||||
  #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 | 
			
		||||
  #endif // RGBL_MATRIX_ENABLE
 | 
			
		||||
#endif // KEYBOARD_lazydesigners_dimple
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
#include "dz60rgb.h"
 | 
			
		||||
#include "config.h"
 | 
			
		||||
#if defined (dzrgb60_iso)
 | 
			
		||||
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 | 
			
		||||
const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 | 
			
		||||
    {0, K_14,   J_14,   L_14},
 | 
			
		||||
    {0, K_13,   J_13,   L_13},
 | 
			
		||||
    {0, K_12,   J_12,   L_12},
 | 
			
		||||
| 
						 | 
				
			
			@ -86,7 +86,7 @@ led_config_t g_led_config = { {
 | 
			
		|||
} };
 | 
			
		||||
 | 
			
		||||
#elif defined (dzrgb60_hhkb)
 | 
			
		||||
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 | 
			
		||||
const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 | 
			
		||||
	{0, H_15,   G_15,   I_15},
 | 
			
		||||
    {0, K_14,   J_14,   L_14},
 | 
			
		||||
    {0, K_13,   J_13,   L_13},
 | 
			
		||||
| 
						 | 
				
			
			@ -172,7 +172,7 @@ led_config_t g_led_config = { {
 | 
			
		|||
} };
 | 
			
		||||
 | 
			
		||||
#elif defined (dzrgb60_hhkb_iso)
 | 
			
		||||
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 | 
			
		||||
const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 | 
			
		||||
	{0, H_15,   G_15,   I_15},
 | 
			
		||||
    {0, K_14,   J_14,   L_14},
 | 
			
		||||
    {0, K_13,   J_13,   L_13},
 | 
			
		||||
| 
						 | 
				
			
			@ -258,7 +258,7 @@ led_config_t g_led_config = { {
 | 
			
		|||
} };
 | 
			
		||||
 | 
			
		||||
#elif defined (dzrgb60_ansi)
 | 
			
		||||
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 | 
			
		||||
const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 | 
			
		||||
    {0, K_14,   J_14,   L_14},
 | 
			
		||||
    {0, K_13,   J_13,   L_13},
 | 
			
		||||
    {0, K_12,   J_12,   L_12},
 | 
			
		||||
| 
						 | 
				
			
			@ -343,7 +343,7 @@ led_config_t g_led_config = { {
 | 
			
		|||
} };
 | 
			
		||||
 | 
			
		||||
#else
 | 
			
		||||
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 | 
			
		||||
const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 | 
			
		||||
    {0, K_14,   J_14,   L_14},
 | 
			
		||||
    {0, K_13,   J_13,   L_13},
 | 
			
		||||
    {0, K_12,   J_12,   L_12},
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -58,7 +58,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
 | 
			
		|||
            uint16_t time = scale16by8(g_rgb_counters.tick, speed / 8);
 | 
			
		||||
            hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
 | 
			
		||||
            RGB rgb       = hsv_to_rgb(hsv);
 | 
			
		||||
            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
 | 
			
		||||
            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
 | 
			
		||||
                if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
 | 
			
		||||
                    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
 | 
			
		||||
                }
 | 
			
		||||
| 
						 | 
				
			
			@ -68,7 +68,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
 | 
			
		|||
        default:  // Solid Color
 | 
			
		||||
        {
 | 
			
		||||
            RGB rgb = hsv_to_rgb(hsv);
 | 
			
		||||
            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
 | 
			
		||||
            for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
 | 
			
		||||
                if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
 | 
			
		||||
                    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
 | 
			
		||||
                }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue