X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quantum%2Frgb_matrix_animations%2Ftyping_heatmap_anim.h;h=374b7fea0cf105a60c3bdc6028fc4a8a510f47e8;hb=cf215487ba35c6754cd1c52bb900a46bb52ed3a3;hp=aade53fccc185171db0ce5b573ddfcc0ad7496e1;hpb=60eae7335b711e8d4be7d48ad2290141e04debe7;p=qmk_firmware.git

diff --git a/quantum/rgb_matrix_animations/typing_heatmap_anim.h b/quantum/rgb_matrix_animations/typing_heatmap_anim.h
index aade53fcc..374b7fea0 100644
--- a/quantum/rgb_matrix_animations/typing_heatmap_anim.h
+++ b/quantum/rgb_matrix_animations/typing_heatmap_anim.h
@@ -1,8 +1,6 @@
-#pragma once
 #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(DISABLE_RGB_MATRIX_TYPING_HEATMAP)
-
-extern rgb_config_t rgb_matrix_config;
-extern uint8_t rgb_frame_buffer[MATRIX_ROWS][MATRIX_COLS];
+RGB_MATRIX_EFFECT(TYPING_HEATMAP)
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 void process_rgb_matrix_typing_heatmap(keyrecord_t *record) {
     uint8_t row = record->event.key.row;
@@ -35,7 +33,7 @@ void process_rgb_matrix_typing_heatmap(keyrecord_t *record) {
     }
 }
 
-bool rgb_matrix_typing_heatmap(effect_params_t* params) {
+bool TYPING_HEATMAP(effect_params_t* params) {
   // Modified version of RGB_MATRIX_USE_LIMITS to work off of matrix row / col size
   uint8_t led_min = RGB_MATRIX_LED_PROCESS_LIMIT * params->iter;
   uint8_t led_max = led_min + RGB_MATRIX_LED_PROCESS_LIMIT;
@@ -61,7 +59,7 @@ bool rgb_matrix_typing_heatmap(effect_params_t* params) {
       if (!HAS_ANY_FLAGS(g_led_config.flags[led[j]], params->flags))
         continue;
 
-      HSV hsv = { 170 - qsub8(val, 85), rgb_matrix_config.sat, scale8((qadd8(170, val) - 170) * 3, rgb_matrix_config.val) };
+      HSV hsv = { 170 - qsub8(val, 85), rgb_matrix_config.hsv.s, scale8((qadd8(170, val) - 170) * 3, rgb_matrix_config.hsv.v) };
       RGB rgb = hsv_to_rgb(hsv);
       rgb_matrix_set_color(led[j], rgb.r, rgb.g, rgb.b);
     }
@@ -72,4 +70,5 @@ bool rgb_matrix_typing_heatmap(effect_params_t* params) {
   return led_max < sizeof(rgb_frame_buffer);
 }
 
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 #endif // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(DISABLE_RGB_MATRIX_TYPING_HEATMAP)