andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix speed issues with RGB Matrix in the DZ60RGB (#5380) 

* Fix speed issues with RGB Matrix in the DZ60RGB

* keep boards in sync
master
moyi4681 2019-03-12 22:25:39 +08:00 committed by MechMerlin
parent 395a7793d1
commit fe642a84fc
3 changed files with 84 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keyboards/dztech/dz40rgb/config.h
View File

@ -22,7 +22,7 @@
#define DEBOUNCE 3 #define DEBOUNCE 3
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects #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_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
#define RGB_MATRIX_SKIP_FRAMES 0 #define RGB_MATRIX_SKIP_FRAMES 10
#define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYPRESSES
#define DISABLE_RGB_MATRIX_SPLASH #define DISABLE_RGB_MATRIX_SPLASH
#define DISABLE_RGB_MATRIX_MULTISPLASH #define DISABLE_RGB_MATRIX_MULTISPLASH
@ -31,4 +31,3 @@
#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. #define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons.
#define DRIVER_COUNT 2 #define DRIVER_COUNT 2

2
keyboards/dztech/dz60rgb/config.h
View File

@ -23,7 +23,7 @@
#define DEBOUNCE 3 #define DEBOUNCE 3
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects #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_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
#define RGB_MATRIX_SKIP_FRAMES 0 #define RGB_MATRIX_SKIP_FRAMES 10
#define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYPRESSES
#define DISABLE_RGB_MATRIX_SPLASH #define DISABLE_RGB_MATRIX_SPLASH
#define DISABLE_RGB_MATRIX_MULTISPLASH #define DISABLE_RGB_MATRIX_MULTISPLASH

32
keyboards/dztech/dz60rgb/keymaps/default/keymap.c
View File

@ -10,7 +10,7 @@ extern bool g_suspend_state;
#define _LAYER7 7 #define _LAYER7 7
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LAYER0] = LAYOUT( /* Base */ [_LAYER0] = LAYOUT( /* Base */
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,\ 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,\
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,\ 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,\
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, \ 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, \
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),\ 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,25 +60,15 @@ void rgb_matrix_indicators_user(void) {
if (!g_suspend_state) { if (!g_suspend_state) {
switch (biton32(layer_state)) { switch (biton32(layer_state)) {
case _LAYER1: case _LAYER1:
rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break; rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false);
break;
case _LAYER2: case _LAYER2:
rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break; rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false);
case _LAYER4: break;
rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break;
}
}
if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
}
switch (biton32(layer_state)) {
case _LAYER3: case _LAYER3:
if ( this_led & (1<<USB_LED_NUM_LOCK)) if ( this_led & (1<<USB_LED_NUM_LOCK)) {
{
rgb_matrix_set_color(13, 0xFF, 0x00, 0x00); rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
} } else {
else
{
rgb_matrix_set_color(13, 0x00, 0x00, 0x00); rgb_matrix_set_color(13, 0x00, 0x00, 0x00);
} }
rgb_matrix_set_color(0, 0x00, 0xFF, 0x00); rgb_matrix_set_color(0, 0x00, 0xFF, 0x00);
@ -145,8 +135,16 @@ void rgb_matrix_indicators_user(void) {
rgb_matrix_set_color(61, 0xFF, 0xFF, 0x00); rgb_matrix_set_color(61, 0xFF, 0xFF, 0x00);
rgb_matrix_set_color(62, 0x00, 0x00, 0x00); rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
break; break;
case _LAYER4:
rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false);
break;
} }
} }
if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
}
}