Skip to content

Commit 2ba20bf

Browse files
committed
fix remap return type
1 parent 0c8615b commit 2ba20bf

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

styles/remap.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ class Remap {
2727
return RunLayer(&color_, blade);
2828
}
2929

30-
auto getColor(int led) -> decltype(color_.getColor(led)) {
30+
auto getColor(int led) -> decltype(MixColors(color_.getColor(led),
31+
color_.getColor(led), 1, 15)) {
3132
int pos = f_.getInteger(led);
3233
led = clamp(pos * num_leds_, 0, num_leds_ * 32768 - 1);
3334
int fraction = led & 0x7fff;

styles/tests.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ Monitoring monitor;
142142
#include "../functions/center_dist.h"
143143
#include "../functions/effect_position.h"
144144
#include "../functions/random.h"
145+
#include "../functions/mult.h"
145146
#include "mix.h"
146147
#include "strobe.h"
147148
#include "hump_flicker.h"

0 commit comments

Comments
 (0)