Merge branch 'custom-effects' into mdev
This commit is contained in:
@@ -104,7 +104,7 @@ class CustomEffectsUserMod : public Usermod {
|
|||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
if (!initDone)
|
if (!initDone)
|
||||||
strip.addEffect(255, &mode_customEffect, _data_FX_MODE_CUSTOMEFFECT);
|
strip.addEffect(FX_MODE_CUSTOMEFFECT, &mode_customEffect, _data_FX_MODE_CUSTOMEFFECT);
|
||||||
initDone = true;
|
initDone = true;
|
||||||
enabled = true;
|
enabled = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -317,8 +317,9 @@
|
|||||||
#define FX_MODE_WAVESINS 184
|
#define FX_MODE_WAVESINS 184
|
||||||
#define FX_MODE_ROCKTAVES 185
|
#define FX_MODE_ROCKTAVES 185
|
||||||
#define FX_MODE_2DAKEMI 186
|
#define FX_MODE_2DAKEMI 186
|
||||||
|
#define FX_MODE_CUSTOMEFFECT 187 //WLEDSR Custom Effects
|
||||||
|
|
||||||
#define MODE_COUNT 187
|
#define MODE_COUNT 188
|
||||||
|
|
||||||
typedef enum mapping1D2D {
|
typedef enum mapping1D2D {
|
||||||
M12_Pixels = 0,
|
M12_Pixels = 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user