4 files changed, 87 insertions, 66 deletions

diff --git a/keyboards/dztech/dz65rgb/config.h b/keyboards/dztech/dz65rgb/config.h
index f4c1f1114..611e57d58 100644
--- a/keyboards/dztech/dz65rgb/config.h
+++ b/keyboards/dztech/dz65rgb/config.h
@@ -12,18 +12,35 @@
 #define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 }
 #define MATRIX_COL_PINS {A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14, C15 }
 #define DIODE_DIRECTION COL2ROW
-
+#ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define DEBOUNCE 3
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-
+#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN     
+#define DISABLE_RGB_MATRIX_BAND_SAT
+#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define DISABLE_RGB_MATRIX_SPLASH
+#define DISABLE_RGB_MATRIX_MULTISPLASH
+#define DISABLE_RGB_MATRIX_SOLID_SPLASH
+#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110111
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 35
 #define DRIVER_2_LED_TOTAL 33
 #define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+#endif
\ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c
index 766aea26c..8f095960d 100644
--- a/keyboards/dztech/dz65rgb/dz65rgb.c
+++ b/keyboards/dztech/dz65rgb/dz65rgb.c
@@ -1,98 +1,102 @@
 #include "dz65rgb.h"
+#ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
-        {0, C2_1,  C3_1,  C4_1},  // LA0
-        {0, C1_1,  C3_2, C4_2},   // LA1
-        {0, C1_2,  C2_2, C4_3},   // LA2
-        {0, C1_3,  C2_3, C3_3},   // LA3
-        {0, C1_4,  C2_4, C3_4},   // LA4
-        {0, C1_5,  C2_5, C3_5},   // LA5
-        {0, C1_6,  C2_6, C3_6},   // LA6
-        {0, C1_7,  C2_7, C3_7},   // LA7
-    {0, C1_8,  C2_8, C3_8},   // LA8
-        {0, C9_1,  C8_1,  C7_1},  // LA9
-        {0, C9_2,  C8_2, C7_2},   // LA10
-        {0, C9_3,  C8_3, C7_3},   // LA11
-        {0, C9_4,  C8_4, C7_4},   // LA12
-        {0, C9_5,  C8_5, C7_5},   // LA13
-        {0, C9_6,  C8_6, C7_6},   // LA14
-        {0, C9_7,  C8_7, C6_6},   // LA15
-        {0, C9_8,  C7_7, C6_7},   // LA16
+
         {0, C8_8,  C7_8, C6_8},   // LA17
+        {0, C9_8,  C7_7, C6_7},   // LA16
+        {0, C9_7,  C8_7, C6_6},   // LA15
+        {0, C9_6,  C8_6, C7_6},   // LA14
+        {0, C9_5,  C8_5, C7_5},   // LA13
+        {0, C9_4,  C8_4, C7_4},   // LA12
+        {0, C9_3,  C8_3, C7_3},   // LA11
+        {0, C9_2,  C8_2, C7_2},   // LA10
+        {0, C9_1,  C8_1,  C7_1},  // LA9
         {0, C2_9,  C3_9,  C4_9},  // LB0
         {0, C1_9,  C3_10, C4_10}, // LB1
         {0, C1_10, C2_10, C4_11}, // LB2
         {0, C1_11, C2_11, C3_11}, // LB3
-  //{0, C1_12, C2_12, C3_12}, // LB4
         {0, C1_13, C2_13, C3_13}, // LB5
         {0, C1_14, C2_14, C3_14}, // LB6
-        {0, C1_15, C2_15, C3_15}, // LB7
-        {0, C1_16, C2_16, C3_16}, // LB8
+
+        {0, C1_7,  C2_7, C3_7},   // LA7
+        {0, C1_6,  C2_6, C3_6},   // LA6
+        {0, C1_5,  C2_5, C3_5},   // LA5
+        {0, C1_4,  C2_4, C3_4},   // LA4
+        {0, C1_3,  C2_3, C3_3},   // LA3
+        {0, C1_2,  C2_2, C4_3},   // LA2
+        {0, C1_1,  C3_2, C4_2},   // LA1
+        {0, C2_1,  C3_1,  C4_1},  // LA0
         {0, C9_9,  C8_9,  C7_9},  // LB9
         {0, C9_10, C8_10, C7_10}, // LB10
         {0, C9_11, C8_11, C7_11}, // LB11
         {0, C9_12, C8_12, C7_12}, // LB12
         {0, C9_13, C8_13, C7_13}, // LB13
         {0, C9_14, C8_14, C7_14}, // LB14
-        {0, C9_15, C8_15, C6_14}, // LB15
-        {0, C9_16, C7_15, C6_15}, // LB16
-        {0, C8_16, C7_16, C6_16}, // LB17
-        {1, C2_1,  C3_1,  C4_1},  // LC0
-        {1, C1_1,  C3_2, C4_2},   // LC1
-        {1, C1_2,  C2_2, C4_3},   // LC2
-        {1, C1_3,  C2_3, C3_3},   // LC3
-        {1, C1_4,  C2_4, C3_4},   // LC4
-        {1, C1_5,  C2_5, C3_5},   // LC5
-  //{1, C1_6,  C2_6, C3_6},   // LC6
-        {1, C1_7,  C2_7, C3_7},   // LC7
-        {1, C1_8,  C2_8, C3_8},   // LC8
-        {1, C9_1,  C8_1,  C7_1},  // LC9
-        {1, C9_2,  C8_2, C7_2},   // LC10
-        {1, C9_3,  C8_3, C7_3},   // LC11
-        {1, C9_4,  C8_4, C7_4},   // LC12
-        {1, C9_5,  C8_5, C7_5},   // LC13
+        {0, C1_15, C2_15, C3_15}, // LB7
+
+    {0, C1_8,  C2_8, C3_8},   // LA8
         {1, C9_6,  C8_6, C7_6},   // LC14
-        //{1, C9_7,  C8_7, C6_6},   // LC15
-        {1, C9_8,  C7_7, C6_7},   // LC16
-        {1, C8_8,  C7_8, C6_8},   // LC17
+        {1, C9_5,  C8_5, C7_5},   // LC13
+        {1, C9_4,  C8_4, C7_4},   // LC12
+        {1, C9_3,  C8_3, C7_3},   // LC11
+        {1, C9_2,  C8_2, C7_2},   // LC10
+        {1, C9_1,  C8_1,  C7_1},  // LC9
         {1, C2_9,  C3_9,  C4_9},  // LD0
         {1, C1_9,  C3_10, C4_10}, // LD1
         {1, C1_10, C2_10, C4_11}, // LD2
         {1, C1_11, C2_11, C3_11}, // LD3
         {1, C1_12, C2_12, C3_12}, // LD4
         {1, C1_13, C2_13, C3_13}, // LD5
-        {1, C1_14, C2_14, C3_14}, // LD6
-        {1, C1_15, C2_15, C3_15}, // LD7
-        {1, C1_16, C2_16, C3_16}, // LD8
+        {0, C1_16, C2_16, C3_16}, // LB8
+
+        {1, C9_8,  C7_7, C6_7},   // LC16
+        {1, C1_5,  C2_5, C3_5},   // LC5
+        {1, C1_4,  C2_4, C3_4},   // LC4
+        {1, C1_3,  C2_3, C3_3},   // LC3
+        {1, C1_2,  C2_2, C4_3},   // LC2
+        {1, C1_1,  C3_2, C4_2},   // LC1
         {1, C9_9,  C8_9,  C7_9},  // LD9
         {1, C9_10, C8_10, C7_10}, // LD10
         {1, C9_11, C8_11, C7_11}, // LD11
         {1, C9_12, C8_12, C7_12}, // LD12
-        //{1, C9_13, C8_13, C7_13}, // LD13
+        {1, C1_14, C2_14, C3_14}, // LD6
+        {1, C1_15, C2_15, C3_15}, // LD7
+        {1, C1_16, C2_16, C3_16}, // LD8
+        {0, C9_15, C8_15, C6_14}, // LB15
+
+        {1, C8_8,  C7_8, C6_8},   // LC17
+        {1, C1_8,  C2_8, C3_8},   // LC8
+        {1, C1_7,  C2_7, C3_7},   // LC7
+        {1, C2_1,  C3_1,  C4_1},  // LC0
         {1, C9_14, C8_14, C7_14}, // LD14
         {1, C9_15, C8_15, C6_14}, // LD15
         {1, C9_16, C7_15, C6_15}, // LD16
         {1, C8_16, C7_16, C6_16}, // LD17
+        {0, C8_16, C7_16, C6_16}, // LB17
+        {0, C9_16, C7_15, C6_15}, // LB16
+
 };
 
 led_config_t g_led_config = { {
-    {  17,  16,  15,  14,  13,  12,  11,  10,   9,  18,  19,  20,  21,  22,  23 },
-    {   7,   6,   5,   4,   3,   2,   1,   0,  26,  27,  28,  29,  30,  31,  24 },
-    {   8,  48,  47,  46,  45,  44,  43,  51,  52,  53,  54,  55, NO_LED,  56,  25 },
-    {  49,  40,  39,  38,  37,  36,  60,  61,  62,  63,  57,  58, NO_LED,  59,  32 },
-    {  50,  42,  41, NO_LED, NO_LED,  35, NO_LED, NO_LED,  64,  65,  66,  67, NO_LED,  34,  33 }
+    {  0,  1,  2,  3,     4,     5,  6,     7,     8,   9,   10,  11, 12,    13,  14 },
+    {  15, 16, 17, 18,    19,    20, 21,    22,    23,  24,  25,  26, 27,    28,  29 },
+    {  30, 31, 32, 33,    34,    35, 36,    37,    38,  39,  40,  41, NO_LED,42,  43 },
+    {  44, 45, 46, 47,    48,    49, 59,    51,    52,  53,  54,  55, NO_LED,56,  57 },
+    {  58, 59, 60, NO_LED,NO_LED,61, NO_LED,NO_LED,62,  63,  64,  65, NO_LED,66,  67 }
 }, {
-    { 112,  16 }, {  96,  16 }, {  80,  16 }, {  64,  16 }, {  48,  16 }, {  32,  16 }, {  16,  16 }, {   0,  16 }, {   0,  32 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 },
-    {  32,   0 }, {  16,   0 }, {   0,   0 }, { 144,   0 }, { 160,   0 }, { 176,   0 }, { 192,   0 }, { 208,   0 }, { 224,   0 }, { 224,  16 }, { 224,  32 }, { 128,  16 }, { 144,  16 }, { 160,  16 }, { 176,  16 },
-    { 192,  16 }, { 208,  16 }, { 224,  48 }, { 224,  64 }, { 208,  64 }, {  80,  64 }, {  80,  48 }, {  64,  48 }, {  48,  48 }, {  32,  48 }, {  16,  48 }, {  32,  64 }, {  16,  64 }, {  96,  32 }, {  80,  32 },
-    {  64,  32 }, {  48,  32 }, {  32,  32 }, {  16,  32 }, {   0,  48 }, {   0,  64 }, { 112,  32 }, { 128,  32 }, { 144,  32 }, { 160,  32 }, { 176,  32 }, { 208,  32 }, { 160,  48 }, { 176,  48 }, { 208,  48 },
-    {  96,  48 }, { 112,  48 }, { 128,  48 }, { 144,  48 }, { 128,  64 }, { 144,  64 }, { 160,  64 }, { 176,  64 }
+    {0,0}, {15,0}, {30,0}, {45,0}, {60,0},  {75,0},  {90,0},  {105,0}, {120,0}, {135,0}, {150,0}, {165,0}, {180,0}, {203,0},{224,0},
+        {4,16},{23,16},{38,16},{53,16},{68,16}, {83,16}, {98,16}, {113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16},
+        {6,32},{26,32},{41,32},{56,32},{71,32}, {86,32}, {101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
+        {9,48},{34,48},{49,48},{64,48},{79,48}, {94,48}, {109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48},
+        {2,64},{21,64},{39,64},{96,64},{150,64},{165,64},{180,64},{195,64},{210,64},{224,64}
 }, {
-    4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4,
-    4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 4, 4,
-    4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 1, 1, 1, 1
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 4, 1, 1, 1, 1, 1, 1
 } };
+#endif
 
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -118,8 +122,8 @@ void suspend_wakeup_init_kb(void)
 __attribute__ ((weak))
 void rgb_matrix_indicators_user(void)
 {
-    if (IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK))
+    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
     {
-        rgb_matrix_set_color(8, 0xFF, 0xFF, 0xFF);
+        rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
 }
diff --git a/keyboards/dztech/dz65rgb/keymaps/default/keymap.c b/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
index 90f25c0e4..7f1416f1e 100644
--- a/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,\
                     KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, RESET,    KC_PGUP,\
                         CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,\
-                    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,\
+                    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,\
                     KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
 };
 
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
index babc2abcf..a56af0165 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
@@ -6,7 +6,7 @@
 #define TAPPING_TERM 150
 
 #define TAP_HOLD_CAPS_DELAY 0
-
+#undef RGB_MATRIX_STARTUP_MODE
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
 // #define DISABLE_RGB_MATRIX_SOLID_COLOR