aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/dztech/dz40rgb/config.h3
-rw-r--r--keyboards/dztech/dz60rgb/config.h2
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/default/keymap.c166
3 files changed, 84 insertions, 87 deletions
diff --git a/keyboards/dztech/dz40rgb/config.h b/keyboards/dztech/dz40rgb/config.h
index 2ac7fbdc8..5b9f6dc08 100644
--- a/keyboards/dztech/dz40rgb/config.h
+++ b/keyboards/dztech/dz40rgb/config.h
@@ -22,7 +22,7 @@
22#define DEBOUNCE 3 22#define DEBOUNCE 3
23#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects 23#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
24#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended 24#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
25#define RGB_MATRIX_SKIP_FRAMES 0 25#define RGB_MATRIX_SKIP_FRAMES 10
26#define RGB_MATRIX_KEYPRESSES 26#define RGB_MATRIX_KEYPRESSES
27#define DISABLE_RGB_MATRIX_SPLASH 27#define DISABLE_RGB_MATRIX_SPLASH
28#define DISABLE_RGB_MATRIX_MULTISPLASH 28#define DISABLE_RGB_MATRIX_MULTISPLASH
@@ -31,4 +31,3 @@
31#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. 31#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons.
32 32
33#define DRIVER_COUNT 2 33#define DRIVER_COUNT 2
34
diff --git a/keyboards/dztech/dz60rgb/config.h b/keyboards/dztech/dz60rgb/config.h
index a1b3a19d9..19f32440e 100644
--- a/keyboards/dztech/dz60rgb/config.h
+++ b/keyboards/dztech/dz60rgb/config.h
@@ -23,7 +23,7 @@
23#define DEBOUNCE 3 23#define DEBOUNCE 3
24#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects 24#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
25#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended 25#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
26#define RGB_MATRIX_SKIP_FRAMES 0 26#define RGB_MATRIX_SKIP_FRAMES 10
27#define RGB_MATRIX_KEYPRESSES 27#define RGB_MATRIX_KEYPRESSES
28#define DISABLE_RGB_MATRIX_SPLASH 28#define DISABLE_RGB_MATRIX_SPLASH
29#define DISABLE_RGB_MATRIX_MULTISPLASH 29#define DISABLE_RGB_MATRIX_MULTISPLASH
diff --git a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
index 2c667ef42..0eff4ca8a 100644
--- a/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ extern bool g_suspend_state;
10#define _LAYER7 7 10#define _LAYER7 7
11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
12 [_LAYER0] = LAYOUT( /* Base */ 12 [_LAYER0] = LAYOUT( /* Base */
13 RESET, RGB_MOD, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\ 13 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\
14 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\ 14 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\
15 CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 15 CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
16 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),\ 16 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),\
@@ -60,92 +60,90 @@ void rgb_matrix_indicators_user(void) {
60 if (!g_suspend_state) { 60 if (!g_suspend_state) {
61 switch (biton32(layer_state)) { 61 switch (biton32(layer_state)) {
62 case _LAYER1: 62 case _LAYER1:
63 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break; 63 rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false);
64 break;
64 case _LAYER2: 65 case _LAYER2:
65 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break; 66 rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false);
67 break;
68 case _LAYER3:
69 if ( this_led & (1<<USB_LED_NUM_LOCK)) {
70 rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
71 } else {
72 rgb_matrix_set_color(13, 0x00, 0x00, 0x00);
73 }
74 rgb_matrix_set_color(0, 0x00, 0xFF, 0x00);
75 rgb_matrix_set_color(1, 0x00, 0x00, 0x00);
76 rgb_matrix_set_color(1, 0x00, 0xFF, 0x00);
77 rgb_matrix_set_color(2, 0x00, 0xFF, 0x00);
78 rgb_matrix_set_color(3, 0x00, 0xFF, 0x00);
79 rgb_matrix_set_color(4, 0x00, 0xFF, 0x00);
80 rgb_matrix_set_color(5, 0x00, 0x00, 0x00);
81 rgb_matrix_set_color(6, 0x00, 0x00, 0x00);
82 rgb_matrix_set_color(7, 0x00, 0x00, 0x00);
83 rgb_matrix_set_color(8, 0x00, 0x00, 0x00);
84 rgb_matrix_set_color(9, 0xFF, 0xFF, 0x00);
85 rgb_matrix_set_color(10, 0xFF, 0xFF, 0x00);
86 rgb_matrix_set_color(11, 0xFF, 0xFF, 0x00);
87 rgb_matrix_set_color(12, 0xFF, 0xFF, 0x00);
88 rgb_matrix_set_color(14, 0x00, 0x00, 0xFF);
89 rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
90 rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
91 rgb_matrix_set_color(17, 0x00, 0xFF, 0x00);
92 rgb_matrix_set_color(18, 0x00, 0xFF, 0x00);
93 rgb_matrix_set_color(19, 0x00, 0xFF, 0x00);
94 rgb_matrix_set_color(20, 0x00, 0x00, 0x00);
95 rgb_matrix_set_color(21, 0x00, 0x00, 0x00);
96 rgb_matrix_set_color(22, 0x00, 0x00, 0x00);
97 rgb_matrix_set_color(23, 0x00, 0x00, 0x00);
98 rgb_matrix_set_color(24, 0xFF, 0xFF, 0x00);
99 rgb_matrix_set_color(25, 0xFF, 0xFF, 0x00);
100 rgb_matrix_set_color(26, 0xFF, 0xFF, 0x00);
101 rgb_matrix_set_color(27, 0x00, 0x00, 0x00);
102 rgb_matrix_set_color(28, 0x00, 0xFF, 0x00);
103 rgb_matrix_set_color(29, 0x00, 0x00, 0x00);
104 rgb_matrix_set_color(30, 0x00, 0xFF, 0x00);
105 rgb_matrix_set_color(31, 0x00, 0xFF, 0x00);
106 rgb_matrix_set_color(32, 0x00, 0xFF, 0x00);
107 rgb_matrix_set_color(33, 0x00, 0x00, 0x00);
108 rgb_matrix_set_color(34, 0x00, 0x00, 0x00);
109 rgb_matrix_set_color(35, 0x00, 0x00, 0x00);
110 rgb_matrix_set_color(36, 0x00, 0x00, 0x00);
111 rgb_matrix_set_color(37, 0xFF, 0xFF, 0x00);
112 rgb_matrix_set_color(38, 0xFF, 0xFF, 0x00);
113 rgb_matrix_set_color(39, 0xFF, 0xFF, 0x00);
114 rgb_matrix_set_color(40, 0x00, 0x00, 0x00);
115 rgb_matrix_set_color(41, 0x00, 0x00, 0x00);
116 rgb_matrix_set_color(42, 0x00, 0x00, 0x00);
117 rgb_matrix_set_color(43, 0x00, 0xFF, 0x00);
118 rgb_matrix_set_color(44, 0x00, 0xFF, 0x00);
119 rgb_matrix_set_color(45, 0x00, 0xFF, 0x00);
120 rgb_matrix_set_color(46, 0x00, 0x00, 0x00);
121 rgb_matrix_set_color(47, 0x00, 0x00, 0x00);
122 rgb_matrix_set_color(48, 0x00, 0x00, 0x00);
123 rgb_matrix_set_color(49, 0x00, 0x00, 0x00);
124 rgb_matrix_set_color(50, 0xFF, 0xFF, 0x00);
125 rgb_matrix_set_color(51, 0xFF, 0xFF, 0x00);
126 rgb_matrix_set_color(52, 0xFF, 0xFF, 0x00);
127 rgb_matrix_set_color(53, 0x00, 0x00, 0x00);
128 rgb_matrix_set_color(54, 0x00, 0x00, 0x00);
129 rgb_matrix_set_color(55, 0x00, 0x00, 0x00);
130 rgb_matrix_set_color(56, 0x00, 0x00, 0x00);
131 rgb_matrix_set_color(57, 0x00, 0xFF, 0x00);
132 rgb_matrix_set_color(58, 0x00, 0xFF, 0x00);
133 rgb_matrix_set_color(59, 0xFF, 0x00, 0x00);
134 rgb_matrix_set_color(60, 0xFF, 0xFF, 0x00);
135 rgb_matrix_set_color(61, 0xFF, 0xFF, 0x00);
136 rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
137 break;
66 case _LAYER4: 138 case _LAYER4:
67 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break; 139 rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false);
68 } 140 break;
69 } 141 }
70 if ( this_led & (1<<USB_LED_CAPS_LOCK)) { 142 }
71 rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF); 143 if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
72 } 144 rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
145 }
73 146
74 switch (biton32(layer_state)) {
75 case _LAYER3:
76 if ( this_led & (1<<USB_LED_NUM_LOCK))
77 {
78 rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
79 }
80 else
81 {
82 rgb_matrix_set_color(13, 0x00, 0x00, 0x00);
83 }
84 rgb_matrix_set_color(0, 0x00, 0xFF, 0x00);
85 rgb_matrix_set_color(1, 0x00, 0x00, 0x00);
86 rgb_matrix_set_color(1, 0x00, 0xFF, 0x00);
87 rgb_matrix_set_color(2, 0x00, 0xFF, 0x00);
88 rgb_matrix_set_color(3, 0x00, 0xFF, 0x00);
89 rgb_matrix_set_color(4, 0x00, 0xFF, 0x00);
90 rgb_matrix_set_color(5, 0x00, 0x00, 0x00);
91 rgb_matrix_set_color(6, 0x00, 0x00, 0x00);
92 rgb_matrix_set_color(7, 0x00, 0x00, 0x00);
93 rgb_matrix_set_color(8, 0x00, 0x00, 0x00);
94 rgb_matrix_set_color(9, 0xFF, 0xFF, 0x00);
95 rgb_matrix_set_color(10, 0xFF, 0xFF, 0x00);
96 rgb_matrix_set_color(11, 0xFF, 0xFF, 0x00);
97 rgb_matrix_set_color(12, 0xFF, 0xFF, 0x00);
98 rgb_matrix_set_color(14, 0x00, 0x00, 0xFF);
99 rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
100 rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
101 rgb_matrix_set_color(17, 0x00, 0xFF, 0x00);
102 rgb_matrix_set_color(18, 0x00, 0xFF, 0x00);
103 rgb_matrix_set_color(19, 0x00, 0xFF, 0x00);
104 rgb_matrix_set_color(20, 0x00, 0x00, 0x00);
105 rgb_matrix_set_color(21, 0x00, 0x00, 0x00);
106 rgb_matrix_set_color(22, 0x00, 0x00, 0x00);
107 rgb_matrix_set_color(23, 0x00, 0x00, 0x00);
108 rgb_matrix_set_color(24, 0xFF, 0xFF, 0x00);
109 rgb_matrix_set_color(25, 0xFF, 0xFF, 0x00);
110 rgb_matrix_set_color(26, 0xFF, 0xFF, 0x00);
111 rgb_matrix_set_color(27, 0x00, 0x00, 0x00);
112 rgb_matrix_set_color(28, 0x00, 0xFF, 0x00);
113 rgb_matrix_set_color(29, 0x00, 0x00, 0x00);
114 rgb_matrix_set_color(30, 0x00, 0xFF, 0x00);
115 rgb_matrix_set_color(31, 0x00, 0xFF, 0x00);
116 rgb_matrix_set_color(32, 0x00, 0xFF, 0x00);
117 rgb_matrix_set_color(33, 0x00, 0x00, 0x00);
118 rgb_matrix_set_color(34, 0x00, 0x00, 0x00);
119 rgb_matrix_set_color(35, 0x00, 0x00, 0x00);
120 rgb_matrix_set_color(36, 0x00, 0x00, 0x00);
121 rgb_matrix_set_color(37, 0xFF, 0xFF, 0x00);
122 rgb_matrix_set_color(38, 0xFF, 0xFF, 0x00);
123 rgb_matrix_set_color(39, 0xFF, 0xFF, 0x00);
124 rgb_matrix_set_color(40, 0x00, 0x00, 0x00);
125 rgb_matrix_set_color(41, 0x00, 0x00, 0x00);
126 rgb_matrix_set_color(42, 0x00, 0x00, 0x00);
127 rgb_matrix_set_color(43, 0x00, 0xFF, 0x00);
128 rgb_matrix_set_color(44, 0x00, 0xFF, 0x00);
129 rgb_matrix_set_color(45, 0x00, 0xFF, 0x00);
130 rgb_matrix_set_color(46, 0x00, 0x00, 0x00);
131 rgb_matrix_set_color(47, 0x00, 0x00, 0x00);
132 rgb_matrix_set_color(48, 0x00, 0x00, 0x00);
133 rgb_matrix_set_color(49, 0x00, 0x00, 0x00);
134 rgb_matrix_set_color(50, 0xFF, 0xFF, 0x00);
135 rgb_matrix_set_color(51, 0xFF, 0xFF, 0x00);
136 rgb_matrix_set_color(52, 0xFF, 0xFF, 0x00);
137 rgb_matrix_set_color(53, 0x00, 0x00, 0x00);
138 rgb_matrix_set_color(54, 0x00, 0x00, 0x00);
139 rgb_matrix_set_color(55, 0x00, 0x00, 0x00);
140 rgb_matrix_set_color(56, 0x00, 0x00, 0x00);
141 rgb_matrix_set_color(57, 0x00, 0xFF, 0x00);
142 rgb_matrix_set_color(58, 0x00, 0xFF, 0x00);
143 rgb_matrix_set_color(59, 0xFF, 0x00, 0x00);
144 rgb_matrix_set_color(60, 0xFF, 0xFF, 0x00);
145 rgb_matrix_set_color(61, 0xFF, 0xFF, 0x00);
146 rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
147 break;
148 }
149} 147}
150 148
151 149