aboutsummaryrefslogtreecommitdiff
path: root/users/drashna
diff options
context:
space:
mode:
authorU-LANDSRAAD\drashna <drashna@live.com>2018-03-28 13:16:09 -0700
committerJack Humbert <jack.humb@gmail.com>2018-03-28 16:55:58 -0400
commitc1b46206a7872a422b16b453db09477bac995929 (patch)
treebe3cc29bf569c52a28a07c5f27d23fc4f941e16c /users/drashna
parent9cfeb4e6cff521d4f7219f2774d69ce9ce96a0cf (diff)
downloadqmk_firmware-c1b46206a7872a422b16b453db09477bac995929.tar.gz
qmk_firmware-c1b46206a7872a422b16b453db09477bac995929.zip
Fix commands and update my userspace (for testing)
Diffstat (limited to 'users/drashna')
-rw-r--r--users/drashna/drashna.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 09b3891dd..d23b9b9df 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -164,16 +164,16 @@ void matrix_init_user(void) {
164 164
165 if (true) { 165 if (true) {
166 if (default_layer & (1UL << _COLEMAK)) { 166 if (default_layer & (1UL << _COLEMAK)) {
167 rgblight_set_magenta; 167 rgblight_sethsv_magenta();
168 } 168 }
169 else if (default_layer & (1UL << _DVORAK)) { 169 else if (default_layer & (1UL << _DVORAK)) {
170 rgblight_set_green; 170 rgblight_sethsv_green();
171 } 171 }
172 else if (default_layer & (1UL << _WORKMAN)) { 172 else if (default_layer & (1UL << _WORKMAN)) {
173 rgblight_set_purple; 173 rgblight_sethsv_goldenrod();
174 } 174 }
175 else { 175 else {
176 rgblight_set_teal; 176 rgblight_sethsv_teal();
177 } 177 }
178 } 178 }
179 else 179 else
@@ -319,7 +319,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
319#ifdef RGBLIGHT_ENABLE 319#ifdef RGBLIGHT_ENABLE
320 rgblight_enable(); 320 rgblight_enable();
321 rgblight_mode(1); 321 rgblight_mode(1);
322 rgblight_setrgb(0xff, 0x00, 0x00); 322 rgblight_setrgb_red();
323#endif 323#endif
324 reset_keyboard(); 324 reset_keyboard();
325 } 325 }
@@ -434,61 +434,61 @@ uint32_t layer_state_set_user(uint32_t state) {
434 if (rgb_layer_change) { 434 if (rgb_layer_change) {
435 switch (biton32(state)) { 435 switch (biton32(state)) {
436 case _NAV: 436 case _NAV:
437 rgblight_set_blue; 437 rgblight_sethsv_blue();
438 rgblight_mode(1); 438 rgblight_mode(1);
439 break; 439 break;
440 case _SYMB: 440 case _SYMB:
441 rgblight_set_blue; 441 rgblight_sethsv_blue();
442 rgblight_mode(2); 442 rgblight_mode(2);
443 break; 443 break;
444 case _MOUS: 444 case _MOUS:
445 rgblight_set_yellow; 445 rgblight_sethsv_yellow();
446 rgblight_mode(1); 446 rgblight_mode(1);
447 break; 447 break;
448 case _MACROS: 448 case _MACROS:
449 rgblight_set_orange; 449 rgblight_sethsv_orange();
450 is_overwatch ? rgblight_mode(17) : rgblight_mode(18); 450 is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
451 break; 451 break;
452 case _MEDIA: 452 case _MEDIA:
453 rgblight_set_chartreuse; 453 rgblight_sethsv_chartreuse();
454 rgblight_mode(22); 454 rgblight_mode(22);
455 break; 455 break;
456 case _GAMEPAD: 456 case _GAMEPAD:
457 rgblight_set_orange; 457 rgblight_sethsv_orange();
458 rgblight_mode(17); 458 rgblight_mode(17);
459 break; 459 break;
460 case _DIABLO: 460 case _DIABLO:
461 rgblight_set_red; 461 rgblight_sethsv_red();
462 rgblight_mode(5); 462 rgblight_mode(5);
463 break; 463 break;
464 case _RAISE: 464 case _RAISE:
465 rgblight_set_yellow; 465 rgblight_sethsv_yellow();
466 rgblight_mode(5); 466 rgblight_mode(5);
467 break; 467 break;
468 case _LOWER: 468 case _LOWER:
469 rgblight_set_orange; 469 rgblight_sethsv_orange();
470 rgblight_mode(5); 470 rgblight_mode(5);
471 break; 471 break;
472 case _ADJUST: 472 case _ADJUST:
473 rgblight_set_red; 473 rgblight_sethsv_red();
474 rgblight_mode(23); 474 rgblight_mode(23);
475 break; 475 break;
476 case _COVECUBE: 476 case _COVECUBE:
477 rgblight_set_green; 477 rgblight_sethsv_green();
478 rgblight_mode(2); 478 rgblight_mode(2);
479 break; 479 break;
480 default: // for any other layers, or the default layer 480 default: // for any other layers, or the default layer
481 if (default_layer & (1UL << _COLEMAK)) { 481 if (default_layer & (1UL << _COLEMAK)) {
482 rgblight_set_magenta; 482 rgblight_sethsv_magenta();
483 } 483 }
484 else if (default_layer & (1UL << _DVORAK)) { 484 else if (default_layer & (1UL << _DVORAK)) {
485 rgblight_set_green; 485 rgblight_sethsv_green();
486 } 486 }
487 else if (default_layer & (1UL << _WORKMAN)) { 487 else if (default_layer & (1UL << _WORKMAN)) {
488 rgblight_set_goldenrod; 488 rgblight_sethsv_goldenrod();
489 } 489 }
490 else { 490 else {
491 rgblight_set_teal; 491 rgblight_sethsv_teal();
492 } 492 }
493 if (biton32(state) == _MODS) { // If the non-OSM layer is enabled, then breathe 493 if (biton32(state) == _MODS) { // If the non-OSM layer is enabled, then breathe
494 rgblight_mode(2); 494 rgblight_mode(2);