Updated rgb_led struct field modifier to flags (#5619)

Updated effects to test led flags
Updated massdrop to use new flags field for led toggle

6 files changed, 194 insertions, 199 deletions

diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
index a6825e750f..10b2ea7a83 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.c
+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
@@ -64,7 +64,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, H_16,   G_16,   I_16},
     {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(13<<4)},   {16*13.5,  0}, 1},
     {{0|(12<<4)},   {16*12,  0}, 1},
     {{0|(11<<4)},   {16*11,  0}, 1},
@@ -80,49 +81,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(1<<4)},    {16*1,  0}, 1},
     {{0|(0<<4)},    {16*0,  0}, 1},
 	{{2|(13<<4)},   {16*13.75, 24}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
     {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{1|(13<<4)},   {16*12.75,  32}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
     {{2|(0<<4)},    { 16*0.375,  32}, 1},
     {{3|(11<<4)},   {16*13.125,  48}, 1},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
     {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.875,  64}, 1},
     {{4|(11<<4)},   {16*12.625,  64}, 1},
     {{4|(10<<4)},   {16*11.375,  64}, 1},
     {{4|(9<<4)},    {16*10.125,  64}, 1},
-    {{4|(5<<4)},    { 16*6.375,  64}, 0},
+    {{4|(5<<4)},    { 16*6.375,  64}, 4},
     {{4|(2<<4)},    { 16*2.625,  64}, 1},
     {{4|(1<<4)},    { 16*1.375,  64}, 1},
     {{4|(0<<4)},    { 16*0.125,  64}, 1},
@@ -192,7 +193,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, H_16,   G_16,   I_16},
     {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 	{{2|(12<<4)},   {16*14,  0}, 1},
     {{0|(13<<4)},   {16*13,  0}, 1},
     {{0|(12<<4)},   {16*12,  0}, 1},
@@ -209,49 +211,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(1<<4)},    {16*1,  0}, 1},
     {{0|(0<<4)},    {16*0,  0}, 1},
 	{{1|(13<<4)},   {16*13.75, 16}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
     {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{2|(13<<4)},   {16*12.75,  32}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
     {{2|(0<<4)},    { 16*0.375,  32}, 1},
     {{3|(13<<4)},   {16*14,     48}, 1},
-    {{3|(11<<4)},   {16*12.625, 48}, 0},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(11<<4)},   {16*12.625, 48}, 4},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
     {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.625,  64}, 1},
     {{4|(11<<4)},   {16*12.375,  64}, 1},
     {{4|(10<<4)},   {16*11.125,  64}, 1},
-    {{4|(5<<4)},    { 16*7,      64}, 0},
+    {{4|(5<<4)},    { 16*7,      64}, 4},
     {{4|(2<<4)},    { 16*2.875,  64}, 1},
     {{4|(1<<4)},    { 16*1.625,  64}, 1},
     {{4|(0<<4)},    { 16*0.375,  64}, 1},
@@ -321,7 +323,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, H_16,   G_16,   I_16},
     {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 	{{2|(12<<4)},   {16*14,  0}, 1},
     {{0|(13<<4)},   {16*13,  0}, 1},
     {{0|(12<<4)},   {16*12,  0}, 1},
@@ -338,49 +341,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(1<<4)},    {16*1,  0}, 1},
     {{0|(0<<4)},    {16*0,  0}, 1},
 	{{2|(13<<4)},   {16*13.75, 24}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
     {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{1|(13<<4)},   {16*12.75,  32}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
     {{2|(0<<4)},    { 16*0.375,  32}, 1},
     {{3|(13<<4)},   {16*14,     48}, 1},
-    {{3|(11<<4)},   {16*12.625, 48}, 0},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(11<<4)},   {16*12.625, 48}, 4},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
     {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.625,  64}, 1},
     {{4|(11<<4)},   {16*12.375,  64}, 1},
     {{4|(10<<4)},   {16*11.125,  64}, 1},
-    {{4|(5<<4)},    { 16*7,      64}, 0},
+    {{4|(5<<4)},    { 16*7,      64}, 4},
     {{4|(2<<4)},    { 16*2.875,  64}, 1},
     {{4|(1<<4)},    { 16*1.625,  64}, 1},
     {{4|(0<<4)},    { 16*0.375,  64}, 1},
@@ -449,7 +452,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, H_16,   G_16,   I_16},
     {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(13<<4)},   {16*13.5,  0}, 1},
     {{0|(12<<4)},   {16*12,  0}, 1},
     {{0|(11<<4)},   {16*11,  0}, 1},
@@ -465,49 +469,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(1<<4)},    {16*1,  0}, 1},
     {{0|(0<<4)},    {16*0,  0}, 1},
 	{{1|(13<<4)},   {16*13.75, 16}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
     {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{2|(13<<4)},   {16*13.375,  24}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
     {{2|(0<<4)},    { 16*0.375,  32}, 1},
     {{3|(11<<4)},   {16*13.125,  48}, 1},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
     {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.875,  64}, 1},
     {{4|(11<<4)},   {16*12.625,  64}, 1},
     {{4|(10<<4)},   {16*11.375,  64}, 1},
     {{4|(9<<4)},    {16*10.125,  64}, 1},
-    {{4|(5<<4)},    { 16*6.375,  64}, 0},
+    {{4|(5<<4)},    { 16*6.375,  64}, 4},
     {{4|(2<<4)},    { 16*2.625,  64}, 1},
     {{4|(1<<4)},    { 16*1.375,  64}, 1},
     {{4|(0<<4)},    { 16*0.125,  64}, 1},
@@ -578,7 +582,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, H_16,   G_16,   I_16},
     {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(13<<4)},   {17.23*13,  0}, 1},
     {{0|(12<<4)},   {17.23*12,  0}, 1},
     {{0|(11<<4)},   {17.23*11,  0}, 1},
@@ -594,51 +599,51 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(1<<4)},    { 17.23*1,  0}, 1},
     {{0|(0<<4)},    { 17.23*0,  0}, 1},
 	{{1|(13<<4)},   {17.23*13,  16}, 1},
-    {{1|(12<<4)},   {17.23*12,  16}, 0},
-    {{1|(11<<4)},   {17.23*11,  16}, 0},
-    {{1|(10<<4)},   {17.23*10,  16}, 0},
-    {{1|(9<<4)},    {17.23*9,  16}, 0},
-    {{1|(8<<4)},    {17.23*8,  16}, 0},
-    {{1|(7<<4)},    {17.23*7,  16}, 0},
-	{{1|(6<<4)},    { 17.23*6,  16}, 0},
-    {{1|(5<<4)},    { 17.23*5,  16}, 0},
-    {{1|(4<<4)},    { 17.23*4,  16}, 0},
-    {{1|(3<<4)},    { 17.23*3,  16}, 0},
-    {{1|(2<<4)},    { 17.23*2,  16}, 0},
-    {{1|(1<<4)},    { 17.23*1,  16}, 0},
+    {{1|(12<<4)},   {17.23*12,  16}, 4},
+    {{1|(11<<4)},   {17.23*11,  16}, 4},
+    {{1|(10<<4)},   {17.23*10,  16}, 4},
+    {{1|(9<<4)},    {17.23*9,  16}, 4},
+    {{1|(8<<4)},    {17.23*8,  16}, 4},
+    {{1|(7<<4)},    {17.23*7,  16}, 4},
+	{{1|(6<<4)},    { 17.23*6,  16}, 4},
+    {{1|(5<<4)},    { 17.23*5,  16}, 4},
+    {{1|(4<<4)},    { 17.23*4,  16}, 4},
+    {{1|(3<<4)},    { 17.23*3,  16}, 4},
+    {{1|(2<<4)},    { 17.23*2,  16}, 4},
+    {{1|(1<<4)},    { 17.23*1,  16}, 4},
     {{1|(0<<4)},    { 17.23*0,  16}, 1},
 	{{2|(13<<4)},   {17.23*13,  32}, 1},
-    {{2|(11<<4)},   {17.23*11,  32}, 0},
-    {{2|(10<<4)},   {17.23*10,  32}, 0},
-    {{2|(9<<4)},    {17.23*9,  32}, 0},
-    {{2|(8<<4)},    {17.23*8,  32}, 0},
-    {{2|(7<<4)},    {17.23*7,  32}, 0},
-	{{2|(6<<4)},    { 17.23*6,  32}, 0},
-    {{2|(5<<4)},    { 17.23*5,  32}, 0},
-    {{2|(4<<4)},    { 17.23*4,  32}, 0},
-    {{2|(3<<4)},    { 17.23*3,  32}, 0},
-    {{2|(2<<4)},    { 17.23*2,  32}, 0},
-    {{2|(1<<4)},    { 17.23*1,  32}, 0},
+    {{2|(11<<4)},   {17.23*11,  32}, 4},
+    {{2|(10<<4)},   {17.23*10,  32}, 4},
+    {{2|(9<<4)},    {17.23*9,  32}, 4},
+    {{2|(8<<4)},    {17.23*8,  32}, 4},
+    {{2|(7<<4)},    {17.23*7,  32}, 4},
+	{{2|(6<<4)},    { 17.23*6,  32}, 4},
+    {{2|(5<<4)},    { 17.23*5,  32}, 4},
+    {{2|(4<<4)},    { 17.23*4,  32}, 4},
+    {{2|(3<<4)},    { 17.23*3,  32}, 4},
+    {{2|(2<<4)},    { 17.23*2,  32}, 4},
+    {{2|(1<<4)},    { 17.23*1,  32}, 4},
     {{2|(0<<4)},    { 17.23*0,  32}, 1},
 	{{3|(13<<4)},   {17.23*13,  48}, 1},
-    {{3|(11<<4)},   {17.23*11,  48}, 0},
-    {{3|(10<<4)},   {17.23*10,  48}, 0},
-    {{3|(9<<4)},    {17.23*9,  48}, 0},
-    {{3|(8<<4)},    {17.23*8,  48}, 0},
-    {{3|(7<<4)},    {17.23*7,  48}, 0},
-	{{3|(6<<4)},    { 17.23*6,  48}, 0},
-    {{3|(5<<4)},    { 17.23*5,  48}, 0},
-    {{3|(4<<4)},    { 17.23*4,  48}, 0},
-    {{3|(3<<4)},    { 17.23*3,  48}, 0},
-    {{3|(2<<4)},    { 17.23*2,  48}, 0},
-    {{3|(1<<4)},    { 17.23*1,  48}, 0},
+    {{3|(11<<4)},   {17.23*11,  48}, 4},
+    {{3|(10<<4)},   {17.23*10,  48}, 4},
+    {{3|(9<<4)},    {17.23*9,  48}, 4},
+    {{3|(8<<4)},    {17.23*8,  48}, 4},
+    {{3|(7<<4)},    {17.23*7,  48}, 4},
+	{{3|(6<<4)},    { 17.23*6,  48}, 4},
+    {{3|(5<<4)},    { 17.23*5,  48}, 4},
+    {{3|(4<<4)},    { 17.23*4,  48}, 4},
+    {{3|(3<<4)},    { 17.23*3,  48}, 4},
+    {{3|(2<<4)},    { 17.23*2,  48}, 4},
+    {{3|(1<<4)},    { 17.23*1,  48}, 4},
     {{3|(0<<4)},    { 17.23*0,  48}, 1},
 	{{4|(13<<4)},   {17.23*13,  64}, 1},
     {{4|(11<<4)},   {17.23*11,  64}, 1},
     {{4|(10<<4)},   {17.23*10,  64}, 1},
     {{4|(9<<4)},    {17.23*9,  64}, 1},
     {{4|(8<<4)},    {17.23*8,  64}, 1},
-    {{4|(5<<4)},    { 17.23*5,  64}, 0},
+    {{4|(5<<4)},    { 17.23*5,  64}, 4},
     {{4|(2<<4)},    { 17.23*2,  64}, 1},
     {{4|(1<<4)},    { 17.23*1,  64}, 1},
     {{4|(0<<4)},    { 17.23*0,  64}, 1},
diff --git a/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c b/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c
index fcdf29e4ee..741fc55fb9 100644
--- a/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c
@@ -42,10 +42,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
-      if (led.modifier) {
-          rgb_matrix_set_color( i, red, green, blue );
-      }
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
+        rgb_matrix_set_color( i, red, green, blue );
     }
   }
 }
diff --git a/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c b/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c
index 6ba3ac7e6c..1f3807c3b7 100644
--- a/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c
@@ -43,10 +43,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
-      if (led.modifier) {
-          rgb_matrix_set_color( i, red, green, blue );
-      }
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
+        rgb_matrix_set_color( i, red, green, blue );
     }
   }
 }
diff --git a/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c b/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c
index 772eddf07c..4575eb19d5 100644
--- a/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c
@@ -43,10 +43,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
-      if (led.modifier) {
-          rgb_matrix_set_color( i, red, green, blue );
-      }
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
+        rgb_matrix_set_color( i, red, green, blue );
     }
   }
 }
diff --git a/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c b/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c
index a78e23703b..5e38848035 100644
--- a/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/iso/keymap.c
@@ -42,10 +42,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
-      if (led.modifier) {
-          rgb_matrix_set_color( i, red, green, blue );
-      }
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
+        rgb_matrix_set_color( i, red, green, blue );
     }
   }
 }
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
index 2784f6fa67..3dfa783744 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
@@ -56,11 +56,9 @@ void rgb_matrix_layer_helper(uint8_t red, uint8_t green, uint8_t blue, bool defa
 	
 	for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
 		led = g_rgb_leds[i];
-		
-		if (led.matrix_co.raw < 0xFF) {
-			if (led.modifier) {
-				rgb_matrix_set_color(i, red, green, blue);
-			}
+
+		if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
+				rgb_matrix_set_color( i, red, green, blue );
 		}
 	}
 }