]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
New RGB Matrix effect: Single color reactive (#5330)
authorM-AS <matthewtransformer@hotmail.com>
Sun, 17 Mar 2019 17:38:51 +0000 (13:38 -0400)
committerDrashna Jaelre <drashna@live.com>
Sun, 17 Mar 2019 17:38:51 +0000 (10:38 -0700)
* Adds new RGB Matrix effect: rgb_matrix_config'd reactive LEDs

* [Docs] Adds disable for new effect

* [Docs] Added new effect to list of effects

docs/feature_rgb_matrix.md
quantum/rgb_matrix.c
quantum/rgb_matrix.h

index 910a704691255aa94fbf6cc1d4471e4912059e76..8d1efb12a2750954286a45a80b2660a55e12d522 100644 (file)
@@ -147,6 +147,7 @@ These are the effects that are currently available:
            RGB_MATRIX_DIGITAL_RAIN,
        #ifdef RGB_MATRIX_KEYPRESSES
            RGB_MATRIX_SOLID_REACTIVE,
+           RGB_MATRIX_REACTIVE_SIMPLE,
            RGB_MATRIX_SPLASH,
            RGB_MATRIX_MULTISPLASH,
            RGB_MATRIX_SOLID_SPLASH,
@@ -173,6 +174,7 @@ You can disable a single effect by defining `DISABLE_[EFFECT_NAME]` in your `con
 |`#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS`   |Disables `RGB_MATRIX_JELLYBEAN_RAINDROPS`   |
 |`#define DISABLE_RGB_MATRIX_DIGITAL_RAIN`          |Disables `RGB_MATRIX_DIGITAL_RAIN`          |
 |`#define DISABLE_RGB_MATRIX_SOLID_REACTIVE`        |Disables `RGB_MATRIX_SOLID_REACTIVE`        |
+|`#define DISABLE_RGB_MATRIX_REACTIVE_SIMPLE`       |Disables `RGB_MATRIX_REACTIVE_SIMPLE`       |
 |`#define DISABLE_RGB_MATRIX_SPLASH`                |Disables `RGB_MATRIX_SPLASH`                |
 |`#define DISABLE_RGB_MATRIX_MULTISPLASH`           |Disables `RGB_MATRIX_MULTISPLASH`           |
 |`#define DISABLE_RGB_MATRIX_SOLID_SPLASH`          |Disables `RGB_MATRIX_SOLID_SPLASH`          |
index 2ed36304dca5c929acef0e9f15d655835177f02f..56a97e3c7d5b61f44ca400b8d223e82c72e07ebf 100644 (file)
@@ -221,6 +221,20 @@ void rgb_matrix_solid_reactive(void) {
        }
 }
 
+void rgb_matrix_solid_reactive_simple(void)
+{
+    HSV hsv = {.h = rgb_matrix_config.hue, .s = rgb_matrix_config.sat, .v = rgb_matrix_config.val};
+    RGB rgb;
+    
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+        uint16_t offset2 = g_key_hit[i] << 2;
+        offset2 = (offset2 <= 255) ? (255 - offset2) : 0;
+        hsv.v = offset2 * rgb_matrix_config.val / RGB_MATRIX_MAXIMUM_BRIGHTNESS;
+        rgb = hsv_to_rgb(hsv);
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+}
+
 // alphas = color1, mods = color2
 void rgb_matrix_alphas_mods(void) {
 
@@ -755,6 +769,11 @@ void rgb_matrix_task(void) {
                     rgb_matrix_solid_reactive();
                     break;
             #endif
+            #ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+                case RGB_MATRIX_SOLID_REACTIVE_SIMPLE:
+                    rgb_matrix_solid_reactive_simple();
+                    break;
+            #endif
             #ifndef DISABLE_RGB_MATRIX_SPLASH
                 case RGB_MATRIX_SPLASH:
                     rgb_matrix_splash();
index e43532d11e77edf6781a0fc3fc448c1bfae01b27..e6acd2d4b5125e4fb9b8428de204cedf0843d08b 100644 (file)
@@ -110,6 +110,9 @@ enum rgb_matrix_effects {
    #ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE
        RGB_MATRIX_SOLID_REACTIVE,
    #endif
+   #ifndef DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+       RGB_MATRIX_SOLID_REACTIVE_SIMPLE,
+   #endif
    #ifndef DISABLE_RGB_MATRIX_SPLASH
        RGB_MATRIX_SPLASH,
    #endif